From ccb2e47b19fb7c9cc883891f910c1cd44e83f1dc Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Sat, 12 Apr 2025 17:53:51 +0800 Subject: [PATCH] 0412 --- .../controller/CompanySmallProgramAPI.java | 3 +++ .../admin/DlDriveSchoolCourseController.java | 1 - ...riveSchoolCoachSmallProgramController.java | 3 --- ...veSchoolStudentSmallProgramController.java | 2 -- .../app/DrivePaySmallProgramController.java | 1 - .../app/DriveSchoolCourseSmallController.java | 1 - ...hoolCourseOrderSmallProgramController.java | 2 -- .../app/ProcessSmallProgramController.java | 2 -- .../app/AppExamBatchController.java | 1 - .../impl/ExamBatchItemServiceImpl.java | 2 -- .../app/AppDriveSchoolTextController.java | 21 +++++++++++++++++++ .../app/SmallProgramJxOrderController.java | 1 - 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java index c2a3270d..22141f46 100644 --- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java +++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/app/company/controller/CompanySmallProgramAPI.java @@ -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 queryWrapper = new LambdaQueryWrapper() .eq(TenantBaseDO::getTenantId,tenantId) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java index ea169a20..59f3ffb9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/admin/DlDriveSchoolCourseController.java @@ -40,7 +40,6 @@ public class DlDriveSchoolCourseController { **/ @GetMapping("/page") @Operation(summary = "分页获取课程信息") - @PermitAll public CommonResult> getDlDriveSchoolCoursePage(DlDriveSchoolCourseVO pageReqVO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java index e5de09c5..9de4b026 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolCoachSmallProgramController.java @@ -55,7 +55,6 @@ public class DlDriveSchoolCoachSmallProgramController { @GetMapping("/page") @Operation(summary = "获得驾校教练分页") @TenantIgnore - @PermitAll public CommonResult> 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 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)); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java index 8c3a8d63..8badc2ee 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DlDriveSchoolStudentSmallProgramController.java @@ -45,7 +45,6 @@ public class DlDriveSchoolStudentSmallProgramController { @PostMapping("/create") @Operation(summary = "创建驾校学员") @TenantIgnore - @PermitAll public CommonResult createDlDriveSchoolStudent(@Valid @RequestBody DlDriveSchoolStudentVO createReqVO) { return success(schoolStudentService.createDlDriveSchoolStudent(createReqVO)); } @@ -82,7 +81,6 @@ public class DlDriveSchoolStudentSmallProgramController { **/ @GetMapping("/getByUserId") @TenantIgnore - @PermitAll public CommonResult getStudentByUserId(Long userId) { return success(studentService.getStudentByUserId(userId)); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DrivePaySmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DrivePaySmallProgramController.java index bc8549dc..82034492 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DrivePaySmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DrivePaySmallProgramController.java @@ -21,7 +21,6 @@ public class DrivePaySmallProgramController { @GetMapping("/findSelfInfo") @TenantIgnore - @PermitAll public PayVo findSelfInfo() { return drivePayService.findSelfInfo(); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java index 3bc5dc92..e5d93615 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/DriveSchoolCourseSmallController.java @@ -47,7 +47,6 @@ public class DriveSchoolCourseSmallController { @GetMapping("/noTenantIdPage") @Operation(summary = "分页获取课程信息") @TenantIgnore - @PermitAll public CommonResult> getDlDriveSchoolCourseNoTenantIdPage(DlDriveSchoolCourseVO pageReqVO, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java index 86f6b198..51b976e9 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/base/controller/app/SchoolCourseOrderSmallProgramController.java @@ -68,7 +68,6 @@ public class SchoolCourseOrderSmallProgramController { @GetMapping("/page") @TenantIgnore @Operation(summary = "获得驾照报名订单分页") - @PermitAll public CommonResult> 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())); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java index 217942a6..97868d68 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/controller/app/ProcessSmallProgramController.java @@ -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)); } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/controller/app/AppExamBatchController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/controller/app/AppExamBatchController.java index 4200e6ad..8c81c9b1 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/controller/app/AppExamBatchController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/controller/app/AppExamBatchController.java @@ -47,7 +47,6 @@ public class AppExamBatchController { **/ @GetMapping("/selectExamByUserIdAndCoachId") @TenantIgnore - @PermitAll public CommonResult> selectExamByUserIdAndCoachId(Long userId, Long coachId) { List examList = examBatchItemService.selectExamByUserIdAndCoachId(userId, coachId); return CommonResult.success(examList); diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java index 74334a53..ec4de39d 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/exam/service/impl/ExamBatchItemServiceImpl.java @@ -271,8 +271,6 @@ public class ExamBatchItemServiceImpl extends ServiceImpl list = processService.list(queryWrapper); if (list.isEmpty()) { //插入 diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/app/AppDriveSchoolTextController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/app/AppDriveSchoolTextController.java index d7c81977..b2bdef59 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/app/AppDriveSchoolTextController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/controller/app/AppDriveSchoolTextController.java @@ -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 driveSchoolTextIPage = driveSchoolTextService.selectDriveSchoolTextList(driveSchoolText, page); return CommonResult.success(driveSchoolTextIPage); } + + + /** + * 查询驾校-轮播图列表 + */ + @TenantIgnore + @PermitAll + @GetMapping("/swiper/list") + public CommonResult list(DriveSchoolSwiper driveSchoolSwiper) + { + List list = driveSchoolSwiperService.selectDriveSchoolSwiperList(driveSchoolSwiper); + return CommonResult.success(list); + } } diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java index 61d3655a..1920e892 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/jx/payment/app/SmallProgramJxOrderController.java @@ -224,7 +224,6 @@ public class SmallProgramJxOrderController { */ @GetMapping("/generateOrderNo") @TenantIgnore - @PermitAll public String generateOrderNo() { // 格式化当前时间，取前11位 yyMMddHHmmss String timeStr = new java.text.SimpleDateFormat("yyMMddHHmm")