dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0412

Browse Source
This commit is contained in:
Lx 2025-04-12 17:53:51 +08:00
parent 215c9da7fa
commit ccb2e47b19
12 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java
View File

@ -35,6 +35,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@RequestMapping("/userClient/base/companySmallProgram")
@Tag(name = "API - BASE 小程序驾校查询")
@Validated
@PermitAll
public class CompanySmallProgramAPI {
@Resource
@ -70,6 +71,7 @@ public class CompanySmallProgramAPI {
@GetMapping("/noTenantIdGet")
@Operation(summary = "查企业能提供的业务-小程序")
@TenantIgnore
@PermitAll
public CommonResult<?> getCompanyServerNoTenantIdById(@RequestParam("id") String id){
return success(companyService.getCompanyServerById(id));
}
@ -85,6 +87,7 @@ public class CompanySmallProgramAPI {
@GetMapping("/getCompanyByTenantId")
@Operation(summary = "查某租户下某个业务系统的企业信息")
@TenantIgnore
@PermitAll
public CommonResult<?> getCompanyByTenantId(String tenantId,String systemCode){
LambdaQueryWrapper<Company> queryWrapper = new LambdaQueryWrapper<Company>()
.eq(TenantBaseDO::getTenantId,tenantId)

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java
View File

@ -40,7 +40,6 @@ public class DlDriveSchoolCourseController {
**/
@GetMapping("/page")
@Operation(summary = "分页获取课程信息")
@PermitAll
public CommonResult<IPage<?>> getDlDriveSchoolCoursePage(DlDriveSchoolCourseVO pageReqVO,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {

3
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java
View File

@ -55,7 +55,6 @@ public class DlDriveSchoolCoachSmallProgramController {
@GetMapping("/page")
@Operation(summary = "获得驾校教练分页")
@TenantIgnore
@PermitAll
public CommonResult<IPage<?>> getDlDriveSchoolCoachPage(DlDriveSchoolCoachPageReqVO pageReqVO,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@ -88,7 +87,6 @@ public class DlDriveSchoolCoachSmallProgramController {
**/
@GetMapping("/queryCoachByCourseId")
@TenantIgnore
@PermitAll
public List<DlDriveSchoolCoachCourse> queryByCourseId(String courseId) {
return coachCourseService.queryByCourseId(courseId);
@ -105,7 +103,6 @@ public class DlDriveSchoolCoachSmallProgramController {
@Operation(summary = "根据userId获得驾校教练信息")
@Parameter(name = "userId", description = "用户id", required = true, example = "1024")
@TenantIgnore
@PermitAll
public CommonResult<?> getCoachByUserId(@RequestParam("userId") Long userId) {
return success(dlDriveSchoolCoachService.getDlDriveSchoolCoachByUserId(userId));
}

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java
View File

@ -45,7 +45,6 @@ public class DlDriveSchoolStudentSmallProgramController {
@PostMapping("/create")
@Operation(summary = "创建驾校学员")
@TenantIgnore
@PermitAll
public CommonResult<String> createDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO createReqVO) {
return success(schoolStudentService.createDlDriveSchoolStudent(createReqVO));
}
@ -82,7 +81,6 @@ public class DlDriveSchoolStudentSmallProgramController {
**/
@GetMapping("/getByUserId")
@TenantIgnore
@PermitAll
public CommonResult<DlDriveSchoolStudent> getStudentByUserId(Long userId) {
return success(studentService.getStudentByUserId(userId));
}

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DrivePaySmallProgramController.java
View File

@ -21,7 +21,6 @@ public class DrivePaySmallProgramController {
@GetMapping("/findSelfInfo")
@TenantIgnore
@PermitAll
public PayVo findSelfInfo() {
return drivePayService.findSelfInfo();
}

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java
View File

@ -47,7 +47,6 @@ public class DriveSchoolCourseSmallController {
@GetMapping("/noTenantIdPage")
@Operation(summary = "分页获取课程信息")
@TenantIgnore
@PermitAll
public CommonResult<IPage<?>> getDlDriveSchoolCourseNoTenantIdPage(DlDriveSchoolCourseVO pageReqVO,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java
View File

@ -68,7 +68,6 @@ public class SchoolCourseOrderSmallProgramController {
@GetMapping("/page")
@TenantIgnore
@Operation(summary = "获得驾照报名订单分页")
@PermitAll
public CommonResult<IPage<?>> getSchoolCourseOrderPage(SchoolCourseOrderVO pageReqVO,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
@ -83,7 +82,6 @@ public class SchoolCourseOrderSmallProgramController {
*/
@TenantIgnore
@GetMapping("/getCourseByLoginUser")
@PermitAll
public CommonResult<?> getCourseByLoginUser() {
//获取当前登陆人
return success(schoolCourseOrderService.getCourseByLoginUser(SecurityFrameworkUtils.getLoginUserId()));

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java
View File

@ -72,7 +72,6 @@ public class ProcessSmallProgramController {
*/
@GetMapping("/getAllByUserIdAndCourseId")
@TenantIgnore
@PermitAll
public CommonResult<?> getAllByUserIdAndCourseId(Long userId, String courseId) {
return success(processService.getAllByUserIdAndCourseId(userId, courseId));
}
@ -82,7 +81,6 @@ public class ProcessSmallProgramController {
*/
@GetMapping("/getExamListByUserId")
@TenantIgnore
@PermitAll
public CommonResult<?> getExamListByUserId(Long userId) {
return success(processService.getExamListByUserIdTest(userId));
}

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/controller/app/AppExamBatchController.java
View File

@ -47,7 +47,6 @@ public class AppExamBatchController {
**/
@GetMapping("/selectExamByUserIdAndCoachId")
@TenantIgnore
@PermitAll
public CommonResult<List<ExamVO>> selectExamByUserIdAndCoachId(Long userId, Long coachId) {
List<ExamVO> examList = examBatchItemService.selectExamByUserIdAndCoachId(userId, coachId);
return CommonResult.success(examList);

2
dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java
View File

@ -271,8 +271,6 @@ public class ExamBatchItemServiceImpl extends ServiceImpl<ExamBatchItemMapper, E
.eq(Process::getUserId, process.getUserId())
.eq(Process::getSubject, nextSubject)
.eq(Process::getTenantId,process.getTenantId());
System.out.println(process);
System.out.println(queryWrapper.getSqlSegment());
List<Process> list = processService.list(queryWrapper);
if (list.isEmpty()) {
//插入

21
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/app/AppDriveSchoolTextController.java
View File

@ -4,13 +4,18 @@ package cn.iocoder.yudao.module.jx.controller.app;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
import cn.iocoder.yudao.module.jx.core.controller.BaseController;
import cn.iocoder.yudao.module.jx.domain.DriveSchoolSwiper;
import cn.iocoder.yudao.module.jx.domain.DriveSchoolText;
import cn.iocoder.yudao.module.jx.service.IDriveSchoolSwiperService;
import cn.iocoder.yudao.module.jx.service.IDriveSchoolTextService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.security.PermitAll;
import java.util.List;
/**
* 驾校公告Controller
*
@ -24,6 +29,9 @@ public class AppDriveSchoolTextController extends BaseController
@Autowired
private IDriveSchoolTextService driveSchoolTextService;
@Autowired
private IDriveSchoolSwiperService driveSchoolSwiperService;
/**
* 查询驾校公告列表
*/
@ -35,4 +43,17 @@ public class AppDriveSchoolTextController extends BaseController
IPage<DriveSchoolText> driveSchoolTextIPage = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText, page);
return CommonResult.success(driveSchoolTextIPage);
}
/**
* 查询驾校-轮播图列表
*/
@TenantIgnore
@PermitAll
@GetMapping("/swiper/list")
public CommonResult list(DriveSchoolSwiper driveSchoolSwiper)
{
List<DriveSchoolSwiper> list = driveSchoolSwiperService.selectDriveSchoolSwiperList(driveSchoolSwiper);
return CommonResult.success(list);
}
}

1
dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java
View File

@ -224,7 +224,6 @@ public class SmallProgramJxOrderController {
*/
@GetMapping("/generateOrderNo")
@TenantIgnore
@PermitAll
public String generateOrderNo() {
// 格式化当前时间，取前11位 yyMMddHHmmss
String timeStr = new java.text.SimpleDateFormat("yyMMddHHmm")