From 59cc49e11005b07eef0bfc8bce94e803aa8ab490 Mon Sep 17 00:00:00 2001 From: caolin <1149034574@qq.com> Date: Sun, 29 Jun 2025 19:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/uiDesigner.xml | 124 +++++ .../wrj/driver/server/constant/Constants.java | 2 +- .../controller/AppletPayController.java | 207 -------- .../server/controller/H5PayController.java | 152 ------ .../controller/OrderPayInfoController.java | 20 - .../controller/PayNoticeLogController.java | 209 -------- .../controller/PayPrepayController.java | 22 - .../controller/PayPrepayResultController.java | 20 - .../controller/PayRefundController.java | 20 - .../controller/PayRefundResultController.java | 20 - ...Controller.java => SysUserController.java} | 28 +- .../controller/TdCarouselImageController.java | 31 -- .../TdCategoryQuestionController.java | 20 - .../TdExaminationRoomController.java | 20 - .../TdExaminationRoomRoadController.java | 20 - .../server/controller/TdMemberController.java | 52 -- .../TdModuleQuestionController.java | 20 - .../controller/TdPointQuestionController.java | 20 - .../controller/TdProjectController.java | 36 -- .../controller/TdQuestionJxController.java | 37 -- .../TdQuestionVersionController.java | 52 -- .../server/controller/TdSecretController.java | 29 -- .../TdSecretQuestionController.java | 26 - .../controller/TdSysUserMemberController.java | 136 ------ .../controller/TdTenantCarController.java | 31 -- .../TdTrafficSignCategoryController.java | 20 - .../TdTrafficSignQuestionController.java | 20 - .../server/controller/TdVideosController.java | 20 - .../server/controller/VoiceController.java | 53 --- ...troller.java => WrjChapterController.java} | 12 +- ...ller.java => WrjDriverTypeController.java} | 18 +- ...roller.java => WrjQuestionController.java} | 47 +- ...er.java => WrjQuestionTestController.java} | 12 +- ...oller.java => WrjSysConfigController.java} | 32 +- ...r.java => WrjSysConfigListController.java} | 38 +- .../wrj/driver/server/dto/BaseQueryDto.java | 12 +- .../driver/server/dto/ChapterQueryDto.java | 12 +- .../driver/server/dto/DriverSchoolDto.java | 31 -- .../wrj/driver/server/dto/LoginUserDto.java | 12 - .../wrj/driver/server/dto/MemberQueryDto.java | 52 -- .../com/wrj/driver/server/dto/ProjectDto.java | 55 --- .../wrj/driver/server/dto/QuestionAddDto.java | 75 +-- .../driver/server/dto/QuestionJxQueryDto.java | 26 - .../driver/server/dto/QuestionQueryDto.java | 91 +--- .../wrj/driver/server/dto/SecretQueryDto.java | 13 - .../wrj/driver/server/dto/SysConfigDto.java | 20 +- .../wrj/driver/server/dto/TestQueryDto.java | 17 +- .../server/dto/TestQuestionTypeDto.java | 3 - .../wrj/driver/server/dto/TestSubmitDto.java | 18 +- .../wrj/driver/server/dto/UserMemberDto.java | 10 - .../driver/server/entity/OrderPayInfo.java | 139 ------ .../driver/server/entity/PayNoticeLog.java | 85 ---- .../wrj/driver/server/entity/PayPrepay.java | 130 ----- .../driver/server/entity/PayPrepayResult.java | 124 ----- .../wrj/driver/server/entity/PayRefund.java | 118 ----- .../driver/server/entity/PayRefundResult.java | 106 ----- .../driver/server/entity/SysDistribution.java | 52 -- .../server/entity/SysDistributionDetail.java | 63 --- .../entity/{TdSysUser.java => SysUser.java} | 60 +-- .../{TdSysUserLog.java => SysUserLog.java} | 36 +- .../com/wrj/driver/server/entity/TdCar.java | 71 --- .../driver/server/entity/TdCarouselImage.java | 27 -- .../server/entity/TdCategoryQuestion.java | 57 --- .../wrj/driver/server/entity/TdChapter.java | 40 -- .../server/entity/TdExaminationRoom.java | 70 --- .../server/entity/TdExaminationRoomRoad.java | 76 --- .../wrj/driver/server/entity/TdMember.java | 101 ---- .../server/entity/TdMemberDiscount.java | 92 ---- .../server/entity/TdModuleQuestion.java | 58 --- .../driver/server/entity/TdPointQuestion.java | 58 --- .../wrj/driver/server/entity/TdProject.java | 81 ---- .../driver/server/entity/TdQuestionJx.java | 40 -- .../server/entity/TdQuestionVersion.java | 58 --- .../wrj/driver/server/entity/TdSecret.java | 28 -- .../server/entity/TdSecretQuestion.java | 26 - .../server/entity/TdSysUserDiscount.java | 61 --- .../driver/server/entity/TdSysUserMember.java | 72 --- .../driver/server/entity/TdTenantApplet.java | 64 --- .../wrj/driver/server/entity/TdTenantCar.java | 50 -- .../driver/server/entity/TdTenantUser.java | 56 --- .../server/entity/TdTrafficSignCategory.java | 82 ---- .../server/entity/TdUserDistribution.java | 46 -- .../wrj/driver/server/entity/TdVideos.java | 82 ---- .../wrj/driver/server/entity/WrjChapter.java | 75 +++ ...icSignQuestion.java => WrjDriverType.java} | 29 +- .../{TdQuestion.java => WrjQuestion.java} | 95 ++-- ...QuestionTest.java => WrjQuestionTest.java} | 24 +- .../{TdSysConfig.java => WrjSysConfig.java} | 10 +- ...sConfigList.java => WrjSysConfigList.java} | 10 +- ...{TdCarChapter.java => WrjTypeChapter.java} | 42 +- .../server/mapper/OrderPayInfoMapper.java | 16 - .../server/mapper/PayNoticeLogMapper.java | 16 - .../driver/server/mapper/PayPrepayMapper.java | 16 - .../server/mapper/PayPrepayResultMapper.java | 16 - .../driver/server/mapper/PayRefundMapper.java | 16 - .../server/mapper/PayRefundResultMapper.java | 16 - .../mapper/SysDistributionDetailMapper.java | 10 - .../server/mapper/SysDistributionMapper.java | 8 - .../server/mapper/SysUserLogMapper.java | 7 + .../server/mapper/TdCarChapterMapper.java | 13 - .../server/mapper/TdCarouselImageMapper.java | 7 - .../mapper/TdCategoryQuestionMapper.java | 16 - .../mapper/TdExaminationRoomMapper.java | 16 - .../mapper/TdExaminationRoomRoadMapper.java | 16 - .../server/mapper/TdMemberDiscountMapper.java | 7 - .../driver/server/mapper/TdMemberMapper.java | 35 -- .../server/mapper/TdModuleQuestionMapper.java | 16 - .../server/mapper/TdPointQuestionMapper.java | 16 - .../driver/server/mapper/TdProjectMapper.java | 16 - .../server/mapper/TdQuestionJxMapper.java | 12 - .../mapper/TdQuestionVersionMapper.java | 16 - .../driver/server/mapper/TdSecretMapper.java | 15 - .../server/mapper/TdSecretQuestionMapper.java | 15 - .../mapper/TdSysUserDiscountMapper.java | 11 - .../server/mapper/TdSysUserLogMapper.java | 7 - .../driver/server/mapper/TdSysUserMapper.java | 6 +- .../server/mapper/TdSysUserMemberMapper.java | 22 - .../server/mapper/TdTenantAppletMapper.java | 7 - .../server/mapper/TdTenantCarMapper.java | 12 - .../server/mapper/TdTenantUserMapper.java | 7 - .../mapper/TdTrafficSignCategoryMapper.java | 16 - .../mapper/TdTrafficSignQuestionMapper.java | 16 - .../mapper/TdUserDistributionMapper.java | 11 - .../driver/server/mapper/TdVideosMapper.java | 16 - ...apterMapper.java => WrjChapterMapper.java} | 4 +- ...arMapper.java => WrjDriverTypeMapper.java} | 4 +- ...tionMapper.java => WrjQuestionMapper.java} | 8 +- ...Mapper.java => WrjQuestionTestMapper.java} | 4 +- ...apper.java => WrjSysConfigListMapper.java} | 4 +- ...figMapper.java => WrjSysConfigMapper.java} | 6 +- .../server/mapper/WrjTypeChapterMapper.java | 13 + .../server/service/IOrderPayInfoService.java | 41 -- .../server/service/IPayNoticeLogService.java | 16 - .../service/IPayPrepayResultService.java | 16 - .../server/service/IPayPrepayService.java | 16 - .../service/IPayRefundResultService.java | 16 - .../server/service/IPayRefundService.java | 16 - .../service/ISysDistributionService.java | 8 - ...ogService.java => ISysUserLogService.java} | 6 +- ...sUserService.java => ISysUserService.java} | 12 +- .../server/service/ITdCarChapterService.java | 10 - .../service/ITdCarouselImageService.java | 11 - .../service/ITdCategoryQuestionService.java | 16 - .../ITdExaminationRoomRoadService.java | 16 - .../service/ITdExaminationRoomService.java | 16 - .../service/ITdMemberDiscountService.java | 12 - .../server/service/ITdMemberService.java | 34 -- .../service/ITdModuleQuestionService.java | 16 - .../service/ITdPointQuestionService.java | 16 - .../server/service/ITdProjectService.java | 26 - .../server/service/ITdQuestionJxService.java | 9 - .../service/ITdQuestionVersionService.java | 33 -- .../service/ITdSecretQuestionService.java | 7 - .../server/service/ITdSecretService.java | 9 - .../server/service/ITdSysConfigService.java | 53 --- .../service/ITdSysUserDiscountService.java | 7 - .../service/ITdSysUserMemberService.java | 29 -- .../service/ITdTenantAppletService.java | 7 - .../server/service/ITdTenantCarService.java | 11 - .../ITdTrafficSignCategoryService.java | 16 - .../ITdTrafficSignQuestionService.java | 16 - .../server/service/ITdVideosService.java | 16 - ...erService.java => IWrjChapterService.java} | 2 +- ...ervice.java => IWrjDriverTypeService.java} | 4 +- ...nService.java => IWrjQuestionService.java} | 14 +- ...vice.java => IWrjQuestionTestService.java} | 4 +- ...ice.java => IWrjSysConfigListService.java} | 18 +- .../server/service/IWrjSysConfigService.java | 53 +++ .../service/IWrjTypeChapterService.java | 10 + .../service/impl/OrderPayInfoServiceImpl.java | 132 ------ .../service/impl/PayNoticeLogServiceImpl.java | 20 - .../impl/PayPrepayResultServiceImpl.java | 20 - .../service/impl/PayPrepayServiceImpl.java | 20 - .../impl/PayRefundResultServiceImpl.java | 20 - .../service/impl/PayRefundServiceImpl.java | 20 - .../impl/SysDistributionServiceImpl.java | 17 - .../service/impl/TdCarChapterServiceImpl.java | 21 - .../server/service/impl/TdCarServiceImpl.java | 20 - .../impl/TdCarouselImageServiceImpl.java | 30 -- .../impl/TdCategoryQuestionServiceImpl.java | 20 - .../TdExaminationRoomRoadServiceImpl.java | 20 - .../impl/TdExaminationRoomServiceImpl.java | 20 - .../impl/TdMemberDiscountServiceImpl.java | 33 -- .../service/impl/TdMemberServiceImpl.java | 127 ----- .../impl/TdModuleQuestionServiceImpl.java | 20 - .../impl/TdPointQuestionServiceImpl.java | 20 - .../service/impl/TdProjectServiceImpl.java | 67 --- .../service/impl/TdQuestionJxServiceImpl.java | 31 -- .../service/impl/TdQuestionServiceImpl.java | 446 ------------------ .../impl/TdQuestionTestServiceImpl.java | 109 +---- .../impl/TdQuestionVersionServiceImpl.java | 103 ---- .../impl/TdSecretQuestionServiceImpl.java | 18 - .../service/impl/TdSecretServiceImpl.java | 30 -- .../impl/TdSysConfigListServiceImpl.java | 52 +- .../impl/TdSysUserDiscountServiceImpl.java | 13 - .../service/impl/TdSysUserLogServiceImpl.java | 15 +- .../impl/TdSysUserMemberServiceImpl.java | 105 ----- .../service/impl/TdSysUserServiceImpl.java | 254 +--------- .../impl/TdTenantAppletServiceImpl.java | 13 - .../service/impl/TdTenantCarServiceImpl.java | 20 - .../TdTrafficSignCategoryServiceImpl.java | 20 - .../TdTrafficSignQuestionServiceImpl.java | 20 - .../service/impl/TdVideosServiceImpl.java | 20 - ...ceImpl.java => WrjChapterServiceImpl.java} | 10 +- .../impl/WrjDriverTypeServiceImpl.java | 20 + .../service/impl/WrjQuestionServiceImpl.java | 266 +++++++++++ ...Impl.java => WrjSysConfigServiceImpl.java} | 66 +-- .../impl/WrjTypeChapterServiceImpl.java | 21 + .../wrj/driver/server/util/SecurityUtil.java | 4 +- .../com/wrj/driver/server/vo/AppletPayVo.java | 43 -- .../java/com/wrj/driver/server/vo/CarVo.java | 39 -- .../wrj/driver/server/vo/CarouselImageVo.java | 21 - .../com/wrj/driver/server/vo/ChapterVo.java | 12 +- .../com/wrj/driver/server/vo/ExamParam.java | 2 +- .../com/wrj/driver/server/vo/H5PayVo.java | 40 -- .../com/wrj/driver/server/vo/LoginUserVo.java | 23 +- .../com/wrj/driver/server/vo/MemberVo.java | 113 ----- .../com/wrj/driver/server/vo/ProjectVo.java | 91 ---- .../wrj/driver/server/vo/QuestionJxVo.java | 34 -- .../com/wrj/driver/server/vo/QuestionVo.java | 48 +- .../driver/server/vo/QusetionCategoryVo.java | 46 -- .../com/wrj/driver/server/vo/SchoolVO.java | 20 - .../com/wrj/driver/server/vo/TestScoreVO.java | 22 +- .../com/wrj/driver/server/vo/TestTotalVo.java | 4 +- .../wrj/driver/server/vo/UserDiscountVO.java | 47 -- .../wrj/driver/server/vo/UserMemberVo.java | 70 --- ...arChapterVo.java => WrjTypeChapterVo.java} | 38 +- .../resources/mapper/PayNoticeLogMapper.xml | 5 - src/main/resources/mapper/PayPrepayMapper.xml | 5 - .../mapper/PayPrepayResultMapper.xml | 5 - src/main/resources/mapper/PayRefundMapper.xml | 5 - .../mapper/PayRefundResultMapper.xml | 5 - .../mapper/SysDistributionDetailMapper.xml | 12 - .../mapper/SysDistributionMapper.xml | 10 - .../resources/mapper/TdCarChapterMapper.xml | 19 - src/main/resources/mapper/TdCarMapper.xml | 5 - .../mapper/TdCarouselImageMapper.xml | 5 - .../mapper/TdCategoryQuestionMapper.xml | 5 - src/main/resources/mapper/TdChapterMapper.xml | 18 - .../mapper/TdExaminationRoomMapper.xml | 5 - .../mapper/TdExaminationRoomRoadMapper.xml | 5 - src/main/resources/mapper/TdMemberMapper.xml | 70 --- .../mapper/TdModuleQuestionMapper.xml | 5 - .../mapper/TdPointQuestionMapper.xml | 5 - src/main/resources/mapper/TdProjectMapper.xml | 5 - .../resources/mapper/TdQuestionJxMapper.xml | 31 -- .../resources/mapper/TdQuestionMapper.xml | 243 ---------- .../resources/mapper/TdQuestionTestMapper.xml | 36 -- .../mapper/TdQuestionVersionMapper.xml | 5 - src/main/resources/mapper/TdSecretMapper.xml | 15 - .../mapper/TdSecretQuestionMapper.xml | 14 - .../mapper/TdSysConfigListMapper.xml | 5 - .../mapper/TdSysUserDiscountMapper.xml | 22 - src/main/resources/mapper/TdSysUserMapper.xml | 24 - .../mapper/TdSysUserMemberMapper.xml | 38 -- .../resources/mapper/TdTenantAppletMapper.xml | 5 - .../resources/mapper/TdTenantCarMapper.xml | 12 - .../resources/mapper/TdTenantUserMapper.xml | 5 - .../mapper/TdTrafficSignCategoryMapper.xml | 5 - .../mapper/TdTrafficSignQuestionMapper.xml | 5 - .../mapper/TdUserDistributionMapper.xml | 15 - src/main/resources/mapper/TdVideosMapper.xml | 5 - .../resources/mapper/WrjChapterMapper.xml | 18 + ...InfoMapper.xml => WrjDriverTypeMapper.xml} | 2 +- .../resources/mapper/WrjQuestionMapper.xml | 200 ++++++++ .../mapper/WrjQuestionTestMapper.xml | 29 ++ ...tMapper.xml => WrjSysConfigListMapper.xml} | 2 +- ...onfigMapper.xml => WrjSysConfigMapper.xml} | 6 +- .../resources/mapper/WrjTypeChapterMapper.xml | 18 + 269 files changed, 1287 insertions(+), 8499 deletions(-) create mode 100644 .idea/uiDesigner.xml delete mode 100644 src/main/java/com/wrj/driver/server/controller/AppletPayController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/H5PayController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/PayPrepayController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/PayRefundController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java rename src/main/java/com/wrj/driver/server/controller/{TdSysUserController.java => SysUserController.java} (69%) delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdMemberController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdProjectController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdSecretController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/TdVideosController.java delete mode 100644 src/main/java/com/wrj/driver/server/controller/VoiceController.java rename src/main/java/com/wrj/driver/server/controller/{TdChapterController.java => WrjChapterController.java} (69%) rename src/main/java/com/wrj/driver/server/controller/{TdCarController.java => WrjDriverTypeController.java} (60%) rename src/main/java/com/wrj/driver/server/controller/{TdQuestionController.java => WrjQuestionController.java} (65%) rename src/main/java/com/wrj/driver/server/controller/{TdQuestionTestController.java => WrjQuestionTestController.java} (70%) rename src/main/java/com/wrj/driver/server/controller/{TdSysConfigController.java => WrjSysConfigController.java} (53%) rename src/main/java/com/wrj/driver/server/controller/{TdSysConfigListController.java => WrjSysConfigListController.java} (50%) delete mode 100644 src/main/java/com/wrj/driver/server/dto/DriverSchoolDto.java delete mode 100644 src/main/java/com/wrj/driver/server/dto/MemberQueryDto.java delete mode 100644 src/main/java/com/wrj/driver/server/dto/ProjectDto.java delete mode 100644 src/main/java/com/wrj/driver/server/dto/QuestionJxQueryDto.java delete mode 100644 src/main/java/com/wrj/driver/server/dto/SecretQueryDto.java delete mode 100644 src/main/java/com/wrj/driver/server/dto/UserMemberDto.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/OrderPayInfo.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/PayNoticeLog.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/PayPrepay.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/PayPrepayResult.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/PayRefund.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/PayRefundResult.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/SysDistribution.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/SysDistributionDetail.java rename src/main/java/com/wrj/driver/server/entity/{TdSysUser.java => SysUser.java} (57%) rename src/main/java/com/wrj/driver/server/entity/{TdSysUserLog.java => SysUserLog.java} (58%) delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdCar.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdCarouselImage.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdCategoryQuestion.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdChapter.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdExaminationRoom.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdExaminationRoomRoad.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdMember.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdMemberDiscount.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdModuleQuestion.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdPointQuestion.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdProject.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdQuestionJx.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdQuestionVersion.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdSecret.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdSecretQuestion.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdSysUserDiscount.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdSysUserMember.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdTenantApplet.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdTenantCar.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdTenantUser.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdTrafficSignCategory.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdUserDistribution.java delete mode 100644 src/main/java/com/wrj/driver/server/entity/TdVideos.java create mode 100644 src/main/java/com/wrj/driver/server/entity/WrjChapter.java rename src/main/java/com/wrj/driver/server/entity/{TdTrafficSignQuestion.java => WrjDriverType.java} (59%) rename src/main/java/com/wrj/driver/server/entity/{TdQuestion.java => WrjQuestion.java} (60%) rename src/main/java/com/wrj/driver/server/entity/{TdQuestionTest.java => WrjQuestionTest.java} (74%) rename src/main/java/com/wrj/driver/server/entity/{TdSysConfig.java => WrjSysConfig.java} (86%) rename src/main/java/com/wrj/driver/server/entity/{TdSysConfigList.java => WrjSysConfigList.java} (85%) rename src/main/java/com/wrj/driver/server/entity/{TdCarChapter.java => WrjTypeChapter.java} (56%) delete mode 100644 src/main/java/com/wrj/driver/server/mapper/OrderPayInfoMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/PayNoticeLogMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/PayPrepayMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/PayPrepayResultMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/PayRefundMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/PayRefundResultMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/SysDistributionDetailMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/SysDistributionMapper.java create mode 100644 src/main/java/com/wrj/driver/server/mapper/SysUserLogMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdCarChapterMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdCarouselImageMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdCategoryQuestionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomRoadMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdMemberDiscountMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdMemberMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdModuleQuestionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdPointQuestionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdProjectMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdQuestionJxMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdQuestionVersionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdSecretMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdSecretQuestionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdSysUserDiscountMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdSysUserLogMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdSysUserMemberMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdTenantAppletMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdTenantCarMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdTenantUserMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdTrafficSignCategoryMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdTrafficSignQuestionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdUserDistributionMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/mapper/TdVideosMapper.java rename src/main/java/com/wrj/driver/server/mapper/{TdChapterMapper.java => WrjChapterMapper.java} (76%) rename src/main/java/com/wrj/driver/server/mapper/{TdCarMapper.java => WrjDriverTypeMapper.java} (62%) rename src/main/java/com/wrj/driver/server/mapper/{TdQuestionMapper.java => WrjQuestionMapper.java} (85%) rename src/main/java/com/wrj/driver/server/mapper/{TdQuestionTestMapper.java => WrjQuestionTestMapper.java} (77%) rename src/main/java/com/wrj/driver/server/mapper/{TdSysConfigListMapper.java => WrjSysConfigListMapper.java} (61%) rename src/main/java/com/wrj/driver/server/mapper/{TdSysConfigMapper.java => WrjSysConfigMapper.java} (58%) create mode 100644 src/main/java/com/wrj/driver/server/mapper/WrjTypeChapterMapper.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IOrderPayInfoService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IPayNoticeLogService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IPayPrepayResultService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IPayPrepayService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IPayRefundResultService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/IPayRefundService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ISysDistributionService.java rename src/main/java/com/wrj/driver/server/service/{ITdSysUserLogService.java => ISysUserLogService.java} (61%) rename src/main/java/com/wrj/driver/server/service/{ITdSysUserService.java => ISysUserService.java} (70%) delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdCarChapterService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdCarouselImageService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdCategoryQuestionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdExaminationRoomRoadService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdExaminationRoomService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdMemberDiscountService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdMemberService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdModuleQuestionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdPointQuestionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdProjectService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdQuestionJxService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdQuestionVersionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdSecretQuestionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdSecretService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdSysConfigService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdSysUserDiscountService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdSysUserMemberService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdTenantAppletService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdTenantCarService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdTrafficSignCategoryService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdTrafficSignQuestionService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/ITdVideosService.java rename src/main/java/com/wrj/driver/server/service/{ITdChapterService.java => IWrjChapterService.java} (85%) rename src/main/java/com/wrj/driver/server/service/{ITdCarService.java => IWrjDriverTypeService.java} (62%) rename src/main/java/com/wrj/driver/server/service/{ITdQuestionService.java => IWrjQuestionService.java} (83%) rename src/main/java/com/wrj/driver/server/service/{ITdQuestionTestService.java => IWrjQuestionTestService.java} (87%) rename src/main/java/com/wrj/driver/server/service/{ITdSysConfigListService.java => IWrjSysConfigListService.java} (52%) create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjSysConfigService.java create mode 100644 src/main/java/com/wrj/driver/server/service/IWrjTypeChapterService.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/OrderPayInfoServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/PayNoticeLogServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/PayPrepayResultServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/PayPrepayServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/PayRefundResultServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/PayRefundServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/SysDistributionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdCarChapterServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdCarServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdCarouselImageServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdCategoryQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomRoadServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdMemberDiscountServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdMemberServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdModuleQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdPointQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdProjectServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdQuestionJxServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdQuestionVersionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdSecretQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdSecretServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdSysUserDiscountServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdSysUserMemberServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdTenantAppletServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdTenantCarServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignCategoryServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignQuestionServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/service/impl/TdVideosServiceImpl.java rename src/main/java/com/wrj/driver/server/service/impl/{TdChapterServiceImpl.java => WrjChapterServiceImpl.java} (63%) create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjDriverTypeServiceImpl.java create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjQuestionServiceImpl.java rename src/main/java/com/wrj/driver/server/service/impl/{TdSysConfigServiceImpl.java => WrjSysConfigServiceImpl.java} (56%) create mode 100644 src/main/java/com/wrj/driver/server/service/impl/WrjTypeChapterServiceImpl.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/AppletPayVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/CarVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/CarouselImageVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/H5PayVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/MemberVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/ProjectVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/QuestionJxVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/QusetionCategoryVo.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/SchoolVO.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/UserDiscountVO.java delete mode 100644 src/main/java/com/wrj/driver/server/vo/UserMemberVo.java rename src/main/java/com/wrj/driver/server/vo/{CarChapterVo.java => WrjTypeChapterVo.java} (51%) delete mode 100644 src/main/resources/mapper/PayNoticeLogMapper.xml delete mode 100644 src/main/resources/mapper/PayPrepayMapper.xml delete mode 100644 src/main/resources/mapper/PayPrepayResultMapper.xml delete mode 100644 src/main/resources/mapper/PayRefundMapper.xml delete mode 100644 src/main/resources/mapper/PayRefundResultMapper.xml delete mode 100644 src/main/resources/mapper/SysDistributionDetailMapper.xml delete mode 100644 src/main/resources/mapper/SysDistributionMapper.xml delete mode 100644 src/main/resources/mapper/TdCarChapterMapper.xml delete mode 100644 src/main/resources/mapper/TdCarMapper.xml delete mode 100644 src/main/resources/mapper/TdCarouselImageMapper.xml delete mode 100644 src/main/resources/mapper/TdCategoryQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdChapterMapper.xml delete mode 100644 src/main/resources/mapper/TdExaminationRoomMapper.xml delete mode 100644 src/main/resources/mapper/TdExaminationRoomRoadMapper.xml delete mode 100644 src/main/resources/mapper/TdMemberMapper.xml delete mode 100644 src/main/resources/mapper/TdModuleQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdPointQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdProjectMapper.xml delete mode 100644 src/main/resources/mapper/TdQuestionJxMapper.xml delete mode 100644 src/main/resources/mapper/TdQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdQuestionTestMapper.xml delete mode 100644 src/main/resources/mapper/TdQuestionVersionMapper.xml delete mode 100644 src/main/resources/mapper/TdSecretMapper.xml delete mode 100644 src/main/resources/mapper/TdSecretQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdSysConfigListMapper.xml delete mode 100644 src/main/resources/mapper/TdSysUserDiscountMapper.xml delete mode 100644 src/main/resources/mapper/TdSysUserMemberMapper.xml delete mode 100644 src/main/resources/mapper/TdTenantAppletMapper.xml delete mode 100644 src/main/resources/mapper/TdTenantCarMapper.xml delete mode 100644 src/main/resources/mapper/TdTenantUserMapper.xml delete mode 100644 src/main/resources/mapper/TdTrafficSignCategoryMapper.xml delete mode 100644 src/main/resources/mapper/TdTrafficSignQuestionMapper.xml delete mode 100644 src/main/resources/mapper/TdUserDistributionMapper.xml delete mode 100644 src/main/resources/mapper/TdVideosMapper.xml create mode 100644 src/main/resources/mapper/WrjChapterMapper.xml rename src/main/resources/mapper/{OrderPayInfoMapper.xml => WrjDriverTypeMapper.xml} (69%) create mode 100644 src/main/resources/mapper/WrjQuestionMapper.xml create mode 100644 src/main/resources/mapper/WrjQuestionTestMapper.xml rename src/main/resources/mapper/{TdMemberDiscountMapper.xml => WrjSysConfigListMapper.xml} (72%) rename src/main/resources/mapper/{TdSysConfigMapper.xml => WrjSysConfigMapper.xml} (80%) create mode 100644 src/main/resources/mapper/WrjTypeChapterMapper.xml diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/wrj/driver/server/constant/Constants.java b/src/main/java/com/wrj/driver/server/constant/Constants.java index ca9b535..0857dc6 100644 --- a/src/main/java/com/wrj/driver/server/constant/Constants.java +++ b/src/main/java/com/wrj/driver/server/constant/Constants.java @@ -6,7 +6,7 @@ package com.wrj.driver.server.constant; public class Constants { - public static Integer DEFAULT_CARTYPE_ID = -1; + public static Integer DEFAULT_TYPE_ID = -1; //租户id public static String HEADER_TENANT_ID = "tenant-id"; diff --git a/src/main/java/com/wrj/driver/server/controller/AppletPayController.java b/src/main/java/com/wrj/driver/server/controller/AppletPayController.java deleted file mode 100644 index 63bebb5..0000000 --- a/src/main/java/com/wrj/driver/server/controller/AppletPayController.java +++ /dev/null @@ -1,207 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.entity.OrderPayInfo; -import com.wrj.driver.server.entity.TdTenantApplet; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.interceptor.TenantContextHolder; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.IOrderPayInfoService; -import com.wrj.driver.server.service.ITdTenantAppletService; -import com.wrj.driver.server.util.WechatPayUtil; -import com.wrj.driver.server.vo.AppletPayVo; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.core.RSAPublicKeyConfig; -import com.wechat.pay.java.core.exception.ServiceException; -import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension; -import com.wechat.pay.java.service.payments.jsapi.model.*; -import com.wechat.pay.java.service.payments.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.math.BigDecimal; - -/** - * 微信支付小程序 接口 - */ -@Api(tags = "小程序支付") -@RestController -@RequestMapping("/applet/pay") -@Slf4j -public class AppletPayController { - - @Resource -// private WechatPayConfig wechatPayConfig; - - @Autowired - private IOrderPayInfoService orderPayInfoService; - - @Autowired - private ITdTenantAppletService tdTenantAppletService; - - //生成预支付订单 - @ApiOperation("生成预支付订单") - @PostMapping("/prepay") - public BaseResponse createPrepay(@RequestBody AppletPayVo payDto){ - // 构建service - log.info("payDto===================>{}",payDto); - payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId()); - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - - OrderPayInfo orderPayInfo = orderPayInfoService - .createOrderPayInfo(payDto.getMoney(),payDto.getUserId(), payDto.getDescription(), - payDto.getTradeType(), payDto.getOutTradeNo(),"applet", - payDto.getDetailId(), payDto.getTenantId()); - - JsapiServiceExtension service = null; - if (tdTenantApplet.getIsNew()){ - //新支付 - service = createNewService(tdTenantApplet); - } else { - //老支付 - service = createService(tdTenantApplet); - - } - -// JsapiServiceExtension service = createService(tdTenantApplet); - - - // 请求下单参数 - PrepayRequest request = new PrepayRequest(); - Amount amount = new Amount(); - amount.setTotal(Integer.valueOf((payDto.getMoney().multiply(new BigDecimal("100")).setScale(0).toString())+"")); - request.setAmount(amount); - request.setAppid(tdTenantApplet.getAppId()); - request.setMchid(tdTenantApplet.getMchId()); - request.setDescription(payDto.getDescription()); - request.setNotifyUrl(tdTenantApplet.getPayNoticeUrl()); - request.setOutTradeNo(orderPayInfo.getPayId().toString()); - - Payer payer = new Payer(); - payer.setOpenid(WechatPayUtil.getOpenId(tdTenantApplet.getAppId(), tdTenantApplet.getAppSecret(), payDto.getCode())); - request.setPayer(payer); - // 调用下单方法,得到应答 - PrepayWithRequestPaymentResponse response = service.prepayWithRequestPayment(request); - // 使用微信扫描 code_url 对应的二维码,即可体验Native支付 - log.info("response=================>{}",response); -// return BaseResponse.success(); - return BaseResponse.success(response); - - - - } - - private JsapiServiceExtension createNewService(TdTenantApplet tdTenantApplet) { - //现代码 - Config config = - new RSAPublicKeyConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) - .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .publicKeyFromPath(tdTenantApplet.getPubKeyPath()) - .publicKeyId(tdTenantApplet.getPubKeyId()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build(); - - return service; - } - - - /** 构建service */ - private JsapiServiceExtension createService(TdTenantApplet tdTenantApplet) { - Config config = - new RSAAutoCertificateConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) -// .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath()))) - .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - - JsapiServiceExtension service = new JsapiServiceExtension.Builder().config(config).build(); - - return service; - } - - - //查询订单接口 - @ApiOperation("查询支付订单") - @PostMapping("/queryOrder") - public BaseResponse queryOrder(@RequestBody AppletPayVo payDto){ - - payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId()); - - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - //获取openId - QueryOrderByOutTradeNoRequest queryRequest = new QueryOrderByOutTradeNoRequest(); - queryRequest.setMchid(tdTenantApplet.getMchId()); - //支付订单id - queryRequest.setOutTradeNo(payDto.getOutTradeNo()); - JsapiServiceExtension service = null; - if (tdTenantApplet.getIsNew()){ - //新支付 - service = createNewService(tdTenantApplet); - } else { - //老支付 - service = createService(tdTenantApplet); - - } - try { - Transaction result = service.queryOrderByOutTradeNo(queryRequest); - System.out.println(result.getTradeState()); - return BaseResponse.success(result); - } catch (ServiceException e) { - // API返回失败, 例如ORDER_NOT_EXISTS - System.out.printf("code=[%s], message=[%s]\n", e.getErrorCode(), e.getErrorMessage()); - System.out.printf("reponse body=[%s]\n", e.getResponseBody()); - return BaseResponse.fail(e.getErrorMessage()); - } - - } - - //关闭订单接口 - @ApiOperation("关闭支付订单") - @PostMapping("/closeOrder") - public BaseResponse closeOrder(@RequestBody AppletPayVo payDto){ - payDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payDto.getTenantId()); - - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - - JsapiServiceExtension service = null; - if (tdTenantApplet.getIsNew()){ - //新支付 - service = createNewService(tdTenantApplet); - } else { - //老支付 - service = createService(tdTenantApplet); - - } - CloseOrderRequest closeRequest = new CloseOrderRequest(); - closeRequest.setMchid(tdTenantApplet.getMchId()); - closeRequest.setOutTradeNo(payDto.getOutTradeNo()); - // 方法没有返回值,意味着成功时API返回204 No Content - service.closeOrder(closeRequest); - return BaseResponse.success(); - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/H5PayController.java b/src/main/java/com/wrj/driver/server/controller/H5PayController.java deleted file mode 100644 index 99e3901..0000000 --- a/src/main/java/com/wrj/driver/server/controller/H5PayController.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.config.WechatPayConfig; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.entity.OrderPayInfo; -import com.wrj.driver.server.entity.TdTenantApplet; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.interceptor.TenantContextHolder; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.IOrderPayInfoService; -import com.wrj.driver.server.service.ITdTenantAppletService; -import com.wrj.driver.server.util.InputStreamUtil; -import com.wrj.driver.server.vo.H5PayVo; -import com.wechat.pay.java.core.Config; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.core.exception.ServiceException; -import com.wechat.pay.java.core.util.PemUtil; -import com.wechat.pay.java.service.payments.h5.H5Service; -import com.wechat.pay.java.service.payments.h5.model.*; -import com.wechat.pay.java.service.payments.model.Transaction; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; -import java.math.BigDecimal; - -/** - * 微信支付小程序 接口 - */ -@Api(tags = "H5支付") -@RestController -@RequestMapping("/H5/pay") -@Slf4j -public class H5PayController { - - @Resource - private WechatPayConfig tdTenantApplet; - - @Autowired - private IOrderPayInfoService orderPayInfoService; - - @Autowired - private ITdTenantAppletService tdTenantAppletService; - - //生成预支付订单 - @ApiOperation("生成预支付订单") - @PostMapping("/prepay") - public BaseResponse createPrepay(@RequestBody H5PayVo payVo){ - // 构建service - payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId()); - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - - H5Service service = createService(tdTenantApplet); - //在order_pay_info里新增一条数据 - OrderPayInfo orderPayInfo = orderPayInfoService.createOrderPayInfo(payVo.getMoney(),payVo.getUserId(),payVo.getDescription(), payVo.getTradeType(), payVo.getOutTradeNo(), "h5", payVo.getDetailId(), payVo.getTenantId()); - - // 请求下单参数 - PrepayRequest request = new PrepayRequest(); - Amount amount = new Amount(); - amount.setTotal(Integer.valueOf((payVo.getMoney().multiply(new BigDecimal("100")).setScale(0).toString())+"")); - request.setAmount(amount); - request.setAppid(tdTenantApplet.getAppId()); - request.setMchid(tdTenantApplet.getMchId()); - request.setDescription(payVo.getDescription()); - request.setNotifyUrl(tdTenantApplet.getPayNoticeUrl()); - request.setOutTradeNo(orderPayInfo.getPayId().toString()); - //场景参数 - SceneInfo sceneInfo = new SceneInfo(); - sceneInfo.setPayerClientIp(payVo.getClientIp()); - request.setSceneInfo(sceneInfo); - - // 调用下单方法,得到应答 - PrepayResponse response = service.prepay(request); - // 使用微信扫描 code_url 对应的二维码,即可体验Native支付 -// log.info(response); - return BaseResponse.success(response); - } - - private H5Service createService(TdTenantApplet tdTenantApplet) { - Config config = - new RSAAutoCertificateConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) - .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath()))) -// .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - H5Service service = new H5Service.Builder().config(config).build(); - - return service; - } - - - //查询订单接口 - @ApiOperation("查询支付订单") - @PostMapping("/queryOrder") - public BaseResponse queryOrder(@RequestBody H5PayVo payVo){ - payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId()); - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - //获取openId - QueryOrderByOutTradeNoRequest queryRequest = new QueryOrderByOutTradeNoRequest(); - queryRequest.setMchid(tdTenantApplet.getMchId()); - //支付订单id - queryRequest.setOutTradeNo(payVo.getOutTradeNo()); - H5Service service = createService(tdTenantApplet); - - try { - Transaction result = service.queryOrderByOutTradeNo(queryRequest); - System.out.println(result.getTradeState()); - return BaseResponse.success(result); - } catch (ServiceException e) { - // API返回失败, 例如ORDER_NOT_EXISTS - System.out.printf("code=[%s], message=[%s]\n", e.getErrorCode(), e.getErrorMessage()); - System.out.printf("reponse body=[%s]\n", e.getResponseBody()); - return BaseResponse.fail(e.getErrorMessage()); - } - - } - - //关闭订单接口 - @ApiOperation("关闭支付订单") - @PostMapping("/closeOrder") - public BaseResponse closeOrder(@RequestBody H5PayVo payVo){ - payVo.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); - //查询租户商户信息 - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(payVo.getTenantId()); - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - H5Service service = createService(tdTenantApplet); - CloseOrderRequest closeRequest = new CloseOrderRequest(); - closeRequest.setMchid(tdTenantApplet.getMchId()); - closeRequest.setOutTradeNo(payVo.getOutTradeNo()); - // 方法没有返回值,意味着成功时API返回204 No Content - service.closeOrder(closeRequest); - return BaseResponse.success(); - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java b/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java deleted file mode 100644 index 0aecea8..0000000 --- a/src/main/java/com/wrj/driver/server/controller/OrderPayInfoController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 支付表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//orderPayInfo") -public class OrderPayInfoController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java b/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java deleted file mode 100644 index a95259e..0000000 --- a/src/main/java/com/wrj/driver/server/controller/PayNoticeLogController.java +++ /dev/null @@ -1,209 +0,0 @@ -package com.wrj.driver.server.controller; - - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.wrj.driver.server.entity.OrderPayInfo; -import com.wrj.driver.server.entity.TdTenantApplet; -import com.wrj.driver.server.enums.PurchaseProductTypeEnum; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.service.IOrderPayInfoService; -import com.wrj.driver.server.service.ITdSysUserMemberService; -import com.wrj.driver.server.service.ITdTenantAppletService; -import com.wrj.driver.server.util.InputStreamUtil; -import com.wechat.pay.java.core.RSAAutoCertificateConfig; -import com.wechat.pay.java.core.RSAPublicKeyConfig; -import com.wechat.pay.java.core.notification.NotificationConfig; -import com.wechat.pay.java.core.notification.NotificationParser; -import com.wechat.pay.java.core.notification.RequestParam; -import com.wechat.pay.java.core.util.PemUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - *

- * 支付回调日志表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Api(tags = "支付回调") -@RestController -@RequestMapping("/payNoticeLog") -@Slf4j -public class PayNoticeLogController { -// @Resource -// private WechatPayConfig tdTenantApplet; - - @Autowired - private ITdSysUserMemberService userMemberService; - - @Autowired - private IOrderPayInfoService payInfoService; - - @Autowired - private ITdTenantAppletService tdTenantAppletService; - - /** - * 寻驾小程序 支付回调接口 本接口不能做验证 - * @param wechatPayCertificateSerialNumber - * @param signature - * @param timstamp - * @param nonce - * @param requestBody - * @return - */ - @ApiOperation("支付回调接口") - @PostMapping("/{tenantId}") - public JSONObject payNotice(@RequestHeader("Wechatpay-Serial") String wechatPayCertificateSerialNumber, - @RequestHeader("Wechatpay-Signature") String signature, - @RequestHeader("Wechatpay-Timestamp") String timstamp, - @RequestHeader("Wechatpay-Nonce") String nonce, - @RequestBody String requestBody, - @PathVariable("tenantId") Long tenantId){ - log.info("支付回调信息==============》{}",requestBody); - log.info("支付回调信息==============》tenantId{}",tenantId); - - //查询租户id - TdTenantApplet tdTenantApplet = null; - if (tenantId != null){ - //查询租户商户信息 - tdTenantApplet = tdTenantAppletService.getById(tenantId); - } - - if (tdTenantApplet == null){ - log.info("支付回调==============》商户信息不存在"); - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - - NotificationConfig config = null; - if (tdTenantApplet.getIsNew()){ - //新支付 - config = new RSAPublicKeyConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) - .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .publicKeyFromPath(tdTenantApplet.getPubKeyPath()) - .publicKeyId(tdTenantApplet.getPubKeyId()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - } else { - //老支付 - config = new RSAAutoCertificateConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) -// .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath()))) - .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - - } - - RequestParam requestParam = new RequestParam.Builder() - .serialNumber(wechatPayCertificateSerialNumber) - .nonce(nonce) - .signature(signature) - .timestamp(timstamp) - // 若未设置signType,默认值为 WECHATPAY2-SHA256-RSA2048 - .body(requestBody) - .build(); - - // 初始化 NotificationParser - NotificationParser parser = new NotificationParser(config); - - - // 验签并解密报文 - JSONObject decryptObject = parser.parse(requestParam,JSONObject.class); - System.out.println("decryptObject="+decryptObject.toJSONString()); - - String trade_state=decryptObject.getString("trade_state"); - //取业务id - String outTradeNo = decryptObject.getString("out_trade_no"); - JSONObject jsonResponse = new JSONObject(); - OrderPayInfo payInfo = payInfoService.getById(Long.parseLong(outTradeNo)); - if(trade_state.equals("SUCCESS")) { - //各种业务逻辑 - //1.订单详情表里修改数据 - payInfoService.payNotice(payInfo,Boolean.TRUE); - //2.如果购买商品是会员则冲会员,其余的则不做操作 - if (StrUtil.equals(payInfo.getPurchaseProductType(), PurchaseProductTypeEnum.MEMBER.getValue())){ - userMemberService.purchaseMember(payInfo); - } - }else{ - //还是各种业务逻辑 - //1.订单详情表里修改数据 - payInfoService.payNotice(payInfo,Boolean.FALSE); - } - jsonResponse.put("code", "SUCCESS"); - jsonResponse.put("message", "成功"); - return jsonResponse; - } - - - @ApiOperation("通关考支付回调接口") - @PostMapping("/tgk") - public JSONObject tGKPayNotice(@RequestHeader("Wechatpay-Serial") String wechatPayCertificateSerialNumber, - @RequestHeader("Wechatpay-Signature") String signature, - @RequestHeader("Wechatpay-Timestamp") String timstamp, - @RequestHeader("Wechatpay-Nonce") String nonce, - @RequestBody String requestBody){ - log.info("支付回调信息==============》{}",requestBody); - //查询租户id - Long tenantId = 51710003l; - TdTenantApplet tdTenantApplet = tdTenantAppletService.getById(tenantId); - - if (tdTenantApplet == null){ - throw new BusinessException( "商户信息不存在,请联系服务人员"); - } - - NotificationConfig config = new RSAAutoCertificateConfig.Builder() - .merchantId(tdTenantApplet.getMchId()) - .privateKey(PemUtil.loadPrivateKeyFromString(InputStreamUtil.getContentStr(tdTenantApplet.getPrivateKeyPath()))) -// .privateKeyFromPath(tdTenantApplet.getPrivateKeyPath()) - .merchantSerialNumber(tdTenantApplet.getMchSerialNo()) - .apiV3Key(tdTenantApplet.getApiV3Key()) - .build(); - RequestParam requestParam = new RequestParam.Builder() - .serialNumber(wechatPayCertificateSerialNumber) - .nonce(nonce) - .signature(signature) - .timestamp(timstamp) - // 若未设置signType,默认值为 WECHATPAY2-SHA256-RSA2048 - - .body(requestBody) - .build(); - - // 初始化 NotificationParser - NotificationParser parser = new NotificationParser(config); - - // 验签并解密报文 - JSONObject decryptObject = parser.parse(requestParam,JSONObject.class); - System.out.println("decryptObject="+decryptObject.toJSONString()); - - String trade_state=decryptObject.getString("trade_state"); - //取业务id - String outTradeNo = decryptObject.getString("out_trade_no"); - JSONObject jsonResponse = new JSONObject(); - OrderPayInfo payInfo = payInfoService.getById(Long.parseLong(outTradeNo)); - if(trade_state.equals("SUCCESS")) { - //各种业务逻辑 - //1.订单详情表里修改数据 - payInfoService.payNotice(payInfo,Boolean.TRUE); - //2.如果购买商品是会员则冲会员,其余的则不做操作 - if (StrUtil.equals(payInfo.getPurchaseProductType(), PurchaseProductTypeEnum.MEMBER.getValue())){ - userMemberService.purchaseMember(payInfo); - } - }else{ - //还是各种业务逻辑 - //1.订单详情表里修改数据 - payInfoService.payNotice(payInfo,Boolean.FALSE); - } - jsonResponse.put("code", "SUCCESS"); - jsonResponse.put("message", "成功"); - return jsonResponse; - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java b/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java deleted file mode 100644 index 060143d..0000000 --- a/src/main/java/com/wrj/driver/server/controller/PayPrepayController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 预支付表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@RestController -@RequestMapping("/payPrepay") -public class PayPrepayController { - - -} diff --git a/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java b/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java deleted file mode 100644 index b278c8b..0000000 --- a/src/main/java/com/wrj/driver/server/controller/PayPrepayResultController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 支付结果表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//payPrepayResult") -public class PayPrepayResultController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/PayRefundController.java b/src/main/java/com/wrj/driver/server/controller/PayRefundController.java deleted file mode 100644 index 2a227dd..0000000 --- a/src/main/java/com/wrj/driver/server/controller/PayRefundController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 申请退款表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//payRefund") -public class PayRefundController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java b/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java deleted file mode 100644 index 80acae6..0000000 --- a/src/main/java/com/wrj/driver/server/controller/PayRefundResultController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 退款结果表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//payRefundResult") -public class PayRefundResultController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysUserController.java b/src/main/java/com/wrj/driver/server/controller/SysUserController.java similarity index 69% rename from src/main/java/com/wrj/driver/server/controller/TdSysUserController.java rename to src/main/java/com/wrj/driver/server/controller/SysUserController.java index 8df6aed..3b820b6 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdSysUserController.java +++ b/src/main/java/com/wrj/driver/server/controller/SysUserController.java @@ -3,12 +3,10 @@ package com.wrj.driver.server.controller; import com.alibaba.fastjson.JSONObject; import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.dto.DriverSchoolDto; import com.wrj.driver.server.dto.LoginUserDto; -import com.wrj.driver.server.interceptor.TenantContextHolder; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdSysUserLogService; -import com.wrj.driver.server.service.ITdSysUserService; +import com.wrj.driver.server.service.ISysUserLogService; +import com.wrj.driver.server.service.ISysUserService; import com.wrj.driver.server.vo.LoginUserVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,15 +27,15 @@ import java.time.LocalDateTime; */ @RestController @Api(tags = "用户管理") -@RequestMapping("/tdSysUser") +@RequestMapping("/sysUser") @Slf4j -public class TdSysUserController { +public class SysUserController { @Autowired - private ITdSysUserService userService; + private ISysUserService userService; @Autowired - private ITdSysUserLogService userLogService; + private ISysUserLogService userLogService; @ApiOperation("获取验证码") @GetMapping("/code") @@ -50,9 +48,8 @@ public class TdSysUserController { @PostMapping("/login") public BaseResponse login(@RequestBody @Valid LoginUserDto loginUserDto) { log.info("用户登录======>loginUserDto:{}", loginUserDto); - loginUserDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); LoginUserVo userVo = userService.login(loginUserDto); - userLogService.saveLog("用户登录", 4, loginUserDto.getDevice(), 1, userVo.getUserId(), JSONObject.toJSONString(loginUserDto), JSONObject.toJSONString(userVo), 0, LocalDateTime.now(), loginUserDto.getTenantId()); + userLogService.saveLog("用户登录", 4, loginUserDto.getDevice(), 1, userVo.getUserId(), JSONObject.toJSONString(loginUserDto), JSONObject.toJSONString(userVo), 0, LocalDateTime.now()); return BaseResponse.success(userVo); } @@ -61,7 +58,7 @@ public class TdSysUserController { public BaseResponse loginOut(){ log.info("用户登出======>{}", LocalDateTime.now()); Long userId = userService.loginOut(); - userLogService.saveLog("用户登出", 5, null, 1, userId, null, null, 0, LocalDateTime.now(), null); + userLogService.saveLog("用户登出", 5, null, 1, userId, null, null, 0, LocalDateTime.now()); return BaseResponse.success(userId); } @@ -72,13 +69,4 @@ public class TdSysUserController { log.info("获取用户信息======>"); return BaseResponse.success(userService.queryUserMessage()); } - - @ApiOperation("用户绑定驾校") - @PostMapping("/bindSchool") - public BaseResponse bindSchool(@RequestBody @Valid DriverSchoolDto schoolDto) { - log.info("用户绑定驾校信息======>schoolDto{}",schoolDto); - return BaseResponse.success(userService.bindSchool(schoolDto)); - } - - } diff --git a/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java b/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java deleted file mode 100644 index 70c7ce8..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdCarouselImageController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.interceptor.TenantContextHolder; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdCarouselImageService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@RestController -@RequestMapping("/tdCarouselImage") -@Slf4j -public class TdCarouselImageController { - - @Resource - private ITdCarouselImageService carouselImageService; - - //查询轮播图信息 - - @ApiOperation("根据车型和科目查询章节") - @PostMapping("/queryList") - public BaseResponse queryList() { - log.info("获取轮播图======>queryDto:{}"); - return BaseResponse.success(carouselImageService.queryList(TenantContextHolder.getTenantId())); - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java deleted file mode 100644 index 34e54ea..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdCategoryQuestionController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 题型题目表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdCategoryQuestion") -public class TdCategoryQuestionController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java b/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java deleted file mode 100644 index cda3a8f..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 考场信息表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdExaminationRoom") -public class TdExaminationRoomController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java b/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java deleted file mode 100644 index 9c23902..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdExaminationRoomRoadController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 考场线路表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdExaminationRoomRoad") -public class TdExaminationRoomRoadController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdMemberController.java b/src/main/java/com/wrj/driver/server/controller/TdMemberController.java deleted file mode 100644 index 5953dab..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdMemberController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.wrj.driver.server.controller; - - -import com.wrj.driver.server.dto.MemberQueryDto; -import com.wrj.driver.server.interceptor.TenantContextHolder; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdMemberService; -import com.wrj.driver.server.util.SecurityUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 会员类型表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Api(tags = "会员") -@RestController -@RequestMapping("/tdMember") -@Slf4j -public class TdMemberController { - - @Autowired - private ITdMemberService memberService; - - @ApiOperation("查询会员列表") - @PostMapping("/queryMember") - public BaseResponse queryMember(@RequestBody MemberQueryDto queryDto) { - log.info("获取会员列表======>queryDto:{}", queryDto); - queryDto.setTenantId(TenantContextHolder.getTenantId()); - return BaseResponse.success(memberService.queryMember(queryDto)); - } - - - @ApiOperation("查询用户开通的会员") - @PostMapping("/queryUserMember") - public BaseResponse queryUserMember(@RequestBody MemberQueryDto queryDto) { - log.info("获取用户会员列表======>queryDto:{}", queryDto); - queryDto.setTenantId(TenantContextHolder.getTenantId()); - return BaseResponse.success(memberService.queryUserMember(queryDto, SecurityUtil.getUserId())); - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java deleted file mode 100644 index 77babc6..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdModuleQuestionController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 模块题目表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdModuleQuestion") -public class TdModuleQuestionController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java deleted file mode 100644 index 7e5dc84..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdPointQuestionController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 考点题目表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdPointQuestion") -public class TdPointQuestionController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdProjectController.java b/src/main/java/com/wrj/driver/server/controller/TdProjectController.java deleted file mode 100644 index b5988ad..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdProjectController.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.wrj.driver.server.controller; - - -import com.wrj.driver.server.dto.ProjectDto; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdProjectService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - *

- * 考试项目表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Api(tags = "考试项目") -@RestController -@RequestMapping("/tdTestProject") -@Slf4j -public class TdProjectController { - - @Autowired - private ITdProjectService projectService; - - @ApiOperation("获取项目列表 (考试项目和基础操作)") - @PostMapping("/queryProjectList") - public BaseResponse list(@RequestBody ProjectDto projectDto) { - log.info("获取考试项目=========》projectDto{}",projectDto); - return BaseResponse.success(projectService.queryProjectList(projectDto)); - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java b/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java deleted file mode 100644 index 1a4212e..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdQuestionJxController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.wrj.driver.server.controller; - - -import com.wrj.driver.server.dto.QuestionJxQueryDto; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdQuestionJxService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -/** - *

- * 题库; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Api(tags = "精选题库") -@RestController -@RequestMapping("/tdQuestionJx") -@Slf4j -public class TdQuestionJxController { - - @Autowired - private ITdQuestionJxService tdQuestionJxService; - - @ApiOperation("查询精选题库id") - @PostMapping("/queryJXQuestionIds") - public BaseResponse queryJXQuestionIds(@RequestBody QuestionJxQueryDto queryDto) { - log.info("获取精选题型======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionJxService.queryJXQuestionIds(queryDto)); - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java b/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java deleted file mode 100644 index 02f4c0a..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdQuestionVersionController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.wrj.driver.server.controller; - - -import com.wrj.driver.server.entity.TdQuestionVersion; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdQuestionVersionService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Objects; - -/** - *

- * 题库版本表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-09-03 - */ -@Api(tags = "题库版本") -@RestController -@RequestMapping("/tdQuestionVersion") -@Slf4j -public class TdQuestionVersionController { - - @Autowired - private ITdQuestionVersionService versionService; - - @ApiOperation("获取题库当前版本") - @GetMapping("/currentVersion") - public BaseResponse testSubmit(@RequestParam Integer carTypeId) { - log.info("获取题库当前版本======>carTypeId:{}", carTypeId); - return BaseResponse.success(versionService.currentVersion(carTypeId)); - } - - - @ApiOperation("题库版本更新") - @PostMapping("/addVersion") - public BaseResponse addVersion(@RequestBody TdQuestionVersion versionDto) { - log.info("题库版本更新======>versionDto:{}", versionDto); - if (Objects.isNull(versionDto.getCarTypeId())){ - throw new BusinessException("缺少必要参数"); - } - - return BaseResponse.success(versionService.addVersion(versionDto)); - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdSecretController.java b/src/main/java/com/wrj/driver/server/controller/TdSecretController.java deleted file mode 100644 index 5ecd545..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdSecretController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdSecretService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -/** - * 密卷 - */ -@RestController -@RequestMapping("/tdSecret") -@Slf4j -public class TdSecretController { - - @Resource - private ITdSecretService secretService; - - //查询 - @PostMapping("/querySecretIds") - public BaseResponse querySecretIds(@RequestBody BaseQueryDto queryDto) { - log.info("获取密卷ids======>queryDto:{}", queryDto); - return BaseResponse.success(secretService.querySecretIds(queryDto)); - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java deleted file mode 100644 index 271a97b..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdSecretQuestionController.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.dto.SecretQueryDto; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdSecretQuestionService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; - -@RestController -@RequestMapping("/tdSecretQuestion") -@Slf4j -public class TdSecretQuestionController { - - @Resource - private ITdSecretQuestionService secretQuestionService; - - //查询 - @PostMapping("/querySecretQuestionIds") - public BaseResponse querySecretQuestionIds(@RequestBody SecretQueryDto queryDto) { - log.info("获取密卷明细ids======>queryDto:{}", queryDto); - return BaseResponse.success(secretQuestionService.querySecretQuestionIds(queryDto)); - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java b/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java deleted file mode 100644 index d5a49ae..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdSysUserMemberController.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.wrj.driver.server.controller; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wrj.driver.server.dto.MemberQueryDto; -import com.wrj.driver.server.dto.UserMemberDto; -import com.wrj.driver.server.entity.TdMember; -import com.wrj.driver.server.entity.TdSysUser; -import com.wrj.driver.server.entity.TdSysUserMember; -import com.wrj.driver.server.service.ITdCarService; -import com.wrj.driver.server.service.ITdMemberService; -import com.wrj.driver.server.service.ITdSysUserMemberService; -import com.wrj.driver.server.service.ITdSysUserService; -import com.wrj.driver.server.vo.UserMemberVo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.HashMap; -import java.util.Map; - -/** - *

- * 用户会员表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@RestController -@RequestMapping("/tdSysUserMember") -@Slf4j -@Api(tags = "用户会员") -public class TdSysUserMemberController { - - @Resource - private ITdMemberService memberService; - @Resource - private ITdSysUserMemberService userMemberService; - @Resource - private ITdCarService tdCarService; - @Resource - private ITdSysUserService userService; - - - /** - * 查询会员列表 - * */ - @ApiOperation("查询车型列表") - @GetMapping("/duima/car/list") - public Map getCarList(){ - Map result = new HashMap<>(); - result.put("code", 200); - result.put("data", tdCarService.list()); - return result; - } - - - /** - * 查询会员列表 - * */ - @ApiOperation("查询会员类型列表") - @GetMapping("/duima/member/list") - public Map getMemberList(MemberQueryDto memberQueryDto){ - Map result = new HashMap<>(); - result.put("code", 200); - result.put("data", memberService.queryMember(memberQueryDto)); - return result; - } - - //查询用户会员列表 - @ApiOperation("查询会员用户列表") - @GetMapping("/duima/user/member/list") - public Map getUserMemberList(UserMemberDto userMemberDto){ - Map result = new HashMap<>(); - result.put("code", 200); - result.put("data", userMemberService.queryUserMemberList(userMemberDto)); - return result; - } - - - //新增会员 - - @ApiOperation("新增用户会员") - @PostMapping("/duima/user/member") - public Map addUserMember(@RequestBody UserMemberVo userMemberVo){ - Map result = new HashMap<>(); - - final LocalDateTime nowTime = LocalDateTime.now(); - - //跟进手机号查询用户 - LambdaQueryWrapper cond = new LambdaQueryWrapper() - .eq(TdSysUser::getPhone,userMemberVo.getPhone()); - TdSysUser user = userService.getOne(cond); - if(user == null){ - result.put("code", 500); - result.put("msg", "用户不存在"); - return result; - } - //查询会员信息 - TdMember member = memberService.getById(userMemberVo.getMemberId()); - if (member == null){ - result.put("code", 500); - result.put("msg", "会员信息不存在"); - return result; - } - - - TdSysUserMember userMember = new TdSysUserMember() - .setMemberId(userMemberVo.getMemberId()) - .setUserId(user.getUserId()) - .setCreateTime(nowTime) - .setUpdateTime(nowTime) - .setStartDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN)); - //会员有效期 - if ("1".equals(member.getUnit())){ - //日 - userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(member.getDuration()).minusSeconds(1)); - } else if ("2".equals(member.getUnit())){ - //月 - userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusMonths(member.getDuration()).minusSeconds(1)); - } else if ("3".equals(member.getUnit())){ - //年 - userMember.setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusYears(member.getDuration()).minusSeconds(1)); - } - result.put("code", 200); - result.put("data", userMemberService.saveOrUpdate(userMember)); - return result; - } - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java b/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java deleted file mode 100644 index bbc7d15..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdTenantCarController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.wrj.driver.server.controller; - -import com.wrj.driver.server.interceptor.TenantContextHolder; -import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdTenantCarService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -@RestController -@Api(tags = "租户车型") -@RequestMapping("/tdTenantCar") -@Slf4j -public class TdTenantCarController { - - @Resource - private ITdTenantCarService tdTenantCarService; - - //查询租户车型信息 - @ApiOperation("查询租户车型信息") - @PostMapping("/list") - public BaseResponse queryList() { - log.info("获取租户车型信息======>tenantId:{}", TenantContextHolder.getTenantId()); - return BaseResponse.success(tdTenantCarService.queryList(TenantContextHolder.getTenantId())); - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java b/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java deleted file mode 100644 index 9bf7223..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignCategoryController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 图标分类表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdTrafficSignCategory") -public class TdTrafficSignCategoryController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java b/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java deleted file mode 100644 index e8f993e..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdTrafficSignQuestionController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 图标分类相关题目表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Controller -@RequestMapping("//tdTrafficSignQuestion") -public class TdTrafficSignQuestionController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdVideosController.java b/src/main/java/com/wrj/driver/server/controller/TdVideosController.java deleted file mode 100644 index fd5b1fd..0000000 --- a/src/main/java/com/wrj/driver/server/controller/TdVideosController.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.stereotype.Controller; - -/** - *

- * 视频标识表; 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-20 - */ -@Controller -@RequestMapping("//tdVideos") -public class TdVideosController { - -} diff --git a/src/main/java/com/wrj/driver/server/controller/VoiceController.java b/src/main/java/com/wrj/driver/server/controller/VoiceController.java deleted file mode 100644 index 43a1a38..0000000 --- a/src/main/java/com/wrj/driver/server/controller/VoiceController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.wrj.driver.server.controller; - - -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.sound.sampled.*; -import java.io.File; -import java.io.IOException; - -/** - *

- * 支付表 前端控制器 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@RestController -@RequestMapping("/voice") -@Slf4j -public class VoiceController { - @ApiOperation("文字转语音") - @GetMapping("/contentToAudio") - public void contentToAudio(@RequestParam String content) { - log.info("文字转语音======>content:{}", content); - final AudioFormat format = new AudioFormat(44100, 16, 1, true, false); - - DataLine.Info dataLineInfo = new DataLine.Info(TargetDataLine.class, format); - - if (!AudioSystem.isLineSupported(dataLineInfo)) { - return; - } - - TargetDataLine targetDataLine; - try { - targetDataLine = (TargetDataLine) AudioSystem.getLine(dataLineInfo); - targetDataLine.open(format); - targetDataLine.start(); - - // Record audio - AudioInputStream audioInputStream = new AudioInputStream(targetDataLine); - - // Save audio to file - File audioFile = new File("recorded_audio.wav"); - AudioSystem.write(audioInputStream, AudioFileFormat.Type.WAVE, audioFile); - targetDataLine.close(); - } catch (LineUnavailableException | IOException e) { - e.printStackTrace(); - } - } -} diff --git a/src/main/java/com/wrj/driver/server/controller/TdChapterController.java b/src/main/java/com/wrj/driver/server/controller/WrjChapterController.java similarity index 69% rename from src/main/java/com/wrj/driver/server/controller/TdChapterController.java rename to src/main/java/com/wrj/driver/server/controller/WrjChapterController.java index 188add7..cf33094 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdChapterController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjChapterController.java @@ -3,7 +3,7 @@ package com.wrj.driver.server.controller; import com.wrj.driver.server.dto.ChapterQueryDto; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdChapterService; +import com.wrj.driver.server.service.IWrjChapterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -20,18 +20,18 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "章节") @RestController -@RequestMapping("/tdChapter") +@RequestMapping("/wrjChapter") @Slf4j -public class TdChapterController { +public class WrjChapterController { @Autowired - private ITdChapterService tdChapterService; + private IWrjChapterService wrjChapterService; - @ApiOperation("根据车型和科目查询章节") + @ApiOperation("根据驾驶员类型查询章节") @PostMapping("/queryChapter") public BaseResponse queryChapter(@RequestBody ChapterQueryDto queryDto) { log.info("获取章节======>queryDto:{}", queryDto); - return BaseResponse.success(tdChapterService.queryChapter(queryDto)); + return BaseResponse.success(wrjChapterService.queryChapter(queryDto)); } diff --git a/src/main/java/com/wrj/driver/server/controller/TdCarController.java b/src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java similarity index 60% rename from src/main/java/com/wrj/driver/server/controller/TdCarController.java rename to src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java index b8950ec..205e665 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdCarController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjDriverTypeController.java @@ -2,9 +2,9 @@ package com.wrj.driver.server.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wrj.driver.server.entity.TdCar; +import com.wrj.driver.server.entity.WrjDriverType; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdCarService; +import com.wrj.driver.server.service.IWrjDriverTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -22,20 +22,20 @@ import org.springframework.web.bind.annotation.RestController; * @author Automated procedures * @since 2023-08-10 */ -@Api(tags = "车型") +@Api(tags = "无人记驾驶员类型") @RestController -@RequestMapping("/tdCar") +@RequestMapping("/wrjDriverType") @Slf4j -public class TdCarController { +public class WrjDriverTypeController { @Autowired - private ITdCarService carService; + private IWrjDriverTypeService driverTypeService; - @ApiOperation("获取车型列表") + @ApiOperation("获取无人机驾驶员类型列表") @GetMapping("/list") public BaseResponse list() { - return BaseResponse.success(carService.list(new LambdaQueryWrapper() - .eq(TdCar::getIsActive, "0"))); + return BaseResponse.success(driverTypeService.list(new LambdaQueryWrapper() + .eq(WrjDriverType::getIsActive, "0"))); } } diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionController.java b/src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java similarity index 65% rename from src/main/java/com/wrj/driver/server/controller/TdQuestionController.java rename to src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java index 1c3adbc..f5ae0f7 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdQuestionController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjQuestionController.java @@ -6,7 +6,7 @@ import com.wrj.driver.server.dto.QuestionAddDto; import com.wrj.driver.server.dto.QuestionQueryDto; import com.wrj.driver.server.exception.BusinessException; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdQuestionService; +import com.wrj.driver.server.service.IWrjQuestionService; import com.wrj.driver.server.vo.QuestionVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,74 +30,55 @@ import java.util.Objects; */ @Api(tags = "考试题库") @RestController -@RequestMapping("/tdQuestion") +@RequestMapping("/wrjQuestion") @Slf4j -public class TdQuestionController { +public class WrjQuestionController { @Autowired - private ITdQuestionService tdQuestionService; + private IWrjQuestionService questionService; @ApiOperation("根据id获取题目") @PostMapping("/queryQuestionById") public BaseResponse queryQuestionById(@RequestBody QuestionQueryDto queryDto) { log.info("获取题型======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.queryQuestionById(queryDto)); + return BaseResponse.success(questionService.queryQuestionById(queryDto)); } @ApiOperation("根据id列表获取题目") @PostMapping("/queryQuestionByIdList") public BaseResponse queryQuestionByIdList(@RequestBody QuestionQueryDto queryDto) { log.info("获取题型======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.queryQuestionByIdList(queryDto)); + return BaseResponse.success(questionService.queryQuestionByIdList(queryDto)); } @ApiOperation("根据查询条件获取题目") @PostMapping("/queryQuestion") public BaseResponse queryQuestion(@RequestBody QuestionQueryDto queryDto) { log.info("根据查询条件获取题目======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.queryQuestion(queryDto)); + return BaseResponse.success(questionService.queryQuestion(queryDto)); } @ApiOperation("根据查询条件获取题目Id") @PostMapping("/queryQuestionId") public BaseResponse queryQuestionId(@RequestBody QuestionQueryDto queryDto) { log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.queryQuestionId(queryDto)); + return BaseResponse.success(questionService.queryQuestionId(queryDto)); } @ApiOperation("获取模拟考试题目") @PostMapping("/getTestQuestion") public BaseResponse getTestQuestion(@RequestBody QuestionQueryDto queryDto) { log.info("获取模拟考试题目======>queryDto:{}", queryDto); - if (Objects.isNull(queryDto.getCarTypeId()) && Objects.isNull(queryDto.getSubject())){ - throw new BusinessException("缺少必要参数"); - } - return BaseResponse.success(tdQuestionService.getTestQuestion(queryDto)); + return BaseResponse.success(questionService.getTestQuestion(queryDto)); } @ApiOperation("获取模拟考试题目Id") @PostMapping("/getTestQuestionId") public BaseResponse getTestQuestionId(@RequestBody QuestionQueryDto queryDto) { log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.getTestQuestionId(queryDto)); + return BaseResponse.success(questionService.getTestQuestionId(queryDto)); } -// @ApiOperation("获取资格证模拟考试题目Id") -// @PostMapping("/zgz/getTestQuestionId") -// public BaseResponse getZgzTestQuestionId(@RequestBody QuestionQueryDto queryDto) { -// log.info("根据查询条件获取题目Id======>queryDto:{}", queryDto); -// return BaseResponse.success(tdQuestionService.getTestQuestionId(queryDto)); -// } - - @ApiOperation("题目分类") - @PostMapping("/questionCategory") - public BaseResponse questionCategory(@RequestBody QuestionQueryDto queryDto) { - log.info("分类题目标识======>questionIdList:{}", queryDto.getQuestionIdList()); - if (CollectionUtil.isEmpty(queryDto.getQuestionIdList())){ - return BaseResponse.success(Collections.emptyList()); - } - return BaseResponse.success(tdQuestionService.questionCategory(queryDto)); - } @ApiOperation("对嘛接口-根据查询条件获取题目") @GetMapping("/duima/list") @@ -105,7 +86,7 @@ public class TdQuestionController { log.info("获取题型======>queryDto:{}", queryDto); Map result = new HashMap<>(); result.put("code", 200); - result.put("data", tdQuestionService.queryQuestion(queryDto)); + result.put("data", questionService.queryQuestion(queryDto)); return result; } @@ -115,7 +96,7 @@ public class TdQuestionController { log.info("修改题库======>questionVo:{}", questionVo); Map result = new HashMap<>(); result.put("code", 200); - result.put("data", tdQuestionService.updateQuestion(questionVo)); + result.put("data", questionService.updateQuestion(questionVo)); return result; } @@ -125,7 +106,7 @@ public class TdQuestionController { log.info("新增题库======>QuestionAddDto:{}", addDto); Map result = new HashMap<>(); result.put("code", 200); - result.put("data", tdQuestionService.insertQuestion(addDto)); + result.put("data", questionService.insertQuestion(addDto)); return result; } @@ -133,7 +114,7 @@ public class TdQuestionController { @PostMapping("/querySpecialNum") public BaseResponse querySpecialNum(@RequestBody QuestionQueryDto queryDto) { log.info("查询各专项分类题目数量======>queryDto:{}", queryDto); - return BaseResponse.success(tdQuestionService.querySpecialNum(queryDto)); + return BaseResponse.success(questionService.querySpecialNum(queryDto)); } } diff --git a/src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java b/src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java similarity index 70% rename from src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java rename to src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java index a4411b1..3545201 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdQuestionTestController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjQuestionTestController.java @@ -4,9 +4,8 @@ package com.wrj.driver.server.controller; import com.wrj.driver.server.constant.Constants; import com.wrj.driver.server.dto.TestQueryDto; import com.wrj.driver.server.dto.TestSubmitDto; -import com.wrj.driver.server.interceptor.TenantContextHolder; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdQuestionTestService; +import com.wrj.driver.server.service.IWrjQuestionTestService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -25,18 +24,17 @@ import javax.validation.Valid; */ @Api(tags = "考试") @RestController -@RequestMapping("/tdQuestionTest") +@RequestMapping("/wrjQuestionTest") @Slf4j -public class TdQuestionTestController { +public class WrjQuestionTestController { @Autowired - private ITdQuestionTestService testService; + private IWrjQuestionTestService testService; @ApiOperation("提交考试成绩") @PostMapping("/testSubmit") public BaseResponse testSubmit(@RequestBody @Valid TestSubmitDto submitDto) { log.info("考试成绩======>submitDto:{}", submitDto); - submitDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); return testService.testSubmit(submitDto); } @@ -44,7 +42,6 @@ public class TdQuestionTestController { @PostMapping("/testTotal") public BaseResponse testTotal(@RequestBody @Valid TestQueryDto queryDto) { log.info("考试统计查询======>queryDto:{}", queryDto); - queryDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); return BaseResponse.success(testService.testTotal(queryDto)); } @@ -52,7 +49,6 @@ public class TdQuestionTestController { @PostMapping("/getTestScore") public BaseResponse getTestScore(@RequestBody @Valid TestQueryDto queryDto) { log.info("获取考试成绩======>queryDto:{}", queryDto); - queryDto.setTenantId(TenantContextHolder.getTenantId() == null ? Constants.DEFAULT_TENANT_ID : TenantContextHolder.getTenantId()); return BaseResponse.success(testService.getTestScore(queryDto)); } } diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java similarity index 53% rename from src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java rename to src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java index 1180519..3fcfcc5 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdSysConfigController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigController.java @@ -2,9 +2,9 @@ package com.wrj.driver.server.controller; import com.wrj.driver.server.dto.SysConfigDto; -import com.wrj.driver.server.entity.TdSysConfig; +import com.wrj.driver.server.entity.WrjSysConfig; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdSysConfigService; +import com.wrj.driver.server.service.IWrjSysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -24,40 +24,40 @@ import java.util.Map; */ @Api(tags = "字典值配置") @RestController -@RequestMapping("/tdSysConfig") +@RequestMapping("/wrjSysConfig") @Slf4j -public class TdSysConfigController { +public class WrjSysConfigController { @Autowired - private ITdSysConfigService configService; + private IWrjSysConfigService configService; /** - * 根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 + * 根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1 */ - @ApiOperation("根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1") + @ApiOperation("根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1") @GetMapping(value = "/queryConfigByKey") - public BaseResponse queryConfigByKey(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) { - return BaseResponse.success(configService.queryConfigByKey(configKey, carTypeId)); + public BaseResponse queryConfigByKey(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) { + return BaseResponse.success(configService.queryConfigByKey(configKey, driverTypeId)); } /** - * 根据配置key和carTypeId获取配置值,配置与车型无关则carTypeId为-1 + * 根据配置key和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1 */ @ApiOperation("根据配置key获取配置值") @GetMapping(value = "/queryConfigValueByKey") - public BaseResponse queryConfigValueByKey(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) { + public BaseResponse queryConfigValueByKey(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) { - return BaseResponse.success(configService.queryConfigValueByKey(configKey, carTypeId)); + return BaseResponse.success(configService.queryConfigValueByKey(configKey, driverTypeId)); } /** - * 根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 + * 根据配置keys和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1 */ - @ApiOperation("根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1") + @ApiOperation("根据配置keys和driverTypeId获取配置信息,配置与无人机无关则driverTypeId为-1") @GetMapping(value = "/queryConfigByKeys") - public BaseResponse> queryConfigByKeys(@RequestParam("configKeys") String configKeys, @RequestParam("carTypeId") Integer carTypeId) { - return BaseResponse.success(configService.queryConfigByKeys(Arrays.asList(configKeys.split(",")),carTypeId)); + public BaseResponse> queryConfigByKeys(@RequestParam("configKeys") String configKeys, @RequestParam("driverTypeId") Integer driverTypeId) { + return BaseResponse.success(configService.queryConfigByKeys(Arrays.asList(configKeys.split(",")),driverTypeId)); } diff --git a/src/main/java/com/wrj/driver/server/controller/TdSysConfigListController.java b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigListController.java similarity index 50% rename from src/main/java/com/wrj/driver/server/controller/TdSysConfigListController.java rename to src/main/java/com/wrj/driver/server/controller/WrjSysConfigListController.java index 8cba105..ee93fc3 100644 --- a/src/main/java/com/wrj/driver/server/controller/TdSysConfigListController.java +++ b/src/main/java/com/wrj/driver/server/controller/WrjSysConfigListController.java @@ -1,9 +1,9 @@ package com.wrj.driver.server.controller; -import com.wrj.driver.server.entity.TdSysConfigList; +import com.wrj.driver.server.entity.WrjSysConfigList; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.ITdSysConfigListService; +import com.wrj.driver.server.service.IWrjSysConfigListService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -24,43 +24,43 @@ import java.util.Map; */ @Api(tags = "字典值列表配置") @RestController -@RequestMapping("/tdSysConfigList") +@RequestMapping("/wrjSysConfigList") @Slf4j -public class TdSysConfigListController { +public class WrjSysConfigListController { @Autowired - private ITdSysConfigListService configListService; + private IWrjSysConfigListService configListService; /** * 根据configKey和carTypeId查询系统配置列表 */ - @ApiOperation("根据configKey和carTypeId查询系统配置列表") + @ApiOperation("根据configKey和driverTypeId查询系统配置列表") @GetMapping("/querySysConfigList") - public BaseResponse querySysConfigList(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) { - log.info("request to querySysConfigList :{}, carTypeId:{}", configKey,carTypeId); - List resultList = configListService.querySysConfigList(configKey, carTypeId); + public BaseResponse querySysConfigList(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) { + log.info("request to querySysConfigList :{}, driverTypeId:{}", configKey,driverTypeId); + List resultList = configListService.querySysConfigList(configKey, driverTypeId); return BaseResponse.success(resultList); } /** - * 通过多个configKey(以逗号分隔) 和 carTypeId 查询多个配置列表 + * 通过多个configKey(以逗号分隔) 和 driverTypeId 查询多个配置列表 */ - @ApiOperation("通过多个configKey(以逗号分隔) 和 carTypeId 查询多个配置列表") + @ApiOperation("通过多个configKey(以逗号分隔) 和 driverTypeId 查询多个配置列表") @GetMapping("/querySysConfigMap") - public BaseResponse querySysConfigMap(@RequestParam("configKeys") String configKeys, @RequestParam("carTypeId") Integer carTypeId) { - log.info("request to querySysConfigMap :{}, carTypeId:{}", configKeys,carTypeId); - Map> map = configListService.querySysConfigMap(Arrays.asList(configKeys.split(",")), carTypeId); + public BaseResponse querySysConfigMap(@RequestParam("configKeys") String configKeys, @RequestParam("driverTypeId") Integer driverTypeId) { + log.info("request to querySysConfigMap :{}, driverTypeId:{}", configKeys,driverTypeId); + Map> map = configListService.querySysConfigMap(Arrays.asList(configKeys.split(",")), driverTypeId); return BaseResponse.success(map); } /** - * 根据configKey和carTypeId查询系统配置列表数量 + * 根据configKey和driverTypeId查询系统配置列表数量 */ - @ApiOperation("根据configKey和carTypeId查询系统配置列表数量") + @ApiOperation("根据configKey和driverTypeId查询系统配置列表数量") @GetMapping("/querySysConfigListNum") - public BaseResponse querySysConfigListNum(@RequestParam("configKey") String configKey, @RequestParam("carTypeId") Integer carTypeId) { - log.info("request to querySysConfigListNum :{}, carTypeId:{}", configKey,carTypeId); - Integer listNum = configListService.querySysConfigListNum(configKey, carTypeId); + public BaseResponse querySysConfigListNum(@RequestParam("configKey") String configKey, @RequestParam("driverTypeId") Integer driverTypeId) { + log.info("request to querySysConfigListNum :{}, driverTypeId:{}", configKey,driverTypeId); + Integer listNum = configListService.querySysConfigListNum(configKey, driverTypeId); return BaseResponse.success(listNum); } diff --git a/src/main/java/com/wrj/driver/server/dto/BaseQueryDto.java b/src/main/java/com/wrj/driver/server/dto/BaseQueryDto.java index 5551509..52e1016 100644 --- a/src/main/java/com/wrj/driver/server/dto/BaseQueryDto.java +++ b/src/main/java/com/wrj/driver/server/dto/BaseQueryDto.java @@ -10,21 +10,11 @@ import lombok.experimental.Accessors; @ApiModel("基础查询查询入参") public class BaseQueryDto { - /** - * 所属科目,1:科目1,2:科目4 - */ - @ApiModelProperty("所属科目,1:科目1,2:科目4") - private String subject; /** * 车型 */ @ApiModelProperty("车型") - private Integer carTypeId; + private Integer driverTypeId; - /** - * 题库版本id - */ - @ApiModelProperty("题库版本id") - private Long versionId; } diff --git a/src/main/java/com/wrj/driver/server/dto/ChapterQueryDto.java b/src/main/java/com/wrj/driver/server/dto/ChapterQueryDto.java index 5e3edd1..7b987b1 100644 --- a/src/main/java/com/wrj/driver/server/dto/ChapterQueryDto.java +++ b/src/main/java/com/wrj/driver/server/dto/ChapterQueryDto.java @@ -14,15 +14,9 @@ public class ChapterQueryDto { private Integer chapterId; /** - * 章节名 + * 驾驶员类型 */ - @ApiModelProperty("车型") - private Integer carTypeId; - - /** - * 科目 - */ - @ApiModelProperty("科目") - private Integer subject; + @ApiModelProperty("驾驶员类型") + private Integer driverTypeId; } diff --git a/src/main/java/com/wrj/driver/server/dto/DriverSchoolDto.java b/src/main/java/com/wrj/driver/server/dto/DriverSchoolDto.java deleted file mode 100644 index 0269548..0000000 --- a/src/main/java/com/wrj/driver/server/dto/DriverSchoolDto.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.wrj.driver.server.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * @author 曹林 - * @description 登陆入参 - * @create 2023/8/11 22:21 - */ -@Data -@Accessors(chain = true) -public class DriverSchoolDto { - - @ApiModelProperty(value = "驾校id",required = true) - @NotNull(message = "驾校id不能为空") - private Long schoolId; - - @ApiModelProperty(value = "驾校名称",required = true) - @NotBlank(message = "驾校名称不能为空") - private String schoolName; - - @ApiModelProperty(value = "驾校联系方式",required = false) - private String schoolPhone; - - -} diff --git a/src/main/java/com/wrj/driver/server/dto/LoginUserDto.java b/src/main/java/com/wrj/driver/server/dto/LoginUserDto.java index 729f3c0..0bf14ee 100644 --- a/src/main/java/com/wrj/driver/server/dto/LoginUserDto.java +++ b/src/main/java/com/wrj/driver/server/dto/LoginUserDto.java @@ -24,21 +24,9 @@ public class LoginUserDto { @NotBlank(message = "登陆验证码不能为空") private String code; - @ApiModelProperty(value = "来源") - private String id; - - @ApiModelProperty(value = "分销人员id") - private String distributionId; - @ApiModelProperty(value = "设备号") private String device; - @ApiModelProperty(value = "租户id") - private Long tenantId; - @ApiModelProperty(value = "验证用户是否存在") private Boolean isCheck; - - @ApiModelProperty(value = "小程序id") - private String appId; } diff --git a/src/main/java/com/wrj/driver/server/dto/MemberQueryDto.java b/src/main/java/com/wrj/driver/server/dto/MemberQueryDto.java deleted file mode 100644 index 26a75eb..0000000 --- a/src/main/java/com/wrj/driver/server/dto/MemberQueryDto.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.wrj.driver.server.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 会员查询入参; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@Accessors(chain = true) -@ApiModel("会员查询入参") -public class MemberQueryDto implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 会员标识 - */ - @ApiModelProperty("会员标识") - private Integer memberId; - - /** - * 车型标识 - */ - @ApiModelProperty("车型标识") - private Integer carTypeId; - - /** - * 科目标识 - */ - @ApiModelProperty("科目标识") - private String subject; - - /** - * 租户id - */ - @ApiModelProperty("租户id") - private Long tenantId = 10001l; - - - -} diff --git a/src/main/java/com/wrj/driver/server/dto/ProjectDto.java b/src/main/java/com/wrj/driver/server/dto/ProjectDto.java deleted file mode 100644 index 9190a7c..0000000 --- a/src/main/java/com/wrj/driver/server/dto/ProjectDto.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.wrj.driver.server.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * 考试项目查询; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@Accessors(chain = true) -@ApiModel("考试项目查询入参") -public class ProjectDto implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考试项目 - */ - @ApiModelProperty("考试项目") - private Integer projectId; - - /** - * 类型 - */ - @ApiModelProperty("类型 1:考试项目 2:基础操作") - private String type; - - /** - * 所属科目 - */ - @ApiModelProperty("所属科目") - private String subject; - - /** - * 车型标识 - */ - @ApiModelProperty("车型标识") - private Integer carTypeId; - - /** - * 驾驶类型,手动挡,自动挡,A2:B2等(在字典表里配置) - */ - @ApiModelProperty("驾驶类型") - private String driveType; - -} diff --git a/src/main/java/com/wrj/driver/server/dto/QuestionAddDto.java b/src/main/java/com/wrj/driver/server/dto/QuestionAddDto.java index b061b74..ef8bd57 100644 --- a/src/main/java/com/wrj/driver/server/dto/QuestionAddDto.java +++ b/src/main/java/com/wrj/driver/server/dto/QuestionAddDto.java @@ -12,12 +12,12 @@ import java.util.List; /** * @author 曹林 - * @description 驾考新增入参 + * @description 无人机题目出参 * @create 2023/8/13 17:13 */ @Data @Accessors(chain = true) -@ApiModel("驾考题目出参") +@ApiModel("无人机题目出参") public class QuestionAddDto { private static final long serialVersionUID = 1L; @@ -76,30 +76,12 @@ public class QuestionAddDto { @ApiModelProperty("正确答案") private String trueAnswer; - /** - * 未知 - */ - @ApiModelProperty("未知") - private String cids; - - /** - * 题型分类 - */ - @ApiModelProperty("题型分类") - private String category; - /** * 题目图片url */ @ApiModelProperty("题目图片url") private String imageUrl; - /** - * 未知 - */ - @ApiModelProperty("未知") - private String sohuImg; - /** * 最佳回答 */ @@ -112,12 +94,6 @@ public class QuestionAddDto { @ApiModelProperty("章节标识") private String chapter; - /** - * 所属科目,1:科目1,2:科目4 - */ - @ApiModelProperty("所属科目,1:科目1,2:科目4") - private String subject; - /** * 选择 */ @@ -137,56 +113,9 @@ public class QuestionAddDto { @ApiModelProperty("显示序号") private int showOrder; - /** - * 车型 - */ - @ApiModelProperty("车型") - @NotNull - private Integer carTypeId; - /** * 是否生效 */ @ApiModelProperty("是否生效") private String isActive; - - /** - * 是否vip题型 - */ - @ApiModelProperty("是否VIP") - @NotNull - private Integer isVip; - /** - * 是否易错 - */ - @ApiModelProperty("是否易错") - private Integer isError; - /** - * 是否v新规 - */ - @ApiModelProperty("是否新规") - private Integer isNew; - /** - * 考点 - */ - @ApiModelProperty("考点") - private String examKeys; - - /** - * 是否精讯600题 - */ - @ApiModelProperty("精讯600题") - private Integer isVip2; - - /** - * 是否密卷1 - */ - @ApiModelProperty("是否密卷1") - private Integer isExam1; - - /** - * 是否密卷2 - */ - @ApiModelProperty("是否密卷2") - private Integer isExam2; } diff --git a/src/main/java/com/wrj/driver/server/dto/QuestionJxQueryDto.java b/src/main/java/com/wrj/driver/server/dto/QuestionJxQueryDto.java deleted file mode 100644 index 8f796ff..0000000 --- a/src/main/java/com/wrj/driver/server/dto/QuestionJxQueryDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wrj.driver.server.dto; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * 题库查询入参; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@Accessors(chain = true) -@ApiModel("精选题目查询入参") -public class QuestionJxQueryDto extends BaseQueryDto implements Serializable { - - private static final long serialVersionUID = 1L; - - - -} diff --git a/src/main/java/com/wrj/driver/server/dto/QuestionQueryDto.java b/src/main/java/com/wrj/driver/server/dto/QuestionQueryDto.java index ea6f233..ee497e0 100644 --- a/src/main/java/com/wrj/driver/server/dto/QuestionQueryDto.java +++ b/src/main/java/com/wrj/driver/server/dto/QuestionQueryDto.java @@ -27,6 +27,12 @@ public class QuestionQueryDto implements Serializable { private static final long serialVersionUID = 1L; + /** + * 无人记驾驶员类型 + */ + @ApiModelProperty("无人记驾驶员类型") + private Integer driverTypeId; + /** * 题目标识 */ @@ -39,29 +45,11 @@ public class QuestionQueryDto implements Serializable { @ApiModelProperty("题目标识列表") private List questionIdList; - /** - * 题型分类 - */ - @ApiModelProperty("题型分类") - private String category; - /** * 章节标识 */ @ApiModelProperty("章节标识") - private String chapter; - - /** - * 所属科目,1:科目1,2:科目4 - */ - @ApiModelProperty("所属科目,1:科目1,2:科目4") - private String subject; - - /** - * 车型 - */ - @ApiModelProperty("车型") - private Integer carTypeId; + private Integer chapter; /** * 题型: 单选 多选 判断题 @@ -69,18 +57,6 @@ public class QuestionQueryDto implements Serializable { @ApiModelProperty("题型: 单选 多选 判断题") private String type; - /** - * 专项练习类型 - */ - @ApiModelProperty("专项练习类型") - private String cid; - - /** - * 考点 - */ - @ApiModelProperty("考点") - private String point; - /** * 获取题数 */ @@ -93,63 +69,10 @@ public class QuestionQueryDto implements Serializable { @ApiModelProperty("题目") private String question; - /** - * 是否易错 - */ - @ApiModelProperty("是否易错") - private Integer isError; - /** - * 是否v新规 - */ - @ApiModelProperty("是否v新规") - private Integer isNew; - /** * 是否是图片 */ @ApiModelProperty("是否是图片") private Integer isImage; - /** - * 考点 - */ - @ApiModelProperty("考点") - private String examKey; - - /** - * 是否精讯500题 - */ - @ApiModelProperty("是否精讯500题") - private Integer isVip; - - /** - * 是否精讯600题 - */ - @ApiModelProperty("是否精讯600题") - private Integer isVip2; - - /** - * 是否密卷1 - */ - @ApiModelProperty("是否密卷1") - private Integer isExam1; - - /** - * 是否密卷2 - */ - @ApiModelProperty("是否密卷2") - private Integer isExam2; - - /** - * 题库版本id - */ - @ApiModelProperty("题库版本id") - private Long versionId; - - - /** - * 是否有水印 - * */ - private Boolean isWatermark; - } diff --git a/src/main/java/com/wrj/driver/server/dto/SecretQueryDto.java b/src/main/java/com/wrj/driver/server/dto/SecretQueryDto.java deleted file mode 100644 index c70b613..0000000 --- a/src/main/java/com/wrj/driver/server/dto/SecretQueryDto.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wrj.driver.server.dto; - -import io.swagger.annotations.ApiModel; -import lombok.Data; -import lombok.experimental.Accessors; - -@Data -@Accessors(chain = true) -@ApiModel("密卷查询入参") -public class SecretQueryDto extends BaseQueryDto{ - - private Integer secretId; -} diff --git a/src/main/java/com/wrj/driver/server/dto/SysConfigDto.java b/src/main/java/com/wrj/driver/server/dto/SysConfigDto.java index e080bda..4b87d9c 100644 --- a/src/main/java/com/wrj/driver/server/dto/SysConfigDto.java +++ b/src/main/java/com/wrj/driver/server/dto/SysConfigDto.java @@ -20,33 +20,33 @@ public class SysConfigDto implements Serializable { private static final long serialVersionUID = 1L; /** - * 车型标识,-1为与车型无关 + * 车无人机驾驶类型标识,-1为与无人机驾驶类型标识无关 */ - @ApiModelProperty("CAR_TYPE_ID") - private Integer carTypeId; + @ApiModelProperty("无人机驾驶类型标识,-1为与无人机驾驶类型标识无关") + private Integer driverTypeId; /** * 配置项KEY */ - @ApiModelProperty("CONFIG_KEY") + @ApiModelProperty("配置项KEY") private String configKey; /** * 配置项值 */ - @ApiModelProperty("CONFIG_VALUE") + @ApiModelProperty("配置项值") private String configValue; /** * 配置项名称 */ - @ApiModelProperty("CONFIG_NAME") + @ApiModelProperty("配置项名称") private String configName; /** * 配置项说明 */ - @ApiModelProperty("CONFIG_DESC") + @ApiModelProperty("配置项说明") private String configDesc; /** @@ -60,19 +60,19 @@ public class SysConfigDto implements Serializable { /** * 配置项JSON值 */ - @ApiModelProperty("CONFIG_JSON") + @ApiModelProperty("配置项JSON值") private String configJson; /** * 是否生效 */ - @ApiModelProperty("IS_ACTIVE") + @ApiModelProperty("是否生效") private String isActive; /** * 创建时间 */ - @ApiModelProperty("CREATE_TIME") + @ApiModelProperty("创建时间 ") @JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime createTime; diff --git a/src/main/java/com/wrj/driver/server/dto/TestQueryDto.java b/src/main/java/com/wrj/driver/server/dto/TestQueryDto.java index 2c2da21..251cf4e 100644 --- a/src/main/java/com/wrj/driver/server/dto/TestQueryDto.java +++ b/src/main/java/com/wrj/driver/server/dto/TestQueryDto.java @@ -22,22 +22,11 @@ public class TestQueryDto { /** * 车型标识 */ - @ApiModelProperty(value = "车型标识") - @NotNull(message = "车型标识不能为空") - private Integer carTypeId; + @ApiModelProperty(value = "无人机驾驶员类型标识") + @NotNull(message = "无人机驾驶员类型标识不能为空") + private Integer driverTypeId; - - /** - * 科目 - */ - @ApiModelProperty(value = "科目") -// @NotNull(message = "考试科目不能为空") - private String subject ; - - @ApiModelProperty(value = "租户id") - private Long tenantId = 999999l; - @ApiModelProperty(value = "用户id") private Long userId; } diff --git a/src/main/java/com/wrj/driver/server/dto/TestQuestionTypeDto.java b/src/main/java/com/wrj/driver/server/dto/TestQuestionTypeDto.java index 10dfd9b..3eec48b 100644 --- a/src/main/java/com/wrj/driver/server/dto/TestQuestionTypeDto.java +++ b/src/main/java/com/wrj/driver/server/dto/TestQuestionTypeDto.java @@ -17,9 +17,6 @@ import java.util.List; @Accessors(chain = true) public class TestQuestionTypeDto { - //科目 - private String subject; - private List chapterList; @Data diff --git a/src/main/java/com/wrj/driver/server/dto/TestSubmitDto.java b/src/main/java/com/wrj/driver/server/dto/TestSubmitDto.java index 61948fa..49e930e 100644 --- a/src/main/java/com/wrj/driver/server/dto/TestSubmitDto.java +++ b/src/main/java/com/wrj/driver/server/dto/TestSubmitDto.java @@ -25,23 +25,16 @@ public class TestSubmitDto { /** * 车型标识 */ - @ApiModelProperty(value = "车型标识",required = true) - @NotNull(message = "车型标识不能为空") - private Integer carTypeId; + @ApiModelProperty(value = "无人机驾驶员类型标识",required = true) + @NotNull(message = "无人机驾驶员类型标识不能为空") + private Integer driverTypeId; - /** - * 科目 - */ - @ApiModelProperty(value = "科目",required = true) - @NotBlank(message = "考试科目不能为空") - private String subject ; /** * 考试得分 */ @ApiModelProperty(value = "考试得分",required = true) @NotNull(message = "考试得分不能为空") - @Max(100) @Min(0) private Integer score; @@ -53,9 +46,4 @@ public class TestSubmitDto { @Max(3600) @Min(0) private Integer testTime; - - @ApiModelProperty(value = "租户id",required = true) - private Long tenantId; - - } diff --git a/src/main/java/com/wrj/driver/server/dto/UserMemberDto.java b/src/main/java/com/wrj/driver/server/dto/UserMemberDto.java deleted file mode 100644 index b37aca0..0000000 --- a/src/main/java/com/wrj/driver/server/dto/UserMemberDto.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.wrj.driver.server.dto; - -import lombok.Data; - -@Data -public class UserMemberDto { - private String phone; - private Integer memberId; - private Long tenantId = 10001l; -} diff --git a/src/main/java/com/wrj/driver/server/entity/OrderPayInfo.java b/src/main/java/com/wrj/driver/server/entity/OrderPayInfo.java deleted file mode 100644 index 439d420..0000000 --- a/src/main/java/com/wrj/driver/server/entity/OrderPayInfo.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 支付表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class OrderPayInfo implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 支付流水号 - */ - @TableId("PAY_ID") - private Long payId; - - /** - * 购买的商品类型:1.购买会员,2.证件照上传,3.查询体检信息 - */ - @TableField("PURCHASE_PRODUCT_TYPE") - private String purchaseProductType; - - /** - * 购买商品主键标识 - */ - @TableField("PURCHASE_PRODUCT_ID") - private String purchaseProductId; - - /** - * 支付金额,单位元 - */ - @TableField("MONEY") - private BigDecimal money; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 支付类型(weCharPay,aLiPay) - */ - @TableField("PAYMENT_TYPE") - private String paymentType; - - /** - * 具体的支付方式,例如微信的JSAPI,h5 - */ - @TableField("PAY_TYPE") - private String payType; - - /** - * 支付状态: 1:未支付 2:支付成功 3:支付失败 - */ - @TableField("PAY_STATUS") - private Integer payStatus; - - /** - * 预支付ID - */ - @TableField("PREPAT_ID") - private String prepatId; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 支付的账号 - */ - @TableField("USER_ID") - private Long userId; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - /** - * 分销人员id - */ - @TableField("DISTRIBUTION_ID") - private String distributionId; - - /** - * 分销配置id - */ - @TableField("DETAIL_ID") - private Long detailId; - - /** - * 原价 - */ - @TableField("ORIGINAL_PRICE") - private BigDecimal originalPrice; - - /** - * 提成 - */ - @TableField("COMMISSION") - private BigDecimal commission; - - - /** - * 提成 - */ - @TableField("TENANT_ID") - private Long tenantId; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/PayNoticeLog.java b/src/main/java/com/wrj/driver/server/entity/PayNoticeLog.java deleted file mode 100644 index 8d5dcbe..0000000 --- a/src/main/java/com/wrj/driver/server/entity/PayNoticeLog.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 支付回调日志表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PayNoticeLog implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(value = "NOTICE_ID", type = IdType.AUTO) - private Long noticeId; - - /** - * 回调内容json - */ - @TableField("CONTENR") - private String contenr; - - /** - * 回调类型 - */ - @TableField("TYPE") - private String type; - - /** - * 本平台支付单号 - */ - @TableField("PAY_PREPAY_ID") - private Long payPrepayId; - - /** - * 第三方支付平台回调编号 - */ - @TableField("NOTICE_NO") - private String noticeNo; - - /** - * 第三方支付平台回调状态 - */ - @TableField("NOTICE_STATUS") - private String noticeStatus; - - /** - * 备注 - */ - @TableField("REMARKS") - private String remarks; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/PayPrepay.java b/src/main/java/com/wrj/driver/server/entity/PayPrepay.java deleted file mode 100644 index 363cdac..0000000 --- a/src/main/java/com/wrj/driver/server/entity/PayPrepay.java +++ /dev/null @@ -1,130 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 预支付表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PayPrepay implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 本平台预支付单号 - */ - @TableId("PAY_PREPAY_ID") - private Long payPrepayId; - - /** - * 支付流水号 - */ - @TableField("PAY_ID") - private Long payId; - - /** - * 支付金额,单位元 - */ - @TableField("MONEY") - private BigDecimal money; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 支付类型(weCharPay,aLiPay) - */ - @TableField("PAYMENT_TYPE") - private String paymentType; - - /** - * 具体的支付方式,例如微信的JSAPI,h5 - */ - @TableField("PAY_TYPE") - private String payType; - - /** - * 支付状态: 1:未支付 2:支付成功 3:支付失败 - */ - @TableField("PAY_STATUS") - private Integer payStatus; - - /** - * 预支付ID - */ - @TableField("PREPAT_ID") - private String prepatId; - - /** - * 微信openid - */ - @TableField("OPEN_ID") - private String openId; - - /** - * 第三方支付平台配置信息;例如微信支付的appid,apiV3Key等 - */ - @TableField("THIRD_CONFIG_JSON") - private String thirdConfigJson; - - /** - * 本支付平台接收回调的https url - */ - @TableField("NOTIFY_URL") - private String notifyUrl; - - /** - * 接收回调的微服务名称 - */ - @TableField("NOTIFY_MICRO_SERVICE_NAME") - private String notifyMicroServiceName; - - /** - * 微服务接收回调的具体url - */ - @TableField("NOTIFY_MICRO_SERVICE_URL") - private String notifyMicroServiceUrl; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - /** - * 系统名称 - */ - @TableField("SERVER_NAME") - private String serverName; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/PayPrepayResult.java b/src/main/java/com/wrj/driver/server/entity/PayPrepayResult.java deleted file mode 100644 index f8657ee..0000000 --- a/src/main/java/com/wrj/driver/server/entity/PayPrepayResult.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 支付结果表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PayPrepayResult implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 本平台支付单号 - */ - @TableId("PAY_PREPAY_ID") - private Long payPrepayId; - - /** - * 第三方支付单号 - */ - @TableField("THIRD_PAY_ID") - private String thirdPayId; - - /** - * 业务系统订单支付流水号 - */ - @TableField("PAY_ID") - private Long payId; - - /** - * 支付金额,单位元 - */ - @TableField("MONEY") - private BigDecimal money; - - /** - * 已退款金额,单位元 - */ - @TableField("REFUND_MONEY") - private BigDecimal refundMoney; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 支付完成时间 - */ - @TableField("PAY_TIME") - private LocalDateTime payTime; - - /** - * 银行类型,采用字符串类型的银行标识。银行标识请参考《银行类型对照表》 - */ - @TableField("BANK_TYPE") - private String bankType; - - /** - * 交易类型(weCharPay,aLiPay) - */ - @TableField("PAYMENT_TYPE") - private String paymentType; - - /** - * 具体的支付方式,例如微信的JSAPI,h5 - */ - @TableField("PAY_TYPE") - private String payType; - - /** - * 支付状态: 1:未支付 2:支付成功 3:支付失败 - */ - @TableField("PAY_STATUS") - private Integer payStatus; - - /** - * 微信openid - */ - @TableField("OPEN_ID") - private String openId; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - /** - * 第三方支付平台支付状态 - */ - @TableField("THIRD_PAY_STATUS") - private String thirdPayStatus; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/PayRefund.java b/src/main/java/com/wrj/driver/server/entity/PayRefund.java deleted file mode 100644 index 4da60b0..0000000 --- a/src/main/java/com/wrj/driver/server/entity/PayRefund.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 申请退款表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PayRefund implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 本平台支付退款单号 - */ - @TableId("PAY_REFUND_ID") - private Long payRefundId; - - /** - * 业务系统支付退款流水号 - */ - @TableField("REFUND_ID") - private String refundId; - - /** - * 本平台支付单号 - */ - @TableField("PAY_PREPAY_ID") - private Long payPrepayId; - - /** - * 退款金额,单位元 - */ - @TableField("MONEY") - private BigDecimal money; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 交易类型(weCharPay,aLiPay) - */ - @TableField("PAYMENT_TYPE") - private String paymentType; - - /** - * 具体的支付方式,例如微信的JSAPI,h5 - */ - @TableField("PAY_TYPE") - private String payType; - - /** - * 退款状态: 1:未退款 2:退款成功 3:退款关闭 4:退款处理中 5:退款异常 - */ - @TableField("REFUND_STATUS") - private Integer refundStatus; - - /** - * 第三方支付平台配置信息;例如微信支付的appid,apiV3Key等 - */ - @TableField("THIRD_CONFIG_JSON") - private String thirdConfigJson; - - /** - * 本支付平台接收回调的https url - */ - @TableField("NOTIFY_URL") - private String notifyUrl; - - /** - * 接收回调的微服务名称 - */ - @TableField("NOTIFY_MICRO_SERVICE_NAME") - private String notifyMicroServiceName; - - /** - * 微服务接收回调的具体url - */ - @TableField("NOTIFY_MICRO_SERVICE_URL") - private String notifyMicroServiceUrl; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/PayRefundResult.java b/src/main/java/com/wrj/driver/server/entity/PayRefundResult.java deleted file mode 100644 index ea26d3f..0000000 --- a/src/main/java/com/wrj/driver/server/entity/PayRefundResult.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 退款结果表 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class PayRefundResult implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 本平台支付退款单号 - */ - @TableId("PAY_REFUND_ID") - private Long payRefundId; - - /** - * 第三方支付退款单号 - */ - @TableField("THIRD_PAY_REFUND_NO") - private String thirdPayRefundNo; - - /** - * 业务系统订单支付退款流水号 - */ - @TableField("REFUND_ID") - private String refundId; - - /** - * 本平台支付单号 - */ - @TableField("PAY_PREPAY_ID") - private Long payPrepayId; - - /** - * 退款金额,单位元 - */ - @TableField("MONEY") - private BigDecimal money; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 交易类型(weCharPay,aLiPay) - */ - @TableField("PAYMENT_TYPE") - private String paymentType; - - /** - * 具体的支付方式,例如微信的JSAPI,h5 - */ - @TableField("PAY_TYPE") - private String payType; - - /** - * 退款完成时间 - */ - @TableField("REFUND_TIME") - private LocalDateTime refundTime; - - /** - * 退款状态: 1:退款中 2:退款成功 3:退款关闭 4:退款处理中 5:退款异常 - */ - @TableField("REFUND_STATUS") - private Integer refundStatus; - - /** - * 0:正常,1:已删除 - */ - @TableField("DELETE_STATUS") - private Integer deleteStatus; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 最近的更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/SysDistribution.java b/src/main/java/com/wrj/driver/server/entity/SysDistribution.java deleted file mode 100644 index 62bc508..0000000 --- a/src/main/java/com/wrj/driver/server/entity/SysDistribution.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.wrj.driver.server.entity; - - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; - -/** - * 【分销配置】对象 sys_distribution - * - * @author hd - * @date 2024-03-05 - */ -@Data -@Accessors(chain = true) -public class SysDistribution -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - @TableId("distribution_id") - private String distributionId; - - /** 手机号 */ - @TableField("phone") - private String phone; - - /** 姓名 */ - @TableField("name") - private String name; - - /** 标记 */ - @TableField("mark") - private String mark; - - @TableField("del_flag") - private String delFlag; - - @TableField("member_id") - private Integer memberId; - - @TableField("discount_id") - private Integer discountId; - - @TableField("tenant_id") - private Long tenantId; - -} diff --git a/src/main/java/com/wrj/driver/server/entity/SysDistributionDetail.java b/src/main/java/com/wrj/driver/server/entity/SysDistributionDetail.java deleted file mode 100644 index ca3c960..0000000 --- a/src/main/java/com/wrj/driver/server/entity/SysDistributionDetail.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -@Data -@Accessors(chain = true) -public class SysDistributionDetail implements Serializable -{ - private static final long serialVersionUID = 1L; - - /** $column.columnComment */ - @TableId("detail_id") - private Long detailId; - - /** 分销id */ - @TableField("distribution_id") - private String distributionId; - - /** 会员id */ - @TableField("member_id") - private Long memberId; - - /** 优惠价 */ - @TableField("discounted_price") - private BigDecimal discountedPrice; - - /** 提成 */ - @TableField("commission") - private BigDecimal commission; - - /** 生效日期 */ - @TableField("start_time") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date startTime; - - @Override - public boolean equals(Object o) { - if (o == null || getClass() != o.getClass()) return false; - - SysDistributionDetail that = (SysDistributionDetail) o; - - if (distributionId == null || that.distributionId == null || memberId == null || that.memberId == null) return false; - - if (!distributionId.equals(that.distributionId) || !memberId.equals(that.memberId)) return false; - return true; - } - - @Override - public int hashCode() { - int result = (distributionId != null ? distributionId.hashCode() : 0); - result = 31 * result + (memberId != null ? memberId.hashCode() : 0); - return result; - } - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysUser.java b/src/main/java/com/wrj/driver/server/entity/SysUser.java similarity index 57% rename from src/main/java/com/wrj/driver/server/entity/TdSysUser.java rename to src/main/java/com/wrj/driver/server/entity/SysUser.java index 2b96518..906afeb 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdSysUser.java +++ b/src/main/java/com/wrj/driver/server/entity/SysUser.java @@ -6,11 +6,11 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -26,91 +26,51 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdSysUser implements Serializable { +@TableName("sys_user") +public class SysUser implements Serializable { private static final long serialVersionUID = 1L; /** * 用户标识 */ - @TableId(value = "USER_ID", type = IdType.AUTO) + @TableId(value = "user_id", type = IdType.AUTO) private Long userId; /** * 用户名 */ - @TableField("USER_NAME") + @TableField("user_name") private String userName; /** * 手机号码 */ - @TableField("PHONE") + @TableField("phone") private String phone; - /** - * 身份证 - */ - @TableField("IDCARD") - private String idcard; - /** * 性别 */ - @TableField("SEX") + @TableField("sex") private Integer sex; /** * 备注 */ - @TableField("REMARK") + @TableField("remark") private String remark; /** * 头像 */ - @TableField("AVATAR") + @TableField("avatar") private String avatar; - - /** - * 驾校标识 - */ - @TableField("SCHOOL_ID") - private Long schoolId; - - /** - * 驾校名称 - */ - @TableField("SCHOOL_NAME") - private String schoolName; - - /** - * 驾校电话 - */ - @TableField("SCHOOL_PHONE") - private String schoolPhone; - /** * 创建时间 */ - @TableField("CREATE_TIME") + @TableField("create_time") @JsonDeserialize(using = LocalDateTimeDeserializer.class) @JsonSerialize(using = LocalDateTimeSerializer.class) private LocalDateTime createTime; - - /** - * 分销人员 - */ - @TableField("DISTRIBUTION_ID") - private String distributionId; - - /** - * 绑定时间 - */ - @TableField("BIND_TIME") - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime bindTime; - - } diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysUserLog.java b/src/main/java/com/wrj/driver/server/entity/SysUserLog.java similarity index 58% rename from src/main/java/com/wrj/driver/server/entity/TdSysUserLog.java rename to src/main/java/com/wrj/driver/server/entity/SysUserLog.java index fa5808d..a0c7fc5 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdSysUserLog.java +++ b/src/main/java/com/wrj/driver/server/entity/SysUserLog.java @@ -2,6 +2,7 @@ package com.wrj.driver.server.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -12,40 +13,39 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdSysUserLog implements Serializable { - @TableId(value = "ID") +@TableName("sys_user_log") +public class SysUserLog implements Serializable { + + @TableId(value = "id") private Long id; - @TableField("TITLE") + + @TableField("title") private String title; - @TableField("BUSINESS_TYPE") + @TableField("business_type") private Integer businessType; - @TableField("DEVICE") + @TableField("method") + private String method; + + @TableField("device") private String device; - @TableField("OPER_TYPE") + @TableField("oper_type") private Integer operType; - @TableField("USER_ID") + @TableField("user_id") private Long userId; - @TableField("OPER_PARAM") + @TableField("oper_pram") private String operParam; - @TableField("JSON_RESULT") + @TableField("json_result") private String jsonResult; - @TableField("STATUS") + @TableField("status") private Integer status; - @TableField("ERROR_MSG") - private String errorMsg; - - @TableField("OPER_TIME") + @TableField("oper_time") private LocalDateTime operTime; - - @TableField("TENANT_ID") - private Long tenantId; - } diff --git a/src/main/java/com/wrj/driver/server/entity/TdCar.java b/src/main/java/com/wrj/driver/server/entity/TdCar.java deleted file mode 100644 index ea2bbb9..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdCar.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 车型分类; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdCar implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 车型标识 - */ - @TableId(value = "CAR_TYPE_ID", type = IdType.AUTO) - private Integer carTypeId; - - /** - * 车型名称 - */ - @TableField("CAR_NAME") - private String carName; - - /** - * 描述 - */ - @TableField("REMARK") - private String remark; - - - /** - * 车型图片url - */ - @TableField("IMAGE_URL") - private String imageUrl; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdCarouselImage.java b/src/main/java/com/wrj/driver/server/entity/TdCarouselImage.java deleted file mode 100644 index 21aa8bd..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdCarouselImage.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.wrj.driver.server.entity; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdCarouselImage implements Serializable { - private Integer id; - - private Long tenantId; - - private String imageName; - - private String imageUrl; - - private String isActive; - - private String creator; - - private LocalDateTime createTime; -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdCategoryQuestion.java b/src/main/java/com/wrj/driver/server/entity/TdCategoryQuestion.java deleted file mode 100644 index d25db69..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdCategoryQuestion.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 题型题目表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdCategoryQuestion implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 题型分类 - */ - @TableId("CATEGORY") - private String category; - - /** - * 车型 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 题目标识 - */ - @TableField("QUESTION_ID") - private Long questionId; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdChapter.java b/src/main/java/com/wrj/driver/server/entity/TdChapter.java deleted file mode 100644 index 7dec6d5..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdChapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdChapter implements Serializable { - - /** - * 章节id - */ - @TableId("CHAPTER_ID") - private Integer chapterId; - - /** - * 章节名 - */ - @TableField("CHAPTER_NAME") - private String chapterName; - - /** - * 题目数 - */ - @TableField("COUNT") - private Integer count; - - /** - * 科目 - */ - @TableField("SUBJECT") - private Integer subject; - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdExaminationRoom.java b/src/main/java/com/wrj/driver/server/entity/TdExaminationRoom.java deleted file mode 100644 index ec1305b..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdExaminationRoom.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 考场信息表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdExaminationRoom implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考场标识 - */ - @TableId(value = "EXAMINATION_ROOM_ID", type = IdType.AUTO) - private Integer examinationRoomId; - - /** - * 考场名称 - */ - @TableField("EXAMINATION_ROOM_NAME") - private String examinationRoomName; - - /** - * 区/县 - */ - @TableField("DISTRICT") - private String district; - - /** - * 区/县名称 - */ - @TableField("DISTRICT_NAME") - private String districtName; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdExaminationRoomRoad.java b/src/main/java/com/wrj/driver/server/entity/TdExaminationRoomRoad.java deleted file mode 100644 index 5f34f0c..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdExaminationRoomRoad.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 考场线路表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdExaminationRoomRoad implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考场线路标识 - */ - @TableId(value = "RODE_ID", type = IdType.AUTO) - private Integer rodeId; - - /** - * 考场标识 - */ - @TableField("EXAMINATION_ROOM_ID") - private Integer examinationRoomId; - - /** - * 线路名称 - */ - @TableField("RODE_NAME") - private String rodeName; - - /** - * 车型标识 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 线路图片 - */ - @TableField("RODE_IMG") - private String rodeImg; - - /** - * 线路视频链接 - */ - @TableField("RODE_VIDEO_URL") - private String rodeVideoUrl; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdMember.java b/src/main/java/com/wrj/driver/server/entity/TdMember.java deleted file mode 100644 index 3c48b08..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdMember.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.wrj.driver.server.entity; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 会员类型表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdMember implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 会员标识 - */ - @TableId(value = "MEMBER_ID", type = IdType.AUTO) - private Integer memberId; - - /** - * 会员名称 - */ - @TableField("MEMBER_NAME") - private String memberName; - - /** - * 车型标识 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 科目 - */ - @TableField("SUBJECTS") - private String subjects; - - /** - * 会员价格,单位元 - */ - @TableField("PRICE") - private BigDecimal price; - - /** - * 会员折扣,单位元 - */ - @TableField("DISCOUNT") - private BigDecimal discount; - - /** - * 会员时间 - */ - @TableField("DURATION") - private Integer duration; - - /** - * 时长单位,1:天,2:月 3:年 - */ - @TableField("UNIT") - private String unit; - - /** - * 会员描述 - */ - @TableField("DESCRIPTION") - private String DESCRIPTION; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdMemberDiscount.java b/src/main/java/com/wrj/driver/server/entity/TdMemberDiscount.java deleted file mode 100644 index 8159fe9..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdMemberDiscount.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - *

- * 会员折扣表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdMemberDiscount implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 会员标识 - */ - @TableId(value = "ID", type = IdType.AUTO) - private Integer id; - - /** - * 科目 - */ - @TableField("SUBJECT") - private String subject; - - /** - * 会员 - */ - @TableField("DISCOUNT_TYPE") - private String discountType; - - - /** - * 会员折扣,单位元 - */ - @TableField("DISCOUNT") - private BigDecimal discount; - - @TableField("PARAM1") - private String param1; - - @TableField("PARAM2") - private String param2; - - /** - * 会员时间 - */ - @TableField("DURATION") - private Integer duration; - - /** - * 时长单位,1:天,2:月 3:年 - */ - @TableField("UNIT") - private String unit; - - /** - * 会员描述 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdModuleQuestion.java b/src/main/java/com/wrj/driver/server/entity/TdModuleQuestion.java deleted file mode 100644 index cb02065..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdModuleQuestion.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 模块题目表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdModuleQuestion implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ,’模块标识 - */ - @TableId(value = "MODULE", type = IdType.AUTO) - private Integer module; - - /** - * 车型 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 题目标识 - */ - @TableField("QUESTION_ID") - private Long questionId; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdPointQuestion.java b/src/main/java/com/wrj/driver/server/entity/TdPointQuestion.java deleted file mode 100644 index e9dd1a9..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdPointQuestion.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 考点题目表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdPointQuestion implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考点标识 - */ - @TableField(value = "POINT") - private String point; - - /** - * 车型 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 题目标识 - */ - @TableField("QUESTION_ID") - private Long questionId; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdProject.java b/src/main/java/com/wrj/driver/server/entity/TdProject.java deleted file mode 100644 index 529f634..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdProject.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 考试项目表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdProject implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考试项目 - */ - @TableId("PROJECT_ID") - private Integer projectId; - - /** - * 类型 - */ - @TableField("TYPE") - private String type; - - /** - * 所属科目 - */ - @TableField("SUBJECT") - private String subject; - - /** - * 车型标识 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 驾驶类型,手动挡,自动挡,A2:B2等(在字典表里配置) - */ - @TableField("DRIVE_TYPE") - private String driveType; - - /** - * 描述 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdQuestionJx.java b/src/main/java/com/wrj/driver/server/entity/TdQuestionJx.java deleted file mode 100644 index e5e0bca..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdQuestionJx.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdQuestionJx implements Serializable { - - @TableId("ID") - private Integer id; - - @TableField("CATEGORY_TITLE") - private String categoryTitle; - - @TableField("CATEGORY_ID") - private String categoryId; - - @TableField("QUESTION_ID") - private Long questionId; - - - @TableField("CHAPTER_ID") - private Integer chapterId; - - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - @TableField("SUBJECT") - private Integer subject; - - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdQuestionVersion.java b/src/main/java/com/wrj/driver/server/entity/TdQuestionVersion.java deleted file mode 100644 index 056c75b..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdQuestionVersion.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 题库版本表; - *

- * - * @author Automated procedures - * @since 2023-09-03 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdQuestionVersion implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 题库版本 - */ - @TableId(value = "VERSION_ID", type = IdType.AUTO) - private Long versionId; - - /** - * 车型标识 - */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - /** - * 备注说明 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdSecret.java b/src/main/java/com/wrj/driver/server/entity/TdSecret.java deleted file mode 100644 index 8b212ec..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdSecret.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdSecret implements Serializable { - - @TableId("SECRET_ID") - private Integer secretId; - - @TableField("CAR_TYPE_ID") - private Integer carTypeId; - - @TableField("SUBJECT") - private Integer subject; - - @TableField("QUESTION_COUNT") - private Integer questionCount; - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdSecretQuestion.java b/src/main/java/com/wrj/driver/server/entity/TdSecretQuestion.java deleted file mode 100644 index 06756d6..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdSecretQuestion.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdSecretQuestion implements Serializable { - - @TableId("ID") - private Integer id; - - @TableField("SECRET_ID") - private Integer secretId; - - @TableField("QUESTION_ID") - private Long questionId; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysUserDiscount.java b/src/main/java/com/wrj/driver/server/entity/TdSysUserDiscount.java deleted file mode 100644 index 962560d..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdSysUserDiscount.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 用户折扣 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdSysUserDiscount { - - @TableId(value = "ID", type = IdType.AUTO) - private Integer id; - - @TableField(value = "USER_ID") - private Long userId; - - @TableField(value = "DISCOUNT_ID") - private Integer discountId; - - //折扣 - @TableField(value = "DISCOUNT") - private BigDecimal discount; - - /** - * 会员时间 - */ - @TableField("DURATION") - private Integer duration; - - /** - * 时长单位,1:天,2:月 3:年 - */ - @TableField("UNIT") - private String unit; - - @TableField(value = "END_TIME") - private LocalDateTime endTime; - - @TableField(value = "IS_INVALID") - private Integer isInvalid; - - - @TableField(value = "OPER_USER") - private String operUser; - - @TableField(value = "OPER_TIME") - private LocalDateTime operTime; - - private Integer useType; -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysUserMember.java b/src/main/java/com/wrj/driver/server/entity/TdSysUserMember.java deleted file mode 100644 index a2ccac8..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdSysUserMember.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 用户会员表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdSysUserMember implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @TableId("USER_ID") - private Long userId; - - /** - * 会员标识 - */ - @TableField("MEMBER_ID") - private Integer memberId; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 更新时间 - */ - @TableField("UPDATE_TIME") - private LocalDateTime updateTime; - - /** - * 会员开始时间 - */ - @TableField("START_DATE") - private LocalDateTime startDate; - - /** - * 会员结束时间 - */ - @TableField("END_DATE") - private LocalDateTime endDate; - - @TableField("OPER_USER") - private String operUser; - - - @TableField("USE_TYPE") - private Integer useType; - - - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdTenantApplet.java b/src/main/java/com/wrj/driver/server/entity/TdTenantApplet.java deleted file mode 100644 index 3516af5..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdTenantApplet.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 租户用户表 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("td_tenant_applet") -public class TdTenantApplet implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @TableId(value = "tenant_id") - private Long tenantId; - - @TableField(value = "app_id") - private String appId; - - @TableField(value = "app_name") - private String appName; - - @TableField(value = "app_secret") - private String appSecret; - - @TableField(value = "mch_id") - private String mchId; - - @TableField(value = "api_v3_key") - private String apiV3Key; - - @TableField(value = "mch_serial_no") - private String mchSerialNo; - - @TableField(value = "private_key_path") - private String privateKeyPath; - - @TableField(value = "pub_key_id") - private String pubKeyId; - - @TableField(value = "pub_key_path") - private String pubKeyPath; - - @TableField(value = "pay_notice_url") - private String payNoticeUrl; - - @TableField(value = "is_new") - private Boolean isNew; - -} - diff --git a/src/main/java/com/wrj/driver/server/entity/TdTenantCar.java b/src/main/java/com/wrj/driver/server/entity/TdTenantCar.java deleted file mode 100644 index 51d18ce..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdTenantCar.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 租户用户表 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("td_tenant_car") -public class TdTenantCar implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - - /** - * 用户标识 - */ - @TableField(value = "tenant_id") - private Long tenantId; - - /** - * 考试类型 - */ - @TableField(value = "car_type_id") - private String carTypeId; - - /** - * 状态 - */ - @TableField("is_active") - private String icActive; - -} - diff --git a/src/main/java/com/wrj/driver/server/entity/TdTenantUser.java b/src/main/java/com/wrj/driver/server/entity/TdTenantUser.java deleted file mode 100644 index 930d038..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdTenantUser.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.util.List; - -/** - * 租户用户表 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -@TableName("td_tenant_user") -public class TdTenantUser implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @TableId(value = "id", type = IdType.AUTO) - private Long id; - - /** - * 用户标识 - */ - @TableField(value = "user_id") - private Long userId; - - /** - * 用户标识 - */ - @TableField(value = "tenant_id") - private Long tenantId; - - /** - * 考试类型 - */ - @TableField(value = "car_type_ids") - private String carTypeIds; - - /** - * 考试类型 - */ - @TableField("is_active") - private String icActive; - -} - diff --git a/src/main/java/com/wrj/driver/server/entity/TdTrafficSignCategory.java b/src/main/java/com/wrj/driver/server/entity/TdTrafficSignCategory.java deleted file mode 100644 index 353288d..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdTrafficSignCategory.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 图标分类表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdTrafficSignCategory implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 图标分类标识 - */ - @TableId(value = "SIGN_CATEGORY_ID", type = IdType.AUTO) - private Integer signCategoryId; - - /** - * 图标分类名称 - */ - @TableField("SIGN_CATEGORY_NAME") - private String signCategoryName; - - /** - * 图标分类图片链接 - */ - @TableField("SIGN_IMG_URL") - private String signImgUrl; - - /** - * 父类图标分类标识 - */ - @TableField("PARENT_SIGN_CATEGORY_ID") - private Integer parentSignCategoryId; - - /** - * 是否有子项,子项才会与题目关联 - */ - @TableField("HAS_CHILD") - private String hasChild; - - /** - * 图标数量 - */ - @TableField("SIGN_NUM") - private Integer signNum; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdUserDistribution.java b/src/main/java/com/wrj/driver/server/entity/TdUserDistribution.java deleted file mode 100644 index d31ae8c..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdUserDistribution.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdUserDistribution implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @TableId(value = "record_id", type = IdType.AUTO) - private Long recordId; - - @TableField("user_id") - private Long userId; - - @TableField("distribution_id") - private String distributionId; - - /** - * 绑定时间 - */ - @TableField("bind_time") - @JsonDeserialize(using = LocalDateTimeDeserializer.class) - @JsonSerialize(using = LocalDateTimeSerializer.class) - private LocalDateTime bindTime; - - @TableField("tenant_id") - private Long tenantId; - -} diff --git a/src/main/java/com/wrj/driver/server/entity/TdVideos.java b/src/main/java/com/wrj/driver/server/entity/TdVideos.java deleted file mode 100644 index de779e4..0000000 --- a/src/main/java/com/wrj/driver/server/entity/TdVideos.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.wrj.driver.server.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 视频标识表; - *

- * - * @author Automated procedures - * @since 2023-08-20 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class TdVideos implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 视频标识 - */ - @TableId(value = "VIDEO_ID", type = IdType.AUTO) - private Integer videoId; - - /** - * 类型标识 - */ - @TableField("TYPE_ID") - private Integer typeId; - - /** - * 视频图片 - */ - @TableField("VIDEO_IMAGE") - private String videoImage; - - /** - * 视频链接 - */ - @TableField("VIDEO_URL") - private String videoUrl; - - /** - * 视频时长(秒) - */ - @TableField("VIDEO_TIME") - private Integer videoTime; - - /** - * 显示序号 - */ - @TableField("SHOW_ORDER") - private Integer showOrder; - - /** - * 描述 - */ - @TableField("DESCRIPTION") - private String description; - - /** - * 创建时间 - */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @TableField("IS_ACTIVE") - private String isActive; - - -} diff --git a/src/main/java/com/wrj/driver/server/entity/WrjChapter.java b/src/main/java/com/wrj/driver/server/entity/WrjChapter.java new file mode 100644 index 0000000..78ad8ea --- /dev/null +++ b/src/main/java/com/wrj/driver/server/entity/WrjChapter.java @@ -0,0 +1,75 @@ +package com.wrj.driver.server.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("wrj_chapter") +public class WrjChapter implements Serializable { + + /** + * 章节id + */ + @TableId("chapter_id") + private Integer chapterId; + + /** + * 章节名 + */ + @TableField("chapter_name") + private String chapterName; + + + /** + * 状态 0 正常 1 禁用 + */ + @TableField("is_active") + private String isActive; + + /** + * 排序 + */ + @TableField("sort") + private Integer sort; + + /** + * summary + */ + @TableField("summary") + private String summary; + + /** + * 创建者 + */ + @TableField("creator") + private String creator; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 更新者 + */ + @TableField("updater") + private String updater; + + + /** + * 更新时间 + */ + @TableField("update_time") + private LocalDateTime updateTime; + +} diff --git a/src/main/java/com/wrj/driver/server/entity/TdTrafficSignQuestion.java b/src/main/java/com/wrj/driver/server/entity/WrjDriverType.java similarity index 59% rename from src/main/java/com/wrj/driver/server/entity/TdTrafficSignQuestion.java rename to src/main/java/com/wrj/driver/server/entity/WrjDriverType.java index 094ddff..1d57aa4 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdTrafficSignQuestion.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjDriverType.java @@ -5,13 +5,15 @@ import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; + +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** *

- * 图标分类相关题目表; + * 无人机驾驶员类型; *

* * @author Automated procedures @@ -20,33 +22,32 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdTrafficSignQuestion implements Serializable { +@TableName("wrj_type_chapter") +public class WrjDriverType implements Serializable { private static final long serialVersionUID = 1L; /** - * 图标分类标识 + * 驾驶员类型标识 */ - @TableId(value = "SIGN_CATEGORY_ID", type = IdType.AUTO) - private Integer signCategoryId; + @TableId(value = "type_id", type = IdType.AUTO) + private Integer typeId; /** - * 题目标识 + * 类型名称 */ - @TableField("QUESTION_ID") - private Long questionId; + @TableField("type_name") + private String typeName; /** - * 创建时间 + * 无人机机型 */ - @TableField("CREATE_TIME") - private LocalDateTime createTime; + @TableField("model_id") + private String modelId; /** * 是否生效 */ - @TableField("IS_ACTIVE") + @TableField("is_active") private String isActive; - - } diff --git a/src/main/java/com/wrj/driver/server/entity/TdQuestion.java b/src/main/java/com/wrj/driver/server/entity/WrjQuestion.java similarity index 60% rename from src/main/java/com/wrj/driver/server/entity/TdQuestion.java rename to src/main/java/com/wrj/driver/server/entity/WrjQuestion.java index 0925cd4..e98aad7 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdQuestion.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjQuestion.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -21,178 +21,167 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdQuestion implements Serializable { +@TableName("wrj_question") +public class WrjQuestion implements Serializable { private static final long serialVersionUID = 1L; /** * 题目标识 */ - @TableId(value = "QUESTION_ID", type = IdType.AUTO) + @TableId(value = "question_id", type = IdType.AUTO) private Long questionId; /** * 题目内容 */ - @TableField("QUESTION") + @TableField("question") private String question; /** * 选项A */ - @TableField("CHOOSE_A") + @TableField("choose_a") private String chooseA; /** * 选项B */ - @TableField("CHOOSE_B") + @TableField("choose_b") private String chooseB; /** * 选项C */ - @TableField("CHOOSE_C") + @TableField("choose_c") private String chooseC; /** * 选项D */ - @TableField("CHOOSE_D") + @TableField("choose_d") private String chooseD; /** * 选项E */ - @TableField("CHOOSE_E") + @TableField("choose_e") private String chooseE; /** * 选项F */ - @TableField("CHOOSE_F") + @TableField("choose_f") private String chooseF; /** * 选项G */ - @TableField("CHOOSE_G") + @TableField("choose_g") private String chooseG; /** * 正确答案 */ - @TableField("TRUE_ANSWER") + @TableField("true_answer") private String trueAnswer; - /** - * 未知 - */ - @TableField("CIDS") - private String cids; - - /** - * 题型分类 - */ - @TableField("CATEGORY") - private String category; - /** * 题目图片url */ - @TableField("IMAGE_URL") + @TableField("image_url") private String imageUrl; /** * 最佳回答 */ - @TableField("BEST_ANSWER") + @TableField("best_answer") private String bestAnswer; /** * 答题技巧 */ - @TableField("SKILL_INFO") + @TableField("skill_info") private String skillInfo; + /** - * 章节标识 + * 错误答案解析 */ - @TableField("CHAPTER") - private String chapter; + @TableField("error_info") + private String errorInfo; /** - * 所属科目,1:科目1,2:科目4 + * 章节标识 */ - @TableField("SUBJECT") - private String subject; + @TableField("chapter") + private Integer chapter; /** * 选择 */ - @TableField("OPTIONS") + @TableField("options") private String options; /** * 题目类型,1:选择题 2:判断题,3:多选题 */ - @TableField("TYPE") + @TableField("type") private String type; /** * 显示序号 */ - @TableField("SHOW_ORDER") + @TableField("show_order") private int showOrder; /** - * 车型 + * 源id */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; + @TableField("origin_id") + private String originId; /** * 是否生效 */ - @TableField("IS_ACTIVE") + @TableField("is_active") private String isActive; - /** - * 是否密卷2 + * 题目关键字 */ - @TableField("TITLE_WORDS") + @TableField("title_words") private String titleWords; /** - * 是否密卷2 + * 答题技巧关键字 */ - @TableField("SKILL_WORDS") + @TableField("skill_words") private String skillWords; /** - * 是否密卷2 + * 选项A关键字 */ - @TableField("A_WORDS") + @TableField("a_words") private String aWords; /** - * 是否密卷2 + * 选项B关键字 */ - @TableField("B_WORDS") + @TableField("b_words") private String bWords; /** - * 是否密卷2 + * 选项C关键字 */ - @TableField("C_WORDS") + @TableField("c_words") private String cWords; /** - * 是否密卷2 + * 选项D关键字 */ - @TableField("D_WORDS") + @TableField("d_words") private String dWords; } diff --git a/src/main/java/com/wrj/driver/server/entity/TdQuestionTest.java b/src/main/java/com/wrj/driver/server/entity/WrjQuestionTest.java similarity index 74% rename from src/main/java/com/wrj/driver/server/entity/TdQuestionTest.java rename to src/main/java/com/wrj/driver/server/entity/WrjQuestionTest.java index e4e0f09..6e95929 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdQuestionTest.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjQuestionTest.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; -import io.swagger.annotations.ApiModelProperty; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -22,27 +22,28 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdQuestionTest implements Serializable { +@TableName("wrj_question_test") +public class WrjQuestionTest implements Serializable { private static final long serialVersionUID = 1L; /** * 模拟考试成绩标识 */ - @TableId(value = "TEST_ID", type = IdType.AUTO) + @TableId(value = "test_id", type = IdType.AUTO) private Long testId; /** - * 车型标识 + * 无人机驾驶员类型 */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; + @TableField("type_id") + private Integer typeId; /** - * 考试科目 + * 无人机型标识 */ - @TableField("SUBJECT") - private String subject; + @TableField("model_id") + private Integer modelId; /** * 用户标识 @@ -67,9 +68,4 @@ public class TdQuestionTest implements Serializable { */ @TableField("CREATE_TIME") private LocalDateTime createTime; - - @TableField("TENANT_ID") - private Long tenantId; - - } diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysConfig.java b/src/main/java/com/wrj/driver/server/entity/WrjSysConfig.java similarity index 86% rename from src/main/java/com/wrj/driver/server/entity/TdSysConfig.java rename to src/main/java/com/wrj/driver/server/entity/WrjSysConfig.java index cd66aae..b7d35dc 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdSysConfig.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjSysConfig.java @@ -5,6 +5,7 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; @@ -24,15 +25,16 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdSysConfig implements Serializable { +@TableName("wrj_sys_config") +public class WrjSysConfig implements Serializable { private static final long serialVersionUID = 1L; /** - * 车型标识,-1为与车型无关 + * 无人机驾驶类型标识,-1为与无人机驾驶类型标识无关 */ - @TableId("CAR_TYPE_ID") - private Integer carTypeId; + @TableId("DRIVER_TYPE_ID") + private Integer driverTypeId; /** * 配置项KEY diff --git a/src/main/java/com/wrj/driver/server/entity/TdSysConfigList.java b/src/main/java/com/wrj/driver/server/entity/WrjSysConfigList.java similarity index 85% rename from src/main/java/com/wrj/driver/server/entity/TdSysConfigList.java rename to src/main/java/com/wrj/driver/server/entity/WrjSysConfigList.java index 0d41116..95b9d31 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdSysConfigList.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjSysConfigList.java @@ -5,6 +5,7 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; @@ -24,15 +25,16 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdSysConfigList implements Serializable { +@TableName("wrj_sys_config_list") +public class WrjSysConfigList implements Serializable { private static final long serialVersionUID = 1L; /** - * 车型标识,-1为与车型无关 + * 无人机驾驶类型标识,-1为与无人机驾驶类型标识无关 */ - @TableId("CAR_TYPE_ID") - private Integer carTypeId; + @TableId("DRIVER_TYPE_ID") + private Integer driverTypeId; @TableField("CONFIG_KEY") private String configKey; diff --git a/src/main/java/com/wrj/driver/server/entity/TdCarChapter.java b/src/main/java/com/wrj/driver/server/entity/WrjTypeChapter.java similarity index 56% rename from src/main/java/com/wrj/driver/server/entity/TdCarChapter.java rename to src/main/java/com/wrj/driver/server/entity/WrjTypeChapter.java index 8767b69..322a503 100644 --- a/src/main/java/com/wrj/driver/server/entity/TdCarChapter.java +++ b/src/main/java/com/wrj/driver/server/entity/WrjTypeChapter.java @@ -2,6 +2,7 @@ package com.wrj.driver.server.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -9,51 +10,52 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * 车型章节表 + * 无人机驾驶员类型章节表 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class TdCarChapter implements Serializable { +@TableName("wrj_type_chapter") +public class WrjTypeChapter implements Serializable { - @TableId("ID") - private Integer ID; + @TableId("id") + private Integer id; /** - * 章节id + * 机型iD */ - @TableField("CHAPTER_ID") - private Integer chapterId; + @TableField("model_id") + private Integer modelId; + + + /** + * 驾驶类型id + */ + @TableField("type_id") + private Integer typeId; /** - * 车型id + * 章节id */ - @TableField("CAR_TYPE_ID") - private Integer carTypeId; + @TableField("chapter_id") + private Integer chapterId; /** * 判断题 */ - @TableField("JUDGE_NUM") + @TableField("judge_num") private Integer judgeNum; /** * 单选题 */ - @TableField("RADIO_NUM") + @TableField("radio_num") private Integer radioNum; /** * 多选题 */ - @TableField("MULTIPLE_CHOICE_NUM") + @TableField("multiple_choice_num") private Integer multipleChoiceNum; - - /** - * 科目 - */ - @TableField("SUBJECT") - private Integer subject; - } diff --git a/src/main/java/com/wrj/driver/server/mapper/OrderPayInfoMapper.java b/src/main/java/com/wrj/driver/server/mapper/OrderPayInfoMapper.java deleted file mode 100644 index f9e0c52..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/OrderPayInfoMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.OrderPayInfo; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 支付表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface OrderPayInfoMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/PayNoticeLogMapper.java b/src/main/java/com/wrj/driver/server/mapper/PayNoticeLogMapper.java deleted file mode 100644 index cfe109f..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/PayNoticeLogMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.PayNoticeLog; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 支付回调日志表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface PayNoticeLogMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/PayPrepayMapper.java b/src/main/java/com/wrj/driver/server/mapper/PayPrepayMapper.java deleted file mode 100644 index 299950a..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/PayPrepayMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.PayPrepay; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 预支付表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface PayPrepayMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/PayPrepayResultMapper.java b/src/main/java/com/wrj/driver/server/mapper/PayPrepayResultMapper.java deleted file mode 100644 index 44617fd..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/PayPrepayResultMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.PayPrepayResult; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 支付结果表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface PayPrepayResultMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/PayRefundMapper.java b/src/main/java/com/wrj/driver/server/mapper/PayRefundMapper.java deleted file mode 100644 index f0f1a94..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/PayRefundMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.PayRefund; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 申请退款表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface PayRefundMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/PayRefundResultMapper.java b/src/main/java/com/wrj/driver/server/mapper/PayRefundResultMapper.java deleted file mode 100644 index e601f23..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/PayRefundResultMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.PayRefundResult; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 退款结果表 Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface PayRefundResultMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/SysDistributionDetailMapper.java b/src/main/java/com/wrj/driver/server/mapper/SysDistributionDetailMapper.java deleted file mode 100644 index a367e90..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/SysDistributionDetailMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.SysDistributionDetail; - -import java.util.List; - -public interface SysDistributionDetailMapper extends BaseMapper { - List selectCurrentTimeList(String distributionId, String startTime); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/SysDistributionMapper.java b/src/main/java/com/wrj/driver/server/mapper/SysDistributionMapper.java deleted file mode 100644 index 37ce3bf..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/SysDistributionMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.SysDistribution; - -public interface SysDistributionMapper extends BaseMapper { - SysDistribution selectById(String distributionId); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/SysUserLogMapper.java b/src/main/java/com/wrj/driver/server/mapper/SysUserLogMapper.java new file mode 100644 index 0000000..6e0900d --- /dev/null +++ b/src/main/java/com/wrj/driver/server/mapper/SysUserLogMapper.java @@ -0,0 +1,7 @@ +package com.wrj.driver.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wrj.driver.server.entity.SysUserLog; + +public interface SysUserLogMapper extends BaseMapper { +} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdCarChapterMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdCarChapterMapper.java deleted file mode 100644 index ef2dd1e..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdCarChapterMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.entity.TdCarChapter; -import com.wrj.driver.server.vo.CarChapterVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TdCarChapterMapper extends BaseMapper { - List queryCarChapter(@Param("param") BaseQueryDto queryDto1); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdCarouselImageMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdCarouselImageMapper.java deleted file mode 100644 index 72109d3..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdCarouselImageMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdCarouselImage; - -public interface TdCarouselImageMapper extends BaseMapper { -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdCategoryQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdCategoryQuestionMapper.java deleted file mode 100644 index 7f7685b..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdCategoryQuestionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdCategoryQuestion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 题型题目表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdCategoryQuestionMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomMapper.java deleted file mode 100644 index 8ad070d..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdExaminationRoom; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 考场信息表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdExaminationRoomMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomRoadMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomRoadMapper.java deleted file mode 100644 index 263325a..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdExaminationRoomRoadMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdExaminationRoomRoad; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 考场线路表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdExaminationRoomRoadMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdMemberDiscountMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdMemberDiscountMapper.java deleted file mode 100644 index bc9b76f..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdMemberDiscountMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdMemberDiscount; - -public interface TdMemberDiscountMapper extends BaseMapper { -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdMemberMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdMemberMapper.java deleted file mode 100644 index cd66fe8..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdMemberMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.dto.MemberQueryDto; -import com.wrj.driver.server.entity.TdMember; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.vo.MemberVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 会员类型表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdMemberMapper extends BaseMapper { - - /** - * 获取会员列表 - * @param queryDto - * @return - */ - List queryMember(@Param("queryDto") MemberQueryDto queryDto); - - /** - * 获取用户会员 - * @param queryDto - * @param userId - * @return - */ - List queryUserMember(@Param("queryDto") MemberQueryDto queryDto, @Param("userId") Long userId); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdModuleQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdModuleQuestionMapper.java deleted file mode 100644 index 9a9e2b3..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdModuleQuestionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdModuleQuestion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 模块题目表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdModuleQuestionMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdPointQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdPointQuestionMapper.java deleted file mode 100644 index 8358193..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdPointQuestionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdPointQuestion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 考点题目表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdPointQuestionMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdProjectMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdProjectMapper.java deleted file mode 100644 index 2680e1f..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdProjectMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdProject; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 考试项目表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdProjectMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdQuestionJxMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdQuestionJxMapper.java deleted file mode 100644 index 8ac8f2e..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdQuestionJxMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.dto.QuestionJxQueryDto; -import com.wrj.driver.server.entity.TdQuestionJx; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TdQuestionJxMapper extends BaseMapper { - List queryQuestionJxIds(@Param("param") QuestionJxQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdQuestionVersionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdQuestionVersionMapper.java deleted file mode 100644 index ee5eeec..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdQuestionVersionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdQuestionVersion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 题库版本表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-09-03 - */ -public interface TdQuestionVersionMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSecretMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSecretMapper.java deleted file mode 100644 index 1ee17f2..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdSecretMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.entity.TdSecret; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 密卷 - */ -public interface TdSecretMapper extends BaseMapper { - List querySecretIds(@Param("param") BaseQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSecretQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSecretQuestionMapper.java deleted file mode 100644 index 517f020..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdSecretQuestionMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.dto.SecretQueryDto; -import com.wrj.driver.server.entity.TdSecretQuestion; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 密卷详情 - */ -public interface TdSecretQuestionMapper extends BaseMapper { - List querySecretQuestionIds(@Param("param") SecretQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysUserDiscountMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSysUserDiscountMapper.java deleted file mode 100644 index 91781dd..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysUserDiscountMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdSysUserDiscount; -import com.wrj.driver.server.vo.UserDiscountVO; - -import java.util.List; - -public interface TdSysUserDiscountMapper extends BaseMapper { - List selectUserDiscountByUserId(Long userId, Long tenantId); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysUserLogMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSysUserLogMapper.java deleted file mode 100644 index 7289b60..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysUserLogMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdSysUserLog; - -public interface TdSysUserLogMapper extends BaseMapper { -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysUserMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSysUserMapper.java index af5b7ba..0aab18c 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysUserMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/TdSysUserMapper.java @@ -1,7 +1,7 @@ package com.wrj.driver.server.mapper; import com.wrj.driver.server.dto.LoginUserDto; -import com.wrj.driver.server.entity.TdSysUser; +import com.wrj.driver.server.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -13,7 +13,5 @@ import org.apache.ibatis.annotations.Param; * @author Automated procedures * @since 2023-08-10 */ -public interface TdSysUserMapper extends BaseMapper { - - TdSysUser selectTenantUser(@Param("param") LoginUserDto loginUserDto); +public interface TdSysUserMapper extends BaseMapper { } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysUserMemberMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdSysUserMemberMapper.java deleted file mode 100644 index 466484c..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysUserMemberMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.dto.UserMemberDto; -import com.wrj.driver.server.entity.TdSysUserMember; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.vo.UserMemberVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - *

- * 用户会员表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdSysUserMemberMapper extends BaseMapper { - - List queryUserMemberList(@Param("userMemberDto") UserMemberDto userMemberDto); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdTenantAppletMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdTenantAppletMapper.java deleted file mode 100644 index e689fa9..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdTenantAppletMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdTenantApplet; - -public interface TdTenantAppletMapper extends BaseMapper { -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdTenantCarMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdTenantCarMapper.java deleted file mode 100644 index 840a73f..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdTenantCarMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdTenantCar; -import com.wrj.driver.server.vo.CarVo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TdTenantCarMapper extends BaseMapper { - List selectListByTenantId(@Param("tenantId") Long tenantId); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdTenantUserMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdTenantUserMapper.java deleted file mode 100644 index e088d0f..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdTenantUserMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdTenantUser; - -public interface TdTenantUserMapper extends BaseMapper { -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignCategoryMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignCategoryMapper.java deleted file mode 100644 index 3539464..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignCategoryMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdTrafficSignCategory; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 图标分类表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdTrafficSignCategoryMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignQuestionMapper.java deleted file mode 100644 index 01d0f57..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdTrafficSignQuestionMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdTrafficSignQuestion; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 图标分类相关题目表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface TdTrafficSignQuestionMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdUserDistributionMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdUserDistributionMapper.java deleted file mode 100644 index 935ecb1..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdUserDistributionMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.wrj.driver.server.entity.TdUserDistribution; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface TdUserDistributionMapper extends BaseMapper { - List selectUserDistribution(@Param("tenantId") Long tenantId, @Param("userId") Long userId); -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdVideosMapper.java b/src/main/java/com/wrj/driver/server/mapper/TdVideosMapper.java deleted file mode 100644 index 0e28bba..0000000 --- a/src/main/java/com/wrj/driver/server/mapper/TdVideosMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.mapper; - -import com.wrj.driver.server.entity.TdVideos; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 视频标识表; Mapper 接口 - *

- * - * @author Automated procedures - * @since 2023-08-20 - */ -public interface TdVideosMapper extends BaseMapper { - -} diff --git a/src/main/java/com/wrj/driver/server/mapper/TdChapterMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjChapterMapper.java similarity index 76% rename from src/main/java/com/wrj/driver/server/mapper/TdChapterMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjChapterMapper.java index 06925fe..c63b731 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdChapterMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjChapterMapper.java @@ -3,7 +3,7 @@ package com.wrj.driver.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wrj.driver.server.dto.ChapterDto; import com.wrj.driver.server.dto.ChapterQueryDto; -import com.wrj.driver.server.entity.TdChapter; +import com.wrj.driver.server.entity.WrjChapter; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,6 +11,6 @@ import java.util.List; /** * 章节数据层 */ -public interface TdChapterMapper extends BaseMapper { +public interface WrjChapterMapper extends BaseMapper { List queryChapter(@Param("param") ChapterQueryDto queryDto); } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdCarMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjDriverTypeMapper.java similarity index 62% rename from src/main/java/com/wrj/driver/server/mapper/TdCarMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjDriverTypeMapper.java index 5a57061..39b98d8 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdCarMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjDriverTypeMapper.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.mapper; -import com.wrj.driver.server.entity.TdCar; +import com.wrj.driver.server.entity.WrjDriverType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author Automated procedures * @since 2023-08-10 */ -public interface TdCarMapper extends BaseMapper { +public interface WrjDriverTypeMapper extends BaseMapper { } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdQuestionMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjQuestionMapper.java similarity index 85% rename from src/main/java/com/wrj/driver/server/mapper/TdQuestionMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjQuestionMapper.java index ce14a9c..60e2d3a 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdQuestionMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjQuestionMapper.java @@ -1,7 +1,7 @@ package com.wrj.driver.server.mapper; import com.wrj.driver.server.dto.QuestionQueryDto; -import com.wrj.driver.server.entity.TdQuestion; +import com.wrj.driver.server.entity.WrjQuestion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.wrj.driver.server.vo.QuestionVo; import org.apache.ibatis.annotations.Param; @@ -17,7 +17,7 @@ import java.util.Map; * @author Automated procedures * @since 2023-08-10 */ -public interface TdQuestionMapper extends BaseMapper { +public interface WrjQuestionMapper extends BaseMapper { /** * 查询考题 @@ -50,7 +50,7 @@ public interface TdQuestionMapper extends BaseMapper { int updateQuestion(@Param("questionVo") QuestionVo questionVo); /** - * 获取专项分类里题目数量 + * 获取各类里题目数量(目前肯嫩南瓜用不上,但暂时保留) * @param queryDto * @return */ @@ -61,5 +61,5 @@ public interface TdQuestionMapper extends BaseMapper { * @param carTypeId * @return */ - Integer queryMaxSort(@Param("carTypeId") int carTypeId); + Integer queryMaxSort(); } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdQuestionTestMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjQuestionTestMapper.java similarity index 77% rename from src/main/java/com/wrj/driver/server/mapper/TdQuestionTestMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjQuestionTestMapper.java index 2ec6ff8..08550ae 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdQuestionTestMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjQuestionTestMapper.java @@ -2,7 +2,7 @@ package com.wrj.driver.server.mapper; import com.wrj.driver.server.dto.TestQueryDto; import com.wrj.driver.server.vo.TestScoreVO; -import com.wrj.driver.server.entity.TdQuestionTest; +import com.wrj.driver.server.entity.WrjQuestionTest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -16,7 +16,7 @@ import java.util.List; * @author Automated procedures * @since 2023-08-10 */ -public interface TdQuestionTestMapper extends BaseMapper { +public interface WrjQuestionTestMapper extends BaseMapper { List getTestScore(@Param("param") TestQueryDto queryDto); } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysConfigListMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjSysConfigListMapper.java similarity index 61% rename from src/main/java/com/wrj/driver/server/mapper/TdSysConfigListMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjSysConfigListMapper.java index 335baa9..11353bf 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysConfigListMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjSysConfigListMapper.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.mapper; -import com.wrj.driver.server.entity.TdSysConfigList; +import com.wrj.driver.server.entity.WrjSysConfigList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author Automated procedures * @since 2023-08-10 */ -public interface TdSysConfigListMapper extends BaseMapper { +public interface WrjSysConfigListMapper extends BaseMapper { } diff --git a/src/main/java/com/wrj/driver/server/mapper/TdSysConfigMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjSysConfigMapper.java similarity index 58% rename from src/main/java/com/wrj/driver/server/mapper/TdSysConfigMapper.java rename to src/main/java/com/wrj/driver/server/mapper/WrjSysConfigMapper.java index 725778a..ac28f94 100644 --- a/src/main/java/com/wrj/driver/server/mapper/TdSysConfigMapper.java +++ b/src/main/java/com/wrj/driver/server/mapper/WrjSysConfigMapper.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.mapper; -import com.wrj.driver.server.entity.TdSysConfig; +import com.wrj.driver.server.entity.WrjSysConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; * @author Automated procedures * @since 2023-08-10 */ -public interface TdSysConfigMapper extends BaseMapper { +public interface WrjSysConfigMapper extends BaseMapper { - void updateConfig(@Param("param") TdSysConfig config); + void updateConfig(@Param("param") WrjSysConfig config); } diff --git a/src/main/java/com/wrj/driver/server/mapper/WrjTypeChapterMapper.java b/src/main/java/com/wrj/driver/server/mapper/WrjTypeChapterMapper.java new file mode 100644 index 0000000..a5afc53 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/mapper/WrjTypeChapterMapper.java @@ -0,0 +1,13 @@ +package com.wrj.driver.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.wrj.driver.server.dto.BaseQueryDto; +import com.wrj.driver.server.entity.WrjTypeChapter; +import com.wrj.driver.server.vo.WrjTypeChapterVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface WrjTypeChapterMapper extends BaseMapper { + List queryWrjTypeChapter(@Param("param") BaseQueryDto queryDto1); +} diff --git a/src/main/java/com/wrj/driver/server/service/IOrderPayInfoService.java b/src/main/java/com/wrj/driver/server/service/IOrderPayInfoService.java deleted file mode 100644 index e4990b3..0000000 --- a/src/main/java/com/wrj/driver/server/service/IOrderPayInfoService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.OrderPayInfo; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.math.BigDecimal; - -/** - *

- * 支付表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IOrderPayInfoService extends IService { - - /** - * 微信支付创建预支付申请 - * - * @param originalPrice - * @param commission - * @param money - * @param userIdStr - * @param description - * @param tradeType - * @param outTradeNo - * @param payType - * @param detailId - * @param tenantId - * @return - */ - OrderPayInfo createOrderPayInfo(BigDecimal money, String userIdStr, String description, String tradeType, String outTradeNo, String payType, Long detailId, Long tenantId); - - /** - * 支付结果 - * @param payInfo - * @param payResult - */ - Boolean payNotice( OrderPayInfo payInfo, Boolean payResult); -} diff --git a/src/main/java/com/wrj/driver/server/service/IPayNoticeLogService.java b/src/main/java/com/wrj/driver/server/service/IPayNoticeLogService.java deleted file mode 100644 index 79aae93..0000000 --- a/src/main/java/com/wrj/driver/server/service/IPayNoticeLogService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.PayNoticeLog; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 支付回调日志表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IPayNoticeLogService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/IPayPrepayResultService.java b/src/main/java/com/wrj/driver/server/service/IPayPrepayResultService.java deleted file mode 100644 index 9f4fa49..0000000 --- a/src/main/java/com/wrj/driver/server/service/IPayPrepayResultService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.PayPrepayResult; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 支付结果表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IPayPrepayResultService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/IPayPrepayService.java b/src/main/java/com/wrj/driver/server/service/IPayPrepayService.java deleted file mode 100644 index 214ab93..0000000 --- a/src/main/java/com/wrj/driver/server/service/IPayPrepayService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.PayPrepay; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 预支付表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IPayPrepayService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/IPayRefundResultService.java b/src/main/java/com/wrj/driver/server/service/IPayRefundResultService.java deleted file mode 100644 index 673bedb..0000000 --- a/src/main/java/com/wrj/driver/server/service/IPayRefundResultService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.PayRefundResult; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 退款结果表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IPayRefundResultService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/IPayRefundService.java b/src/main/java/com/wrj/driver/server/service/IPayRefundService.java deleted file mode 100644 index 817dffa..0000000 --- a/src/main/java/com/wrj/driver/server/service/IPayRefundService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.PayRefund; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 申请退款表 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface IPayRefundService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ISysDistributionService.java b/src/main/java/com/wrj/driver/server/service/ISysDistributionService.java deleted file mode 100644 index 732de3c..0000000 --- a/src/main/java/com/wrj/driver/server/service/ISysDistributionService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.SysDistribution; - -public interface ISysDistributionService extends IService { - SysDistribution selectById(String distributionId); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysUserLogService.java b/src/main/java/com/wrj/driver/server/service/ISysUserLogService.java similarity index 61% rename from src/main/java/com/wrj/driver/server/service/ITdSysUserLogService.java rename to src/main/java/com/wrj/driver/server/service/ISysUserLogService.java index de557e5..79647cb 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdSysUserLogService.java +++ b/src/main/java/com/wrj/driver/server/service/ISysUserLogService.java @@ -1,10 +1,10 @@ package com.wrj.driver.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdSysUserLog; +import com.wrj.driver.server.entity.SysUserLog; import java.time.LocalDateTime; -public interface ITdSysUserLogService extends IService { - void saveLog(String title, int businessType, String device, int operType, Long userId, String param, String result, int status, LocalDateTime operTime, Long tenantId); +public interface ISysUserLogService extends IService { + void saveLog(String title, int businessType, String device, int operType, Long userId, String param, String result, int status, LocalDateTime operTime); } diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysUserService.java b/src/main/java/com/wrj/driver/server/service/ISysUserService.java similarity index 70% rename from src/main/java/com/wrj/driver/server/service/ITdSysUserService.java rename to src/main/java/com/wrj/driver/server/service/ISysUserService.java index 5ff2712..0133bc2 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdSysUserService.java +++ b/src/main/java/com/wrj/driver/server/service/ISysUserService.java @@ -1,8 +1,7 @@ package com.wrj.driver.server.service; -import com.wrj.driver.server.dto.DriverSchoolDto; import com.wrj.driver.server.dto.LoginUserDto; -import com.wrj.driver.server.entity.TdSysUser; +import com.wrj.driver.server.entity.SysUser; import com.baomidou.mybatisplus.extension.service.IService; import com.wrj.driver.server.vo.LoginUserVo; @@ -14,7 +13,7 @@ import com.wrj.driver.server.vo.LoginUserVo; * @author Automated procedures * @since 2023-08-10 */ -public interface ITdSysUserService extends IService { +public interface ISysUserService extends IService { /** * 获取短信验证码 @@ -41,11 +40,4 @@ public interface ITdSysUserService extends IService { * @return */ LoginUserVo queryUserMessage(); - - /** - * 绑定驾校 - * @param schoolDto - * @return - */ - Boolean bindSchool(DriverSchoolDto schoolDto); } diff --git a/src/main/java/com/wrj/driver/server/service/ITdCarChapterService.java b/src/main/java/com/wrj/driver/server/service/ITdCarChapterService.java deleted file mode 100644 index 8e36aef..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdCarChapterService.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.vo.CarChapterVo; - -import java.util.List; - -public interface ITdCarChapterService { - List queryCarChapter(BaseQueryDto queryDto1); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdCarouselImageService.java b/src/main/java/com/wrj/driver/server/service/ITdCarouselImageService.java deleted file mode 100644 index 48a496e..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdCarouselImageService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdCarouselImage; -import com.wrj.driver.server.vo.CarouselImageVo; - -import java.util.List; - -public interface ITdCarouselImageService extends IService { - List queryList(Long tenantId); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdCategoryQuestionService.java b/src/main/java/com/wrj/driver/server/service/ITdCategoryQuestionService.java deleted file mode 100644 index 3fa73dd..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdCategoryQuestionService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdCategoryQuestion; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 题型题目表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdCategoryQuestionService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomRoadService.java b/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomRoadService.java deleted file mode 100644 index 22c6054..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomRoadService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdExaminationRoomRoad; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 考场线路表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdExaminationRoomRoadService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomService.java b/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomService.java deleted file mode 100644 index 3513bd6..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdExaminationRoomService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdExaminationRoom; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 考场信息表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdExaminationRoomService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdMemberDiscountService.java b/src/main/java/com/wrj/driver/server/service/ITdMemberDiscountService.java deleted file mode 100644 index 4f73863..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdMemberDiscountService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdMemberDiscount; - -import java.util.List; - -public interface ITdMemberDiscountService extends IService { - TdMemberDiscount selectOne(String discountType, String subject); - - List selectList(String discountType, String subject); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdMemberService.java b/src/main/java/com/wrj/driver/server/service/ITdMemberService.java deleted file mode 100644 index 28f24e3..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdMemberService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.MemberQueryDto; -import com.wrj.driver.server.entity.TdMember; -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.vo.MemberVo; - -import java.util.List; - -/** - *

- * 会员类型表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdMemberService extends IService { - - /** - * 查询会员列表 - * @param queryDto - * @return - */ - List queryMember(MemberQueryDto queryDto); - - /** - * 获取用户开通的会员 - * @param queryDto - * @param userId - * @return - */ - List queryUserMember(MemberQueryDto queryDto,Long userId); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdModuleQuestionService.java b/src/main/java/com/wrj/driver/server/service/ITdModuleQuestionService.java deleted file mode 100644 index 38b93bb..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdModuleQuestionService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdModuleQuestion; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 模块题目表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdModuleQuestionService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdPointQuestionService.java b/src/main/java/com/wrj/driver/server/service/ITdPointQuestionService.java deleted file mode 100644 index f963aaf..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdPointQuestionService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdPointQuestion; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 考点题目表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdPointQuestionService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdProjectService.java b/src/main/java/com/wrj/driver/server/service/ITdProjectService.java deleted file mode 100644 index 100e403..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdProjectService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.ProjectDto; -import com.wrj.driver.server.entity.TdProject; -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.vo.ProjectVo; - -import java.util.List; - -/** - *

- * 考试项目表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdProjectService extends IService { - - /** - * 获取考试项目列表 - * @param queryDto - * @return - */ - List queryProjectList(ProjectDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdQuestionJxService.java b/src/main/java/com/wrj/driver/server/service/ITdQuestionJxService.java deleted file mode 100644 index d107b68..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdQuestionJxService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.QuestionJxQueryDto; - -import java.util.List; - -public interface ITdQuestionJxService { - List queryJXQuestionIds(QuestionJxQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdQuestionVersionService.java b/src/main/java/com/wrj/driver/server/service/ITdQuestionVersionService.java deleted file mode 100644 index bd094cd..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdQuestionVersionService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdQuestionVersion; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 题库版本表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-09-03 - */ -public interface ITdQuestionVersionService extends IService { - - /** - * 获取题库当前版本号 - * @param carTypeId - * @return - */ - Long currentVersion(Integer carTypeId); - - /** - * 题库版本更新 - * @param versionDto - * @return - */ - Boolean addVersion(TdQuestionVersion versionDto); - - //校验题库版本是否一致 - void checkQuestionVersion(Integer carTypeId, Long versionId); - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSecretQuestionService.java b/src/main/java/com/wrj/driver/server/service/ITdSecretQuestionService.java deleted file mode 100644 index 4ad3546..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdSecretQuestionService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.SecretQueryDto; - -public interface ITdSecretQuestionService { - Object querySecretQuestionIds(SecretQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSecretService.java b/src/main/java/com/wrj/driver/server/service/ITdSecretService.java deleted file mode 100644 index bbea999..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdSecretService.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.BaseQueryDto; - -import java.util.List; - -public interface ITdSecretService { - List querySecretIds(BaseQueryDto queryDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysConfigService.java b/src/main/java/com/wrj/driver/server/service/ITdSysConfigService.java deleted file mode 100644 index d9c005d..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdSysConfigService.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.SysConfigDto; -import com.wrj.driver.server.entity.TdSysConfig; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; -import java.util.Map; - -/** - *

- * 系统配置表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdSysConfigService extends IService { - - /** - * 根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 - * @param configKey - * @param carTypeId - * @return - */ - TdSysConfig queryConfigByKey(String configKey, Integer carTypeId); - - /** - * 根据配置key和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 - * @param configKey - * @param carTypeId - * @return - */ - List queryConfigByKey(String configKey); - - /** - * 根据配置key和carTypeId获取配置值,配置与车型无关则carTypeId为-1 - * @param configKey - * @param carTypeId - * @return - */ - String queryConfigValueByKey(String configKey,Integer carTypeId); - - /** - * 根据配置keys和carTypeId获取配置信息,配置与车型无关则carTypeId为-1 - * @param configKeyList - * @param carTypeId - * @return - */ - Map queryConfigByKeys(List configKeyList,Integer carTypeId); - - Boolean saveConfig(SysConfigDto configDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysUserDiscountService.java b/src/main/java/com/wrj/driver/server/service/ITdSysUserDiscountService.java deleted file mode 100644 index 22ed767..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdSysUserDiscountService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdSysUserDiscount; - -public interface ITdSysUserDiscountService extends IService { -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysUserMemberService.java b/src/main/java/com/wrj/driver/server/service/ITdSysUserMemberService.java deleted file mode 100644 index 9549e00..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdSysUserMemberService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.dto.UserMemberDto; -import com.wrj.driver.server.entity.OrderPayInfo; -import com.wrj.driver.server.entity.TdSysUserMember; -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.vo.UserMemberVo; - -import java.util.List; - -/** - *

- * 用户会员表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdSysUserMemberService extends IService { - - /** - * 慧眼充值 - * @param payInfo - * @return - */ - Boolean purchaseMember(OrderPayInfo payInfo); - - List queryUserMemberList(UserMemberDto userMemberDto); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdTenantAppletService.java b/src/main/java/com/wrj/driver/server/service/ITdTenantAppletService.java deleted file mode 100644 index cd28e74..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdTenantAppletService.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdTenantApplet; - -public interface ITdTenantAppletService extends IService { -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdTenantCarService.java b/src/main/java/com/wrj/driver/server/service/ITdTenantCarService.java deleted file mode 100644 index a42ad08..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdTenantCarService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.wrj.driver.server.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.wrj.driver.server.entity.TdTenantCar; -import com.wrj.driver.server.vo.CarVo; - -import java.util.List; - -public interface ITdTenantCarService extends IService { - List queryList(Long tenantId); -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdTrafficSignCategoryService.java b/src/main/java/com/wrj/driver/server/service/ITdTrafficSignCategoryService.java deleted file mode 100644 index 8231b77..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdTrafficSignCategoryService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdTrafficSignCategory; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 图标分类表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdTrafficSignCategoryService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdTrafficSignQuestionService.java b/src/main/java/com/wrj/driver/server/service/ITdTrafficSignQuestionService.java deleted file mode 100644 index 8a89492..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdTrafficSignQuestionService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdTrafficSignQuestion; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 图标分类相关题目表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -public interface ITdTrafficSignQuestionService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdVideosService.java b/src/main/java/com/wrj/driver/server/service/ITdVideosService.java deleted file mode 100644 index c6fb5f4..0000000 --- a/src/main/java/com/wrj/driver/server/service/ITdVideosService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wrj.driver.server.service; - -import com.wrj.driver.server.entity.TdVideos; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 视频标识表; 服务类 - *

- * - * @author Automated procedures - * @since 2023-08-20 - */ -public interface ITdVideosService extends IService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/ITdChapterService.java b/src/main/java/com/wrj/driver/server/service/IWrjChapterService.java similarity index 85% rename from src/main/java/com/wrj/driver/server/service/ITdChapterService.java rename to src/main/java/com/wrj/driver/server/service/IWrjChapterService.java index acc312a..b811899 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdChapterService.java +++ b/src/main/java/com/wrj/driver/server/service/IWrjChapterService.java @@ -5,6 +5,6 @@ import com.wrj.driver.server.dto.ChapterQueryDto; import java.util.List; -public interface ITdChapterService { +public interface IWrjChapterService { List queryChapter(ChapterQueryDto queryDto); } diff --git a/src/main/java/com/wrj/driver/server/service/ITdCarService.java b/src/main/java/com/wrj/driver/server/service/IWrjDriverTypeService.java similarity index 62% rename from src/main/java/com/wrj/driver/server/service/ITdCarService.java rename to src/main/java/com/wrj/driver/server/service/IWrjDriverTypeService.java index de69b1a..fc1688e 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdCarService.java +++ b/src/main/java/com/wrj/driver/server/service/IWrjDriverTypeService.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.service; -import com.wrj.driver.server.entity.TdCar; +import com.wrj.driver.server.entity.WrjDriverType; import com.baomidou.mybatisplus.extension.service.IService; /** @@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService; * @author Automated procedures * @since 2023-08-10 */ -public interface ITdCarService extends IService { +public interface IWrjDriverTypeService extends IService { } diff --git a/src/main/java/com/wrj/driver/server/service/ITdQuestionService.java b/src/main/java/com/wrj/driver/server/service/IWrjQuestionService.java similarity index 83% rename from src/main/java/com/wrj/driver/server/service/ITdQuestionService.java rename to src/main/java/com/wrj/driver/server/service/IWrjQuestionService.java index 578a019..2d319d2 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdQuestionService.java +++ b/src/main/java/com/wrj/driver/server/service/IWrjQuestionService.java @@ -2,23 +2,22 @@ package com.wrj.driver.server.service; import com.wrj.driver.server.dto.QuestionAddDto; import com.wrj.driver.server.dto.QuestionQueryDto; -import com.wrj.driver.server.entity.TdQuestion; +import com.wrj.driver.server.entity.WrjQuestion; import com.baomidou.mybatisplus.extension.service.IService; import com.wrj.driver.server.vo.QuestionVo; -import com.wrj.driver.server.vo.QusetionCategoryVo; import java.util.List; import java.util.Map; /** *

- * 题库; 服务类 + * 无人机题库; 服务类 *

* * @author Automated procedures * @since 2023-08-10 */ -public interface ITdQuestionService extends IService { +public interface IWrjQuestionService extends IService { /** @@ -63,13 +62,6 @@ public interface ITdQuestionService extends IService { */ List getTestQuestionId(QuestionQueryDto queryDto); - /** - * 题目分类 - * @param queryDto - * @return - */ - List questionCategory(QuestionQueryDto queryDto); - /** * 修改题库 * @param questionVo diff --git a/src/main/java/com/wrj/driver/server/service/ITdQuestionTestService.java b/src/main/java/com/wrj/driver/server/service/IWrjQuestionTestService.java similarity index 87% rename from src/main/java/com/wrj/driver/server/service/ITdQuestionTestService.java rename to src/main/java/com/wrj/driver/server/service/IWrjQuestionTestService.java index e51cd64..af2bb90 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdQuestionTestService.java +++ b/src/main/java/com/wrj/driver/server/service/IWrjQuestionTestService.java @@ -3,7 +3,7 @@ package com.wrj.driver.server.service; import com.wrj.driver.server.dto.TestQueryDto; import com.wrj.driver.server.vo.TestScoreVO; import com.wrj.driver.server.dto.TestSubmitDto; -import com.wrj.driver.server.entity.TdQuestionTest; +import com.wrj.driver.server.entity.WrjQuestionTest; import com.baomidou.mybatisplus.extension.service.IService; import com.wrj.driver.server.response.BaseResponse; import com.wrj.driver.server.vo.TestTotalVo; @@ -18,7 +18,7 @@ import java.util.List; * @author Automated procedures * @since 2023-08-10 */ -public interface ITdQuestionTestService extends IService { +public interface IWrjQuestionTestService extends IService { /** * 交卷 考试提交 diff --git a/src/main/java/com/wrj/driver/server/service/ITdSysConfigListService.java b/src/main/java/com/wrj/driver/server/service/IWrjSysConfigListService.java similarity index 52% rename from src/main/java/com/wrj/driver/server/service/ITdSysConfigListService.java rename to src/main/java/com/wrj/driver/server/service/IWrjSysConfigListService.java index eb75a76..90537c1 100644 --- a/src/main/java/com/wrj/driver/server/service/ITdSysConfigListService.java +++ b/src/main/java/com/wrj/driver/server/service/IWrjSysConfigListService.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.service; -import com.wrj.driver.server.entity.TdSysConfigList; +import com.wrj.driver.server.entity.WrjSysConfigList; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Map; * @author Automated procedures * @since 2023-08-10 */ -public interface ITdSysConfigListService extends IService { +public interface IWrjSysConfigListService extends IService { /** * 根据configKey和carTypeId查询系统配置列表 @@ -22,21 +22,21 @@ public interface ITdSysConfigListService extends IService { * @param carTypeId * @return */ - List querySysConfigList(String configKey, Integer carTypeId); + List querySysConfigList(String configKey, Integer driverTypeId); /** - * 通过多个configKey 和 carTypeId 查询多个配置列表 + * 通过多个configKey 和 driverTypeId 查询多个配置列表 * @param configKeyList - * @param carTypeId + * @param driverTypeId * @return */ - Map> querySysConfigMap(List configKeyList, Integer carTypeId); + Map> querySysConfigMap(List configKeyList, Integer driverTypeId); /** - * 根据configKey和carTypeId查询系统配置列表数量 + * 根据configKey和driverTypeId查询系统配置列表数量 * @param configKey - * @param carTypeId + * @param driverTypeId * @return */ - Integer querySysConfigListNum(String configKey, Integer carTypeId); + Integer querySysConfigListNum(String configKey, Integer driverTypeId); } diff --git a/src/main/java/com/wrj/driver/server/service/IWrjSysConfigService.java b/src/main/java/com/wrj/driver/server/service/IWrjSysConfigService.java new file mode 100644 index 0000000..882990f --- /dev/null +++ b/src/main/java/com/wrj/driver/server/service/IWrjSysConfigService.java @@ -0,0 +1,53 @@ +package com.wrj.driver.server.service; + +import com.wrj.driver.server.dto.SysConfigDto; +import com.wrj.driver.server.entity.WrjSysConfig; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 系统配置表; 服务类 + *

+ * + * @author Automated procedures + * @since 2023-08-10 + */ +public interface IWrjSysConfigService extends IService { + + /** + * 根据配置key和driverTypeId获取配置信息,配置与车型无关则driverTypeId为-1 + * @param configKey + * @param driverTypeId + * @return + */ + WrjSysConfig queryConfigByKey(String configKey, Integer driverTypeId); + + /** + * 根据配置key和driverTypeId获取配置信息,配置与车型无关则driverTypeId为-1 + * @param configKey + * @param driverTypeId + * @return + */ + List queryConfigByKey(String configKey); + + /** + * 根据配置key和driverTypeId获取配置值,配置与车型无关则driverTypeId为-1 + * @param configKey + * @param driverTypeId + * @return + */ + String queryConfigValueByKey(String configKey,Integer driverTypeId); + + /** + * 根据配置keys和driverTypeId获取配置信息,配置与车型无关则driverTypeId为-1 + * @param configKeyList + * @param driverTypeId + * @return + */ + Map queryConfigByKeys(List configKeyList, Integer driverTypeId); + + Boolean saveConfig(SysConfigDto configDto); +} diff --git a/src/main/java/com/wrj/driver/server/service/IWrjTypeChapterService.java b/src/main/java/com/wrj/driver/server/service/IWrjTypeChapterService.java new file mode 100644 index 0000000..48f9c97 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/service/IWrjTypeChapterService.java @@ -0,0 +1,10 @@ +package com.wrj.driver.server.service; + +import com.wrj.driver.server.dto.BaseQueryDto; +import com.wrj.driver.server.vo.WrjTypeChapterVo; + +import java.util.List; + +public interface IWrjTypeChapterService { + List queryWrjTypeChapter(BaseQueryDto queryDto1); +} diff --git a/src/main/java/com/wrj/driver/server/service/impl/OrderPayInfoServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/OrderPayInfoServiceImpl.java deleted file mode 100644 index 8ae04d4..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/OrderPayInfoServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import cn.hutool.core.lang.Snowflake; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.entity.OrderPayInfo; -import com.wrj.driver.server.entity.TdMember; -import com.wrj.driver.server.entity.TdSysUser; -import com.wrj.driver.server.entity.TdUserDistribution; -import com.wrj.driver.server.enums.PayStatus; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.OrderPayInfoMapper; -import com.wrj.driver.server.mapper.SysDistributionDetailMapper; -import com.wrj.driver.server.mapper.TdMemberMapper; -import com.wrj.driver.server.mapper.TdUserDistributionMapper; -import com.wrj.driver.server.service.IOrderPayInfoService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.service.ITdMemberService; -import com.wrj.driver.server.service.ITdSysUserService; -import com.wrj.driver.server.util.SecurityUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Objects; - -/** - *

- * 支付表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -@Slf4j -public class OrderPayInfoServiceImpl extends ServiceImpl implements IOrderPayInfoService { - - @Autowired - private ITdSysUserService userService; - - @Autowired - private ITdMemberService memberService; - - @Autowired - private Snowflake snowflake; - - @Autowired - private SysDistributionDetailMapper sysDistributionDetailMapper; - - @Autowired - private TdMemberMapper tdMemberMapper; - - @Autowired - private TdUserDistributionMapper userDistributionMapper; - - @Override - public OrderPayInfo createOrderPayInfo(BigDecimal money, String userIdStr, String description, String tradeType, String outTradeNo, - String payType, Long detailId, Long tenantId) { - Long userId = StrUtil.isNotBlank(userIdStr) ? Long.parseLong(userIdStr) : SecurityUtil.getUserId(); - TdSysUser user = userService.getById(userId); - if (Objects.isNull(user)) { - log.error("数据异常,用户不存在" + userId); - throw new BusinessException("数据缺失"); - } - TdMember member = memberService.getById(Integer.parseInt(outTradeNo)); - if (Objects.isNull(member) || StrUtil.equals(Constants.IS_ACTIVE_FALSE, member.getIsActive())) { - log.error("数据异常,会员不存在或者已过期" + outTradeNo); - throw new BusinessException("数据缺失"); - } - //查询当前租户下的分销id信息 - String distributionId = null; - List userDistributions = userDistributionMapper.selectList(new LambdaQueryWrapper() - .eq(TdUserDistribution::getUserId, userId) - .eq(TdUserDistribution::getTenantId, tenantId)); - if (userDistributions != null && !userDistributions.isEmpty()){ - distributionId = userDistributions.get(0).getDistributionId(); - } - - //查询分销配置信息 -// SysDistributionDetail detail = null; -// if (null != detailId){ -// detail = sysDistributionDetailMapper.selectById(detailId); -// if (detail.getDiscountedPrice().compareTo(money) != 0) { -// log.error("数据异常, 优惠信息已失效" + outTradeNo); -// throw new BusinessException("优惠信息已失效,请刷新页面后重新操作!"); -// } -// } - - OrderPayInfo orderPayInfo = new OrderPayInfo() - .setPayId(snowflake.nextId()) - .setPurchaseProductType(tradeType) - .setPurchaseProductId(outTradeNo) - .setMoney(money) - .setPaymentType(Constants.WECHAT_PAY) - .setPayType(payType) - .setDescription(user.getUserName() + "-" + member.getMemberName()) - .setPayStatus(PayStatus.NOT.getValue()) - .setDeleteStatus(0) - .setUserId(userId) - .setCreateTime(LocalDateTime.now()) - .setUpdateTime(LocalDateTime.now()) - .setDetailId(detailId) - .setOriginalPrice(member.getPrice()) - .setTenantId(tenantId) -// .setCommission(null == detail ? null : detail.getCommission()) - .setDistributionId(distributionId); - - this.save(orderPayInfo); - return orderPayInfo; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean payNotice( OrderPayInfo payInfo, Boolean payResult) { - log.info("支付回调信息===============> payInfo{} , payResult{}",payInfo,payResult); - if (Objects.isNull(payInfo)){ - throw new BusinessException("订单信息不存在"); - } - payInfo.setPayStatus(payResult?PayStatus.SUCCESS.getValue() : PayStatus.FAIL.getValue()) - .setUpdateTime(LocalDateTime.now()); - - this.updateById(payInfo); - return Boolean.TRUE; - } - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/PayNoticeLogServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/PayNoticeLogServiceImpl.java deleted file mode 100644 index e271cb0..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/PayNoticeLogServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.PayNoticeLog; -import com.wrj.driver.server.mapper.PayNoticeLogMapper; -import com.wrj.driver.server.service.IPayNoticeLogService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 支付回调日志表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class PayNoticeLogServiceImpl extends ServiceImpl implements IPayNoticeLogService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/PayPrepayResultServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/PayPrepayResultServiceImpl.java deleted file mode 100644 index 6f71677..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/PayPrepayResultServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.PayPrepayResult; -import com.wrj.driver.server.mapper.PayPrepayResultMapper; -import com.wrj.driver.server.service.IPayPrepayResultService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 支付结果表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class PayPrepayResultServiceImpl extends ServiceImpl implements IPayPrepayResultService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/PayPrepayServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/PayPrepayServiceImpl.java deleted file mode 100644 index 52de5e9..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/PayPrepayServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.PayPrepay; -import com.wrj.driver.server.mapper.PayPrepayMapper; -import com.wrj.driver.server.service.IPayPrepayService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 预支付表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class PayPrepayServiceImpl extends ServiceImpl implements IPayPrepayService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/PayRefundResultServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/PayRefundResultServiceImpl.java deleted file mode 100644 index 0be49b7..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/PayRefundResultServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.PayRefundResult; -import com.wrj.driver.server.mapper.PayRefundResultMapper; -import com.wrj.driver.server.service.IPayRefundResultService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 退款结果表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class PayRefundResultServiceImpl extends ServiceImpl implements IPayRefundResultService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/PayRefundServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/PayRefundServiceImpl.java deleted file mode 100644 index a67ea3b..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/PayRefundServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.PayRefund; -import com.wrj.driver.server.mapper.PayRefundMapper; -import com.wrj.driver.server.service.IPayRefundService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 申请退款表 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class PayRefundServiceImpl extends ServiceImpl implements IPayRefundService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/SysDistributionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/SysDistributionServiceImpl.java deleted file mode 100644 index 65a17fd..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/SysDistributionServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.SysDistribution; -import com.wrj.driver.server.mapper.SysDistributionMapper; -import com.wrj.driver.server.service.ISysDistributionService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class SysDistributionServiceImpl extends ServiceImpl implements ISysDistributionService { - @Override - public SysDistribution selectById(String distributionId) { - return this.getBaseMapper().selectById(distributionId); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdCarChapterServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdCarChapterServiceImpl.java deleted file mode 100644 index 2f784ce..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdCarChapterServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.entity.TdCarChapter; -import com.wrj.driver.server.mapper.TdCarChapterMapper; -import com.wrj.driver.server.service.ITdCarChapterService; -import com.wrj.driver.server.vo.CarChapterVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -public class TdCarChapterServiceImpl extends ServiceImpl implements ITdCarChapterService { - @Override - public List queryCarChapter(BaseQueryDto queryDto1) { - return this.getBaseMapper().queryCarChapter(queryDto1); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdCarServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdCarServiceImpl.java deleted file mode 100644 index b1b130b..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdCarServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdCar; -import com.wrj.driver.server.mapper.TdCarMapper; -import com.wrj.driver.server.service.ITdCarService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 车型分类; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdCarServiceImpl extends ServiceImpl implements ITdCarService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdCarouselImageServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdCarouselImageServiceImpl.java deleted file mode 100644 index 38d525d..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdCarouselImageServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.entity.TdCarouselImage; -import com.wrj.driver.server.mapper.TdCarouselImageMapper; -import com.wrj.driver.server.service.ITdCarouselImageService; -import com.wrj.driver.server.vo.CarouselImageVo; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.stream.Collectors; - -@Service -public class TdCarouselImageServiceImpl extends ServiceImpl implements ITdCarouselImageService { - @Override - public List queryList(Long tenantId) { - List list = this.baseMapper.selectList(new LambdaQueryWrapper() - .eq(TdCarouselImage::getTenantId,tenantId) - .eq(TdCarouselImage::getIsActive, Constants.IS_ACTIVE_TRUE)); - - return list.stream().map(d -> { - CarouselImageVo vo = new CarouselImageVo(); - BeanUtils.copyProperties(d, vo); - return vo; - }).collect(Collectors.toList()); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdCategoryQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdCategoryQuestionServiceImpl.java deleted file mode 100644 index 5bfe307..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdCategoryQuestionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdCategoryQuestion; -import com.wrj.driver.server.mapper.TdCategoryQuestionMapper; -import com.wrj.driver.server.service.ITdCategoryQuestionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 题型题目表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdCategoryQuestionServiceImpl extends ServiceImpl implements ITdCategoryQuestionService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomRoadServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomRoadServiceImpl.java deleted file mode 100644 index 7d095fe..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomRoadServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdExaminationRoomRoad; -import com.wrj.driver.server.mapper.TdExaminationRoomRoadMapper; -import com.wrj.driver.server.service.ITdExaminationRoomRoadService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 考场线路表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdExaminationRoomRoadServiceImpl extends ServiceImpl implements ITdExaminationRoomRoadService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomServiceImpl.java deleted file mode 100644 index 65689b1..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdExaminationRoomServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdExaminationRoom; -import com.wrj.driver.server.mapper.TdExaminationRoomMapper; -import com.wrj.driver.server.service.ITdExaminationRoomService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 考场信息表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdExaminationRoomServiceImpl extends ServiceImpl implements ITdExaminationRoomService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdMemberDiscountServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdMemberDiscountServiceImpl.java deleted file mode 100644 index 8de4d41..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdMemberDiscountServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.TdMemberDiscount; -import com.wrj.driver.server.mapper.TdMemberDiscountMapper; -import com.wrj.driver.server.service.ITdMemberDiscountService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -public class TdMemberDiscountServiceImpl extends ServiceImpl implements ITdMemberDiscountService { - @Override - public TdMemberDiscount selectOne(String discountType, String subject) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdMemberDiscount::getDiscountType, discountType) - .eq(TdMemberDiscount::getSubject, subject) - .eq(TdMemberDiscount::getIsActive, "0"); - return getOne(queryWrapper); - } - - @Override - public List selectList(String discountType, String subject) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdMemberDiscount::getDiscountType, discountType) - .eq(TdMemberDiscount::getSubject, subject) - .eq(TdMemberDiscount::getIsActive, "0"); - return this.getBaseMapper().selectList(queryWrapper); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdMemberServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdMemberServiceImpl.java deleted file mode 100644 index 2712148..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdMemberServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.dto.MemberQueryDto; -import com.wrj.driver.server.entity.TdMember; -import com.wrj.driver.server.mapper.SysDistributionDetailMapper; -import com.wrj.driver.server.mapper.TdMemberMapper; -import com.wrj.driver.server.mapper.TdSysUserDiscountMapper; -import com.wrj.driver.server.service.ITdMemberService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.util.SecurityUtil; -import com.wrj.driver.server.util.TokenThreadUtil; -import com.wrj.driver.server.vo.MemberVo; -import com.wrj.driver.server.vo.UserDiscountVO; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.format.DateTimeFormatter; -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 会员类型表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -@Slf4j -public class TdMemberServiceImpl extends ServiceImpl implements ITdMemberService { - - @Autowired - private SysDistributionDetailMapper sysDistributionDetailMapper; - - @Autowired - private TdSysUserDiscountMapper userDiscountMapper; - - @Override - public List queryMember(MemberQueryDto queryDto) { - - List resultList = new ArrayList<>(); - - //获取用户已开通且未到期的会员(即使该会员已不售卖了) - List userMemberList = new ArrayList<>(); - List userDiscounts = new ArrayList<>(); - try { - if (StrUtil.isNotBlank(TokenThreadUtil.getToken())){ - userMemberList = queryUserMember(queryDto, SecurityUtil.getUserId()); - //查询用户折扣 - userDiscounts = userDiscountMapper.selectUserDiscountByUserId(SecurityUtil.getUserId(), queryDto.getTenantId()); - -// distributionId = SecurityUtil.getDistributionId(); - } - }catch (Exception e){ - log.info("===================>用户没有登录"); - } - - Map userMemberMap = userMemberList.stream().collect(Collectors.toMap(MemberVo::getMemberId, v -> v, (v1, v2) -> v1)); - - Map> userDiscountMap = userDiscounts.stream().collect(Collectors.groupingBy(UserDiscountVO::getParam2)); - - //将用户购买的已停售但未过期的会员放在最前面 - List expireMemberlist = userMemberList.stream().filter(s -> StrUtil.equals(s.getIsActive(), Constants.IS_ACTIVE_FALSE)).collect(Collectors.toList()); - if (CollectionUtil.isNotEmpty(expireMemberlist)){ - resultList.addAll(expireMemberlist); - } - - //获取现在可开通的会员 - List memberList = this.getBaseMapper().queryMember(queryDto); -// //根据分销id查询分销信息 -// List detailList = null; -// Map distributionDetailMap = null; -// if(!StringUtil.isNullOrEmpty(distributionId)){ -// detailList = sysDistributionDetailMapper.selectCurrentTimeList(distributionId, DateTimeUtil.getCurrentStr(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); -// } -// -// if (null != detailList){ -// detailList = detailList.stream().distinct().collect(Collectors.toList()); -// distributionDetailMap = detailList.stream().collect(Collectors.toMap(SysDistributionDetail::getMemberId, v -> v, (v1, v2) -> v1)); -// } - - - - if (CollectionUtil.isNotEmpty(memberList)){ - for (MemberVo memberVo : memberList) { - if(userMemberMap.containsKey(memberVo.getMemberId())){ - resultList.add(userMemberMap.get(memberVo.getMemberId())); - } -// else if(null != distributionDetailMap && distributionDetailMap.containsKey(Long.valueOf(memberVo.getMemberId())) ){ -// SysDistributionDetail detail = distributionDetailMap.get(Long.valueOf(memberVo.getMemberId())); -// memberVo.setDiscount(detail.getDiscountedPrice()); -// memberVo.setDetailId(detail.getDetailId()); -// resultList.add(memberVo); -// } - else { - - //查看是否有其他的折扣价 - if (userDiscountMap != null && userDiscountMap.get(memberVo.getMemberId()+"") != null){ - List userDiscountVOS = userDiscountMap.get(memberVo.getMemberId()+""); - userDiscountVOS = userDiscountVOS.stream().sorted(Comparator.comparing(UserDiscountVO::getDiscount)).collect(Collectors.toList()); - UserDiscountVO min = userDiscountVOS.get(0); - if (min.getDiscount() != null && min.getDiscount().compareTo(memberVo.getDiscount()) <= 0){ - memberVo.setActualPrice(min.getDiscount()); - memberVo.setActualEndTime(min.getEndTime() == null ? null : min.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"))); - } - } - - resultList.add(memberVo); - - } - } - } - - return resultList; - } - - @Override - public List queryUserMember(MemberQueryDto queryDto,Long userId) { - return this.getBaseMapper().queryUserMember(queryDto,userId); - } - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdModuleQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdModuleQuestionServiceImpl.java deleted file mode 100644 index 6a16c98..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdModuleQuestionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdModuleQuestion; -import com.wrj.driver.server.mapper.TdModuleQuestionMapper; -import com.wrj.driver.server.service.ITdModuleQuestionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 模块题目表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdModuleQuestionServiceImpl extends ServiceImpl implements ITdModuleQuestionService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdPointQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdPointQuestionServiceImpl.java deleted file mode 100644 index 12285c7..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdPointQuestionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdPointQuestion; -import com.wrj.driver.server.mapper.TdPointQuestionMapper; -import com.wrj.driver.server.service.ITdPointQuestionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 考点题目表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdPointQuestionServiceImpl extends ServiceImpl implements ITdPointQuestionService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdProjectServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdProjectServiceImpl.java deleted file mode 100644 index 0d7acbf..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdProjectServiceImpl.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.dto.ProjectDto; -import com.wrj.driver.server.entity.TdProject; -import com.wrj.driver.server.entity.TdVideos; -import com.wrj.driver.server.mapper.TdProjectMapper; -import com.wrj.driver.server.service.ITdProjectService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.service.ITdVideosService; -import com.wrj.driver.server.vo.ProjectVo; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -/** - *

- * 考试项目表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdProjectServiceImpl extends ServiceImpl implements ITdProjectService { - - @Autowired - private ITdVideosService videosService; - - @Override - public List queryProjectList(ProjectDto queryDto) { - - List resultList = new ArrayList<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(Objects.nonNull(queryDto.getProjectId()),TdProject::getProjectId,queryDto.getProjectId()) - .eq(StrUtil.isNotBlank(queryDto.getType()),TdProject::getType,queryDto.getType()) - .eq(Objects.nonNull(queryDto.getCarTypeId()),TdProject::getCarTypeId,queryDto.getCarTypeId()) - .eq(StrUtil.isNotBlank(queryDto.getSubject()),TdProject::getSubject,queryDto.getSubject()) - .eq(StrUtil.isNotBlank(queryDto.getDriveType()),TdProject::getDriveType,queryDto.getDriveType()) - .eq(TdProject::getIsActive, Constants.IS_ACTIVE_TRUE) - .orderByAsc(TdProject::getShowOrder); - List tdProjects = this.getBaseMapper().selectList(queryWrapper); - - if (CollectionUtil.isNotEmpty(tdProjects)){ - for (TdProject tdProject : tdProjects) { - ProjectVo projectVo = new ProjectVo(); - BeanUtils.copyProperties(tdProject,projectVo); - //查询项目视频 - List videoList = videosService.list(new QueryWrapper().lambda().eq(TdVideos::getTypeId, tdProject.getProjectId()).orderByAsc(TdVideos::getShowOrder)); - if (CollectionUtil.isNotEmpty(videoList)){ - projectVo.setVideoList(videoList); - projectVo.setImageUrl(videoList.get(0).getVideoImage()); - } - resultList.add(projectVo); - } - } - return resultList; - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionJxServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdQuestionJxServiceImpl.java deleted file mode 100644 index 8bf55b7..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionJxServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.dto.QuestionJxQueryDto; -import com.wrj.driver.server.entity.TdQuestion; -import com.wrj.driver.server.mapper.TdQuestionJxMapper; -import com.wrj.driver.server.mapper.TdQuestionMapper; -import com.wrj.driver.server.service.ITdQuestionJxService; -import com.wrj.driver.server.service.ITdQuestionVersionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class TdQuestionJxServiceImpl extends ServiceImpl implements ITdQuestionJxService { - - @Autowired - private TdQuestionJxMapper questionJxMapper; - - @Autowired - private ITdQuestionVersionService versionService; - - @Override - public List queryJXQuestionIds(QuestionJxQueryDto queryDto) { - //校验题库版本是否一致 - versionService.checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - return questionJxMapper.queryQuestionJxIds(queryDto); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdQuestionServiceImpl.java deleted file mode 100644 index f3d63e8..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionServiceImpl.java +++ /dev/null @@ -1,446 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.constant.ErrorCode; -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.dto.QuestionAddDto; -import com.wrj.driver.server.dto.QuestionQueryDto; -import com.wrj.driver.server.dto.TestQuestionTypeDto; -import com.wrj.driver.server.entity.TdQuestion; -import com.wrj.driver.server.entity.TdSysConfig; -import com.wrj.driver.server.entity.TdSysConfigList; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.TdQuestionMapper; -import com.wrj.driver.server.redis.RedisCache; -import com.wrj.driver.server.service.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.service.*; -import com.wrj.driver.server.vo.CarChapterVo; -import com.wrj.driver.server.vo.QuestionVo; -import com.wrj.driver.server.vo.QusetionCategoryVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.*; -import java.util.stream.Collectors; - -/** - *

- * 题库; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -@Slf4j -public class TdQuestionServiceImpl extends ServiceImpl implements ITdQuestionService { - - @Autowired - private ITdSysConfigService configService; - - @Autowired - private ITdSysConfigListService configListService; - - @Autowired - private RedisCache redisCache; - - @Autowired - private ITdQuestionVersionService versionService; - - @Autowired - private ITdCarChapterService carChapterService; - - @Override - public QuestionVo queryQuestionById(QuestionQueryDto queryDto) { - - QuestionQueryDto newDto = new QuestionQueryDto() - .setQuestionId(queryDto.getQuestionId()); - List questionVos = queryQuestion(newDto); - return CollectionUtil.isEmpty(questionVos) ? null : questionVos.get(0); - } - - @Override - public List queryQuestionByIdList(QuestionQueryDto queryDto) { - - QuestionQueryDto newDto = new QuestionQueryDto() - .setQuestionIdList(queryDto.getQuestionIdList()); - return queryQuestion(newDto); - } - - @Override - public List queryQuestion(QuestionQueryDto queryDto) { - //校验题库版本是否一致 - checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - List questionVos = this.getBaseMapper().queryQuestion(queryDto); - questionOptionHandler(questionVos); - return questionVos; - } - - @Override - public List queryQuestionId(QuestionQueryDto queryDto) { - //校验题库版本是否一致 - checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - List questionIds = this.getBaseMapper().queryQuestionId(queryDto); - return questionIds; - } - - @Override - public List getTestQuestion(QuestionQueryDto queryDto) { - - //校验题库版本是否一致 - checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - List resultList = new ArrayList<>(); - - //查询出题比例 - BaseQueryDto queryDto1 = new BaseQueryDto() - .setCarTypeId(queryDto.getCarTypeId()) - .setSubject(queryDto.getSubject()); - List tdCarChapters = carChapterService.queryCarChapter(queryDto1); - if (Objects.isNull(tdCarChapters)) { - log.info("carChapter is not exist"); - throw new BusinessException("获取信息异常"); - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //判断题 - if (Objects.nonNull(carChapterVo.getJudgeNum()) && carChapterVo.getJudgeNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_ONE) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getJudgeNum()); - resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); - } - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //单选 - if (Objects.nonNull(carChapterVo.getRadioNum()) && carChapterVo.getRadioNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_TWO) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getRadioNum()); - resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); - } - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //多选 - if (Objects.nonNull(carChapterVo.getMultipleChoiceNum()) && carChapterVo.getMultipleChoiceNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_THREE) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getMultipleChoiceNum()); - resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); - } - } - -// TdSysConfig tdSysConfig = configService.queryConfigByKey(Constants.TEST_QUESTION_TYPE_NUM, queryDto.getCarTypeId()); -// if (Objects.isNull(tdSysConfig)) { -// log.info("config is not exist"); -// throw new BusinessException("获取信息异常"); -// } -// -// List testQuestionTypeDtos = JSON.parseArray(tdSysConfig.getConfigJson(), TestQuestionTypeDto.class); -// Optional optional = testQuestionTypeDtos.stream().filter(s -> StrUtil.equals(s.getSubject(), queryDto.getSubject())).findFirst(); -// if (optional.isPresent()) { -// TestQuestionTypeDto testQuestionTypeDto = optional.get(); -// List chapterList = testQuestionTypeDto.getChapterList(); -// if (CollectionUtil.isEmpty(chapterList)){ -// return resultList; -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //判断题 -// if (Objects.nonNull(testOfChapter.getJudgeNum()) && testOfChapter.getJudgeNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_ONE) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getJudgeNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); -// } -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //单选 -// if (Objects.nonNull(testOfChapter.getRadioNum()) && testOfChapter.getRadioNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_TWO) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getRadioNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); -// } -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //多选 -// if (Objects.nonNull(testOfChapter.getMultipleChoiceNum()) && testOfChapter.getMultipleChoiceNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_THREE) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getMultipleChoiceNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); -// } -// } -// } - questionOptionHandler(resultList); - return resultList; - } - - @Override - public List getTestQuestionId(QuestionQueryDto queryDto) { - //校验题库版本是否一致 - checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - List resultList = new ArrayList<>(); - - //查询出题比例 - BaseQueryDto queryDto1 = new BaseQueryDto() - .setCarTypeId(queryDto.getCarTypeId()) - .setSubject(queryDto.getSubject()); - List tdCarChapters = carChapterService.queryCarChapter(queryDto1); - if (Objects.isNull(tdCarChapters)) { - log.info("carChapter is not exist"); - throw new BusinessException("获取信息异常"); - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //判断题 - if (Objects.nonNull(carChapterVo.getJudgeNum()) && carChapterVo.getJudgeNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_ONE) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getJudgeNum()); - resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); - } - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //单选 - if (Objects.nonNull(carChapterVo.getRadioNum()) && carChapterVo.getRadioNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_TWO) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getRadioNum()); - resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); - } - } - - for (CarChapterVo carChapterVo : tdCarChapters){ - //多选 - if (Objects.nonNull(carChapterVo.getMultipleChoiceNum()) && carChapterVo.getMultipleChoiceNum() > 0) { - queryDto.setType(Constants.QUESTION_TYPE_THREE) - .setChapter(carChapterVo.getChapterId()+"") - .setNum(carChapterVo.getMultipleChoiceNum()); - resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); - } - } - -// TdSysConfig tdSysConfig = configService.queryConfigByKey(Constants.TEST_QUESTION_TYPE_NUM, queryDto.getCarTypeId()); -// if (Objects.isNull(tdSysConfig)) { -// log.info("config is not exist"); -// throw new BusinessException("获取信息异常"); -// } -// -// List testQuestionTypeDtos = JSON.parseArray(tdSysConfig.getConfigJson(), TestQuestionTypeDto.class); -// Optional optional = testQuestionTypeDtos.stream().filter(s -> StrUtil.equals(s.getSubject(), queryDto.getSubject())).findFirst(); -// if (optional.isPresent()) { -// TestQuestionTypeDto testQuestionTypeDto = optional.get(); -// List chapterList = testQuestionTypeDto.getChapterList(); -// if (CollectionUtil.isEmpty(chapterList)){ -// return resultList; -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //判断题 -// if (Objects.nonNull(testOfChapter.getJudgeNum()) && testOfChapter.getJudgeNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_ONE) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getJudgeNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); -// } -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //单选 -// if (Objects.nonNull(testOfChapter.getRadioNum()) && testOfChapter.getRadioNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_TWO) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getRadioNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); -// } -// } -// for (TestQuestionTypeDto.TestOfChapter testOfChapter : chapterList) { -// //多选 -// if (Objects.nonNull(testOfChapter.getMultipleChoiceNum()) && testOfChapter.getMultipleChoiceNum() > 0) { -// queryDto.setType(Constants.QUESTION_TYPE_THREE) -// .setChapter(testOfChapter.getChapter()) -// .setNum(testOfChapter.getMultipleChoiceNum()); -// resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); -// } -// } -// } - return resultList; - } - - @Override - public List questionCategory(QuestionQueryDto queryDto) { - - List resultList = new ArrayList<>(); - //获取题目 - List tdQuestionVos = queryQuestionByIdList(queryDto); - if (CollectionUtil.isEmpty(tdQuestionVos)) { - return resultList; - } - - final Integer carTypeId = tdQuestionVos.get(0).getCarTypeId(); - final String subject = tdQuestionVos.get(0).getSubject(); - //获取分类 - List categoryList = new ArrayList<>(); - if (StrUtil.equals(Constants.SUBJECT_ONE,subject)){ - categoryList = configListService.querySysConfigList(Constants.QUESTION_CATEGORY_OF_SUBJECT_ONE, carTypeId); - } else if (StrUtil.equals(Constants.SUBJECT_FOUR,subject)){ - categoryList = configListService.querySysConfigList(Constants.QUESTION_CATEGORY_OF_SUBJECT_FOUR, carTypeId); - } - - Map categoryMap = categoryList.stream().collect(Collectors.toMap(TdSysConfigList::getConfigItemCode, TdSysConfigList::getConfigItemName, (v1, v2) -> v1)); - Map totalMap = new HashMap<>(); - Map> errorQuestionIdMap = new HashMap<>(); - - for (QuestionVo tdQuestionVo : tdQuestionVos) { - String category = tdQuestionVo.getCategory(); - if (StrUtil.isBlank(category)) { - continue; - } - String[] split = category.split(","); - for (String s : split) { //遍历字符串数组 - if (totalMap.containsKey(s)) { //判断Map集合中是否有该字符 - Integer value = totalMap.get(s); //通过key找出集合中的value - totalMap.put(s, value + 1); //将值的数据加1,然后添加到集合中去 - List errorQuestionIdList = errorQuestionIdMap.get(s); - errorQuestionIdList.add(tdQuestionVo.getQuestionId()); - } else { - totalMap.put(s, 1); //此时集合中没有该Key,所以将该字符作为键加入到集合中 - List errorQuestionIdList = new ArrayList<>(); - errorQuestionIdList.add(tdQuestionVo.getQuestionId()); - errorQuestionIdMap.put(s, errorQuestionIdList); - } - } - } - - for (String category : totalMap.keySet()) { - QusetionCategoryVo categoryVo = new QusetionCategoryVo() - .setCategory(category) - .setErrorQuestionIdList(errorQuestionIdMap.get(category)) - .setCategoryName(categoryMap.getOrDefault(category, "其他类型")) - .setNum(totalMap.get(category)); - resultList.add(categoryVo); - } - return resultList; - } - - @Override - public int updateQuestion(QuestionVo questionVo) { - return this.getBaseMapper().updateQuestion(questionVo); - } - - @Override - public Boolean insertQuestion(QuestionAddDto addDto) { - - TdQuestion question = new TdQuestion(); - BeanUtils.copyProperties(addDto,question); - //获取该车型最大的排序 - if (Objects.isNull(question.getShowOrder())){ - Integer sort = this.getBaseMapper().queryMaxSort(question.getCarTypeId()); - if (Objects.isNull(sort)){ - sort = 1; - }else { - sort = sort + 1; - } - question.setShowOrder(sort); - } - question.setIsActive(Constants.IS_ACTIVE_TRUE); - return this.save(question); - } - - @Override - public Map querySpecialNum(QuestionQueryDto queryDto) { - //校验题库版本是否一致 - checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - Map resultMap = redisCache.getCacheObject(Constants.SPECIAL_NUM_PREFIX + queryDto.getCarTypeId() + "_" + queryDto.getSubject()); - if (Objects.nonNull(resultMap)) { - return resultMap; - } - resultMap = this.getBaseMapper().querySpecialNum(queryDto); - - if (CollectionUtil.isEmpty(resultMap)) { - return resultMap; - } - - TdSysConfig tdSysConfig = configService.queryConfigByKey(Constants.REDIS_EXPIRE_TIME, Constants.DEFAULT_CARTYPE_ID); - if (Objects.isNull(tdSysConfig)) { - log.info("config is not exist"); - throw new BusinessException("系统异常"); - } - // 塞入redis中 - redisCache.setCacheObject(Constants.SPECIAL_NUM_PREFIX + queryDto.getCarTypeId() + "_" + queryDto.getSubject(), resultMap, Long.parseLong(tdSysConfig.getConfigValue())); - return resultMap; - } - - - - /** - * 问题选项规整 - */ - private void questionOptionHandler(List questionVos) { - if (CollectionUtil.isNotEmpty(questionVos)) { - for (QuestionVo questionVo : questionVos) { - //如果选项A没有值 则为判断题 - List optionList = new ArrayList<>(); - if (StrUtil.isBlank(questionVo.getChooseA()) || StrUtil.equals(questionVo.getType(), Constants.QUESTION_TYPE_ONE)) { - optionList.add(new QuestionVo.QuestionOption("A", "正确", "A")); - optionList.add(new QuestionVo.QuestionOption("B", "错误", "B")); - } else { - //起码ABCD都有 - optionList.add(new QuestionVo.QuestionOption("A", questionVo.getChooseA(), "A")); - optionList.add(new QuestionVo.QuestionOption("B", questionVo.getChooseB(), "B")); - optionList.add(new QuestionVo.QuestionOption("C", questionVo.getChooseC(), "C")); - optionList.add(new QuestionVo.QuestionOption("D", questionVo.getChooseD(), "D")); - - if (StrUtil.isNotBlank(questionVo.getChooseE())) { - optionList.add(new QuestionVo.QuestionOption("E", questionVo.getChooseE(), "E")); - } - if (StrUtil.isNotBlank(questionVo.getChooseF())) { - optionList.add(new QuestionVo.QuestionOption("F", questionVo.getChooseF(), "F")); - } - if (StrUtil.isNotBlank(questionVo.getChooseG())) { - optionList.add(new QuestionVo.QuestionOption("G", questionVo.getChooseG(), "G")); - } - } - questionVo.setOptionList(optionList); - } - } - } - - /** - * 校验题库是否一直 - * - * @param carTypeId - * @param version - */ - private void checkQuestionVersion(Integer carTypeId, Long version) { - if (Objects.isNull(carTypeId) || Objects.isNull(version)) { - return; - } - - Long versionId = versionService.currentVersion(carTypeId); - if (!Objects.equals(versionId, version)) { - throw new BusinessException(ErrorCode.VERSION_ERROR, "题库已更新"); - } - } - - public static void main(String[] args) { - List testQuestionTypeDtos = new ArrayList<>(); - String jsonString = JSONArray.toJSONString(testQuestionTypeDtos); - System.out.println(jsonString); - - List testQuestionTypeDtos1 = JSONArray.parseArray(jsonString, TestQuestionTypeDto.class); - System.out.println(testQuestionTypeDtos1); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionTestServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdQuestionTestServiceImpl.java index c9602cc..a9d9a1a 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionTestServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/TdQuestionTestServiceImpl.java @@ -10,15 +10,12 @@ import com.wrj.driver.server.service.*; import com.wrj.driver.server.vo.ExamParam; import com.wrj.driver.server.vo.TestScoreVO; import com.wrj.driver.server.dto.TestSubmitDto; -import com.wrj.driver.server.entity.*; import com.wrj.driver.server.enums.StatusEnum; import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.TdQuestionTestMapper; +import com.wrj.driver.server.mapper.WrjQuestionTestMapper; import com.wrj.driver.server.response.BaseResponse; -import com.wrj.driver.server.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wrj.driver.server.util.SecurityUtil; -import com.wrj.driver.server.vo.MemberVo; import com.wrj.driver.server.vo.TestTotalVo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.OptionalDouble; @@ -42,108 +38,37 @@ import java.util.stream.Collectors; * @since 2023-08-10 */ @Service -public class TdQuestionTestServiceImpl extends ServiceImpl implements ITdQuestionTestService { - - @Autowired - private ITdMemberDiscountService memberDiscountService; - - @Autowired - private ITdMemberService memberService; +public class TdQuestionTestServiceImpl extends ServiceImpl implements IWrjQuestionTestService { - @Autowired - private ITdSysUserMemberService userMemberService; @Autowired - private ITdSysUserDiscountService userDiscountService; - - @Autowired - private ITdSysConfigService configService; + private IWrjSysConfigService configService; @Override @Transactional(rollbackFor = Exception.class) public BaseResponse testSubmit(TestSubmitDto submitDto) { - TdQuestionTest questionTest = new TdQuestionTest(); + WrjQuestionTest questionTest = new WrjQuestionTest(); BeanUtils.copyProperties(submitDto, questionTest); questionTest.setUserId(SecurityUtil.getUserId()) + .setTypeId(submitDto.getDriverTypeId()) .setCreateTime(LocalDateTime.now()); boolean save = this.save(questionTest); if (!save){ throw new BusinessException("考试成绩提交失败"); } - List tip = new ArrayList<>(); - //如果考试合格, 赠送会员 - if (submitDto.getScore() >= 90){ - //判断是否首次上传 - - - List memberDiscounts = memberDiscountService.selectList("1", questionTest.getSubject()); - if (memberDiscounts != null){ - for (TdMemberDiscount memberDiscount : memberDiscounts){ - boolean flag = false; - - //查询是否已赠送过 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdSysUserDiscount::getDiscountId, memberDiscount.getId()) - .eq(TdSysUserDiscount::getUserId, questionTest.getUserId()); - List userDiscounts = userDiscountService.list(queryWrapper); - if (userDiscounts == null || userDiscounts.size() == 0){ - if (StringUtils.isEmpty(memberDiscount.getParam1())){ - flag = true; - } else { - //查询当前用户是由有参数1的会员,如果有则下发折扣 - List userMembers = userMemberService.list(new LambdaQueryWrapper() - .eq(TdSysUserMember::getMemberId, memberDiscount.getParam1()) - .eq(TdSysUserMember::getUserId, questionTest.getUserId())); - if(userMembers != null && userMembers.size() > 0){ - flag = true; - } - } - - if (flag){ - //目标折扣 -// TdMemberDiscount targetDisCOunt = memberDiscountService.selectOne("2", questionTest.getSubject()); - TdMember member = memberService.getById(Integer.valueOf(memberDiscount.getParam2())); - MemberVo model = new MemberVo(); - BeanUtils.copyProperties(member, model); - tip.add(model); - TdSysUserDiscount userDiscount = new TdSysUserDiscount() - .setDiscountId(memberDiscount.getId()) - .setUserId(questionTest.getUserId()) - .setDiscount(memberDiscount.getDiscount()) - .setDuration(memberDiscount.getDuration()) - .setUnit(memberDiscount.getUnit()) - .setOperUser("系统") - .setOperTime(LocalDateTime.now()) - .setIsInvalid(0); - if ("1".equals(memberDiscount.getUnit())){ - userDiscount.setEndTime(LocalDateTime.now().plusDays(memberDiscount.getDuration())); - } else if ("2".equals(memberDiscount.getUnit())){ - userDiscount.setEndTime(LocalDateTime.now().plusMonths(memberDiscount.getDuration())); - } else if ("3".equals(memberDiscount.getUnit())){ - userDiscount.setEndTime(LocalDateTime.now().plusYears(memberDiscount.getDuration())); - } - userDiscountService.save(userDiscount); - } - } - - } - } - } - - return new BaseResponse(StatusEnum.SUCCESS.getCode(), "", questionTest, tip); + return new BaseResponse(StatusEnum.SUCCESS.getCode(), "", questionTest); } @Override public TestTotalVo testTotal(TestQueryDto queryDto) { TestTotalVo testTotalVo = new TestTotalVo(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdQuestionTest::getCarTypeId, queryDto.getCarTypeId()) - .eq(TdQuestionTest::getSubject, queryDto.getSubject()) - .eq(TdQuestionTest::getUserId, SecurityUtil.getUserId()) - .orderByDesc(TdQuestionTest::getCreateTime); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(WrjQuestionTest::getTypeId, queryDto.getDriverTypeId()) + .eq(WrjQuestionTest::getUserId, SecurityUtil.getUserId()) + .orderByDesc(WrjQuestionTest::getCreateTime); - List list = this.list(queryWrapper); + List list = this.list(queryWrapper); Long passNum = list.stream().filter(s -> s.getScore() >= 90).count(); testTotalVo.setTestNum(list.size()) .setPassNum(passNum.intValue()); @@ -151,9 +76,9 @@ public class TdQuestionTestServiceImpl extends ServiceImpl 5) { list = list.subList(0, 5); } - List recentTestList = CollectionUtil.reverse(list); + List recentTestList = CollectionUtil.reverse(list); //最近五次的平均分 - OptionalDouble averaged = recentTestList.stream().mapToInt(TdQuestionTest::getScore).average(); + OptionalDouble averaged = recentTestList.stream().mapToInt(WrjQuestionTest::getScore).average(); Integer average = 0; if (averaged.isPresent()){ Double averageScore = averaged.getAsDouble(); @@ -171,16 +96,16 @@ public class TdQuestionTestServiceImpl extends ServiceImpl data = this.getBaseMapper().getTestScore(queryDto); //查询考试配置 - List configList = configService.queryConfigByKey("ExamParams"); - Map configMap = configList.stream().collect(Collectors.toMap(TdSysConfig::getCarTypeId, TdSysConfig::getConfigJson)); + List configList = configService.queryConfigByKey("ExamParams"); + Map configMap = configList.stream().collect(Collectors.toMap(WrjSysConfig::getDriverTypeId, WrjSysConfig::getConfigJson)); data.forEach(score -> { - String setting = configMap.get(score.getCarTypeId()); + String setting = configMap.get(score.getDriverTypeId()); score.setIsPass("不合格"); if (!StringUtils.isEmpty(setting)){ List examParams = JSONObject.parseArray(setting, ExamParam.class); if (examParams != null && !examParams.isEmpty()){ - ExamParam examParam = examParams.stream().filter(d -> d.getSubject().equals(score.getSubject())).findFirst().orElse(null); + ExamParam examParam = examParams.stream().filter(d -> d.getDriverTypeId().equals(score.getDriverTypeId())).findFirst().orElse(null); if (examParam != null && examParam.getOptions().getBaseScore()<= score.getScore()){ score.setIsPass("合格"); } diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionVersionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdQuestionVersionServiceImpl.java deleted file mode 100644 index 3216503..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdQuestionVersionServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.constant.ErrorCode; -import com.wrj.driver.server.entity.TdQuestionVersion; -import com.wrj.driver.server.entity.TdSysConfig; -import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.TdQuestionVersionMapper; -import com.wrj.driver.server.redis.RedisCache; -import com.wrj.driver.server.service.ITdQuestionVersionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.service.ITdSysConfigService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.Objects; - -/** - *

- * 题库版本表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-09-03 - */ -@Service -@Slf4j -public class TdQuestionVersionServiceImpl extends ServiceImpl implements ITdQuestionVersionService { - - @Autowired - private RedisCache redisCache; - - @Autowired - private ITdSysConfigService configService; - - @Override - public Long currentVersion(Integer carTypeId) { - - Integer value = redisCache.getCacheObject(Constants.QUESTION_VERSOPN_PREFIX + carTypeId); - - if (value !=null){ - return value.longValue(); - } - - LambdaQueryWrapper cond = new LambdaQueryWrapper() - .eq(TdQuestionVersion::getCarTypeId,carTypeId) - .eq(TdQuestionVersion::getIsActive,Constants.IS_ACTIVE_TRUE); - - TdQuestionVersion tdQuestionVersion = this.getBaseMapper().selectOne(cond); - if (Objects.isNull(tdQuestionVersion)){ - throw new BusinessException("题库版本异常"); - } - - TdSysConfig tdSysConfig = configService.queryConfigByKey(Constants.REDIS_EXPIRE_TIME, Constants.DEFAULT_CARTYPE_ID); - if (Objects.isNull(tdSysConfig)){ - log.info("config is not exist"); - throw new BusinessException("系统未知异常"); - } - // 塞入redis中 - redisCache.setCacheObject(Constants.QUESTION_VERSOPN_PREFIX + carTypeId,tdQuestionVersion.getVersionId(),Long.parseLong(tdSysConfig.getConfigValue())); - return tdQuestionVersion.getVersionId(); - } - - @Override - public Boolean addVersion(TdQuestionVersion versionDto) { - - LambdaQueryWrapper cond = new LambdaQueryWrapper() - .eq(TdQuestionVersion::getCarTypeId,versionDto.getCarTypeId()) - .eq(TdQuestionVersion::getIsActive,Constants.IS_ACTIVE_TRUE); - - TdQuestionVersion tdQuestionVersion = this.getBaseMapper().selectOne(cond); - - if (Objects.nonNull(tdQuestionVersion)){ - tdQuestionVersion.setIsActive(Constants.IS_ACTIVE_FALSE); - this.getBaseMapper().updateById(tdQuestionVersion); - } - TdQuestionVersion newVersion = new TdQuestionVersion(); - BeanUtils.copyProperties(versionDto,newVersion); - newVersion.setCreateTime(LocalDateTime.now()) - .setIsActive(Constants.IS_ACTIVE_TRUE); - this.baseMapper.insert(newVersion); - //删除原redis - redisCache.deleteObject(Constants.QUESTION_VERSOPN_PREFIX + versionDto.getCarTypeId()); - redisCache.deleteObjectLike(Constants.SPECIAL_NUM_PREFIX + versionDto.getCarTypeId() ); - return Boolean.TRUE; - } - - @Override - public void checkQuestionVersion(Integer carTypeId, Long version) { - if (Objects.isNull(carTypeId) || Objects.isNull(version)) { - return; - } - - Long versionId = currentVersion(carTypeId); - if (!Objects.equals(versionId, version)) { - throw new BusinessException(ErrorCode.VERSION_ERROR, "题库已更新"); - } - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSecretQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSecretQuestionServiceImpl.java deleted file mode 100644 index a2e497e..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSecretQuestionServiceImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.dto.SecretQueryDto; -import com.wrj.driver.server.entity.TdSecretQuestion; -import com.wrj.driver.server.mapper.TdSecretQuestionMapper; -import com.wrj.driver.server.service.ITdSecretQuestionService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class TdSecretQuestionServiceImpl extends ServiceImpl implements ITdSecretQuestionService { - @Override - public List querySecretQuestionIds(SecretQueryDto queryDto) { - return this.getBaseMapper().querySecretQuestionIds(queryDto); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSecretServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSecretServiceImpl.java deleted file mode 100644 index 760ee34..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSecretServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.dto.BaseQueryDto; -import com.wrj.driver.server.entity.TdSecret; -import com.wrj.driver.server.mapper.TdSecretMapper; -import com.wrj.driver.server.service.ITdQuestionVersionService; -import com.wrj.driver.server.service.ITdSecretService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -public class TdSecretServiceImpl extends ServiceImpl implements ITdSecretService { - - @Autowired - private ITdQuestionVersionService versionService; - - @Override - public List querySecretIds(BaseQueryDto queryDto) { - //校验题库版本是否一致 - versionService.checkQuestionVersion(queryDto.getCarTypeId(), queryDto.getVersionId()); - - return this.getBaseMapper().querySecretIds(queryDto); - } - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigListServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigListServiceImpl.java index 4f3c824..5f9a356 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigListServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigListServiceImpl.java @@ -4,14 +4,14 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.entity.TdSysConfig; -import com.wrj.driver.server.entity.TdSysConfigList; +import com.wrj.driver.server.entity.WrjSysConfig; +import com.wrj.driver.server.entity.WrjSysConfigList; import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.TdSysConfigListMapper; +import com.wrj.driver.server.mapper.WrjSysConfigListMapper; import com.wrj.driver.server.redis.RedisCache; -import com.wrj.driver.server.service.ITdSysConfigListService; +import com.wrj.driver.server.service.IWrjSysConfigListService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.service.ITdSysConfigService; +import com.wrj.driver.server.service.IWrjSysConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,27 +29,27 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class TdSysConfigListServiceImpl extends ServiceImpl implements ITdSysConfigListService { +public class TdSysConfigListServiceImpl extends ServiceImpl implements IWrjSysConfigListService { @Autowired private RedisCache redisCache; @Autowired - private ITdSysConfigService configService; + private IWrjSysConfigService configService; @Override - public List querySysConfigList(String configKey, Integer carTypeId) { + public List querySysConfigList(String configKey, Integer driverTypeId) { - List configLists = redisCache.getCacheObject(Constants.CONFIG_LIST_PREFIX + configKey + "_" + carTypeId); + List configLists = redisCache.getCacheObject(Constants.CONFIG_LIST_PREFIX + configKey + "_" + driverTypeId); if (CollectionUtil.isNotEmpty(configLists)) { return configLists; } //redis中没有则查询数据库 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdSysConfigList::getCarTypeId, carTypeId) - .eq(TdSysConfigList::getConfigKey, configKey) - .eq(TdSysConfigList::getIsActive, Constants.IS_ACTIVE_TRUE) - .orderByAsc(TdSysConfigList::getShowOrder); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(WrjSysConfigList::getDriverTypeId, driverTypeId) + .eq(WrjSysConfigList::getConfigKey, configKey) + .eq(WrjSysConfigList::getIsActive, Constants.IS_ACTIVE_TRUE) + .orderByAsc(WrjSysConfigList::getShowOrder); configLists = this.getBaseMapper().selectList(queryWrapper); if (CollectionUtil.isEmpty(configLists)) { @@ -57,39 +57,39 @@ public class TdSysConfigListServiceImpl extends ServiceImpl> querySysConfigMap(List configKeyList, Integer carTypeId) { + public Map> querySysConfigMap(List configKeyList, Integer driverTypeId) { Map> resultMap = new HashMap<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(TdSysConfigList::getCarTypeId, carTypeId) - .in(TdSysConfigList::getConfigKey, configKeyList) - .eq(TdSysConfigList::getIsActive, Constants.IS_ACTIVE_TRUE); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() + .eq(WrjSysConfigList::getDriverTypeId, driverTypeId) + .in(WrjSysConfigList::getConfigKey, configKeyList) + .eq(WrjSysConfigList::getIsActive, Constants.IS_ACTIVE_TRUE); - List configLists = this.getBaseMapper().selectList(queryWrapper); + List configLists = this.getBaseMapper().selectList(queryWrapper); for (String configKey : configKeyList) { Map collect = configLists.stream().filter(s -> StrUtil.equals(s.getConfigKey(), configKey)) - .sorted(Comparator.comparing(TdSysConfigList::getShowOrder)) - .collect(Collectors.toMap(TdSysConfigList::getConfigItemCode, TdSysConfigList::getConfigItemName)); + .sorted(Comparator.comparing(WrjSysConfigList::getShowOrder)) + .collect(Collectors.toMap(WrjSysConfigList::getConfigItemCode, WrjSysConfigList::getConfigItemName)); resultMap.put(configKey, collect); } return resultMap; } @Override - public Integer querySysConfigListNum(String configKey, Integer carTypeId) { - List configLists = querySysConfigList(configKey, carTypeId); + public Integer querySysConfigListNum(String configKey, Integer driverTypeId) { + List configLists = querySysConfigList(configKey, driverTypeId); return CollectionUtil.isEmpty(configLists) ? 0 : configLists.size(); } } diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserDiscountServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSysUserDiscountServiceImpl.java deleted file mode 100644 index b8bb59f..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserDiscountServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.TdSysUserDiscount; -import com.wrj.driver.server.mapper.TdSysUserDiscountMapper; -import com.wrj.driver.server.service.ITdSysUserDiscountService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class TdSysUserDiscountServiceImpl extends ServiceImpl implements ITdSysUserDiscountService { -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.java index d734762..e60ec94 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/TdSysUserLogServiceImpl.java @@ -1,19 +1,19 @@ package com.wrj.driver.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.TdSysUserLog; -import com.wrj.driver.server.mapper.TdSysUserLogMapper; -import com.wrj.driver.server.service.ITdSysUserLogService; +import com.wrj.driver.server.entity.SysUserLog; +import com.wrj.driver.server.mapper.SysUserLogMapper; +import com.wrj.driver.server.service.ISysUserLogService; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @Service -public class TdSysUserLogServiceImpl extends ServiceImpl implements ITdSysUserLogService { +public class TdSysUserLogServiceImpl extends ServiceImpl implements ISysUserLogService { @Override - public void saveLog(String title, int businessType, String device, int operType, Long userId, String param, String result, int status, LocalDateTime operTime, Long tenantId) { - TdSysUserLog model = new TdSysUserLog() + public void saveLog(String title, int businessType, String device, int operType, Long userId, String param, String result, int status, LocalDateTime operTime) { + SysUserLog model = new SysUserLog() .setUserId(userId) .setDevice(device) .setTitle(title) @@ -21,8 +21,7 @@ public class TdSysUserLogServiceImpl extends ServiceImpl - * 用户会员表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdSysUserMemberServiceImpl extends ServiceImpl implements ITdSysUserMemberService { - - @Autowired - private IOrderPayInfoService payInfoService; - - @Autowired - private ITdMemberService memberService; - - @Autowired - private ITdSysUserMemberService userMemberService; - - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean purchaseMember(OrderPayInfo payInfo) { - final LocalDateTime nowTime = LocalDateTime.now(); - - if (Objects.isNull(payInfo)){ - throw new BusinessException("订单信息不存在"); - } - final Long userId = payInfo.getUserId(); - final Integer memberId = Integer.parseInt(payInfo.getPurchaseProductId()); - // 查询会员 不管有效无效 - TdMember member = memberService.getById(memberId); - if (Objects.isNull(member)){ - throw new BusinessException("购买的会员不存在"); - } - //查看该用户是否存在有效会员 - LambdaQueryWrapper cond = new LambdaQueryWrapper() - .eq(TdSysUserMember::getUserId,userId) - .eq(TdSysUserMember::getMemberId,memberId) - .gt(TdSysUserMember::getEndDate, nowTime); - - TdSysUserMember userMember = this.getOne(cond); - //如果用户没购买该会员 或者该会员已过期就新建一个会员 - if (Objects.isNull(userMember)){ - userMember = new TdSysUserMember() - .setMemberId(memberId) - .setUserId(userId) - .setCreateTime(nowTime) - .setUpdateTime(nowTime) - .setStartDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN)) - .setEndDate(LocalDateTime.of(LocalDate.now(), LocalTime.MIN).plusDays(1).minusSeconds(1)) - .setOperUser("系统") - .setUseType(Constants.USER_BUY);//用户购买 - boolean save = this.save(userMember); - if (!save){ - throw new BusinessException("充值会员失败"); - } - } - LocalDateTime endTime = userMember.getEndDate(); - if (StrUtil.equals(member.getUnit(),"1")){ - endTime = endTime.plusDays(member.getDuration()); - }else if (StrUtil.equals(member.getUnit(),"2")){ - endTime = endTime.plusMonths(member.getDuration()); - } else if (StrUtil.equals(member.getUnit(),"3")) { - endTime = endTime.plusYears(member.getDuration()); - } - userMember.setEndDate(endTime.minusDays(1)); - boolean update = this.update(userMember, cond); - if (!update){ - throw new BusinessException("会员充值失败"); - } - return Boolean.TRUE; - } - - @Override - public List queryUserMemberList(UserMemberDto userMemberDto) { - return getBaseMapper().queryUserMemberList(userMemberDto); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdSysUserServiceImpl.java index cac6734..0de22a6 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSysUserServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/TdSysUserServiceImpl.java @@ -5,32 +5,23 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.wrj.driver.server.constant.Constants; -import com.wrj.driver.server.dto.DriverSchoolDto; import com.wrj.driver.server.dto.LoginUserDto; import com.wrj.driver.server.dto.SecurityUser; import com.wrj.driver.server.entity.*; -import com.wrj.driver.server.entity.*; import com.wrj.driver.server.exception.BusinessException; import com.wrj.driver.server.mapper.TdSysUserMapper; -import com.wrj.driver.server.mapper.TdTenantUserMapper; -import com.wrj.driver.server.mapper.TdUserDistributionMapper; import com.wrj.driver.server.redis.RedisCache; import com.wrj.driver.server.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wrj.driver.server.util.*; -import com.wrj.driver.server.service.*; import com.wrj.driver.server.vo.LoginUserVo; -import com.wrj.driver.server.vo.SchoolVO; -import com.wrj.driver.server.util.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.LocalTime; import java.util.List; import java.util.Objects; import java.util.UUID; @@ -45,7 +36,7 @@ import java.util.concurrent.TimeUnit; * @since 2023-08-10 */ @Service -public class TdSysUserServiceImpl extends ServiceImpl implements ITdSysUserService { +public class TdSysUserServiceImpl extends ServiceImpl implements ISysUserService { @Autowired private RedisCache redisCache; @@ -56,30 +47,6 @@ public class TdSysUserServiceImpl extends ServiceImpl() - .eq(TdSysUser::getPhone, loginUserDto.getPhone())); + SysUser tdSysUser = this.baseMapper.selectOne(new LambdaQueryWrapper() + .eq(SysUser::getPhone, loginUserDto.getPhone())); //如果需要验证,验证用户是否存在 if (loginUserDto.getIsCheck() != null && loginUserDto.getIsCheck()){ if (tdSysUser == null){ throw new BusinessException("您无权限登录!"); } - //查询租户下是否有当前用户 - TdTenantUser tdTenantUser = tdTenantUserMapper.selectOne(new LambdaQueryWrapper() - .eq(TdTenantUser::getUserId, tdSysUser.getUserId()) - .eq(TdTenantUser::getTenantId, loginUserDto.getTenantId()) - .eq(TdTenantUser::getIcActive, Constants.IS_ACTIVE_TRUE)); - if (tdTenantUser == null){ - throw new BusinessException("您无权限登录!"); - } } //校验验证码 如果是默认验证码则不需要校验 @@ -131,105 +90,19 @@ public class TdSysUserServiceImpl extends ServiceImpl cond = new LambdaQueryWrapper() -// .eq(TdSysUser::getPhone, loginUserDto.getPhone()); - //用户不存在则直接注册登陆 -// TdSysUser tdSysUser = this.baseMapper.selectOne(cond); + //todo 用户基础信息填写这里还要完善一下 if (tdSysUser == null) { - tdSysUser = new TdSysUser() - .setUserName("车友") + tdSysUser = new SysUser() + .setUserName("飞行操作员") .setAvatar("") .setPhone(loginUserDto.getPhone()) - .setCreateTime(LocalDateTime.now()) - .setDistributionId(loginUserDto.getDistributionId()) - .setBindTime(LocalDateTime.now()); - - //根据id查询驾校信息 - if(!StringUtil.isNullOrEmpty(loginUserDto.getId())){ - String result = HttpUtils.sendGet("https://xueche.ahduima.com/duima/applet/school/"+loginUserDto.getId()); - JSONObject jsonObject = JSONObject.parseObject(result); - if(jsonObject.get("data") != null){ - SchoolVO schoolVO = JSONObject.parseObject(JSONObject.toJSONString(jsonObject.get("data")), SchoolVO.class); - tdSysUser.setSchoolId(schoolVO.getSchoolId()) - .setSchoolName(schoolVO.getSchoolName()) - .setSchoolPhone(schoolVO.getPhone()); - } - } - - try { - int insert = this.getBaseMapper().insert(tdSysUser); - if (insert != 1) { - throw new BusinessException("用户注册异常"); - } - - //插入用户租户信息 - if (loginUserDto.getTenantId() != null){ - TdTenantUser tenantUser = new TdTenantUser() - .setTenantId(loginUserDto.getTenantId()) - .setUserId(tdSysUser.getUserId()); - tdTenantUserMapper.insert(tenantUser); - } - } catch (Exception e){ - - } - - - //插入分销人员绑定记录 - if(!StringUtil.isNullOrEmpty(loginUserDto.getDistributionId())){ - //查询分销信息 - SysDistribution sysDistribution = distributionService.selectById(loginUserDto.getDistributionId()); - if (loginUserDto.getTenantId() == null && sysDistribution != null){ - loginUserDto.setTenantId(sysDistribution.getTenantId()); - } - TdUserDistribution userDistribution = new TdUserDistribution() - .setDistributionId(loginUserDto.getDistributionId()) - .setUserId(tdSysUser.getUserId()) - .setBindTime(LocalDateTime.now()) - .setTenantId(loginUserDto.getTenantId()); - tdUserDistributionMapper.insert(userDistribution); - - //扫码首次登录送90天科一会员 - sendVipMemberAndDiscount(tdSysUser.getUserId(), loginUserDto.getDistributionId()); - - } - - } else { - - //查询是否有租户会员关系 - //查询租户下是否有当前用户 - TdTenantUser tdTenantUser = tdTenantUserMapper.selectOne(new LambdaQueryWrapper() - .eq(TdTenantUser::getUserId, tdSysUser.getUserId()) - .eq(TdTenantUser::getTenantId, loginUserDto.getTenantId()) - .eq(TdTenantUser::getIcActive, Constants.IS_ACTIVE_TRUE)); - if (tdTenantUser == null){ - tdTenantUser = new TdTenantUser() - .setTenantId(loginUserDto.getTenantId()) - .setUserId(tdSysUser.getUserId()); - tdTenantUserMapper.insert(tdTenantUser); - } - - if (!StringUtil.isNullOrEmpty(loginUserDto.getDistributionId())){ - //查询是否有分销信息 - List userDistributionList = userDistributionMapper.selectList(new LambdaQueryWrapper() - .eq(TdUserDistribution::getDistributionId, loginUserDto.getDistributionId()) - .eq(TdUserDistribution::getUserId, tdSysUser.getUserId())); - - //失效 -// tdSysUser.setDistributionId(loginUserDto.getDistributionId()); -// tdSysUser.setBindTime(LocalDateTime.now()); -// this.getBaseMapper().updateById(tdSysUser); + .setCreateTime(LocalDateTime.now()); - //如果不存在分销记录则插入分销绑定记录 - if (userDistributionList == null || userDistributionList.isEmpty()){ - TdUserDistribution userDistribution = new TdUserDistribution() - .setDistributionId(loginUserDto.getDistributionId()) - .setUserId(tdSysUser.getUserId()) - .setBindTime(LocalDateTime.now()) - .setTenantId(loginUserDto.getTenantId()); - tdUserDistributionMapper.insert(userDistribution); - } + int insert = this.getBaseMapper().insert(tdSysUser); + if (insert != 1) { + throw new BusinessException("用户注册异常"); } } //清除上一个人登陆的token信息 @@ -250,88 +123,11 @@ public class TdSysUserServiceImpl extends ServiceImpl cond = new LambdaQueryWrapper() - .eq(TdSysUser::getUserId, loginUser.getUserId()); + LambdaQueryWrapper cond = new LambdaQueryWrapper() + .eq(SysUser::getUserId, loginUser.getUserId()); - TdSysUser tdSysUser = this.baseMapper.selectOne(cond); + SysUser tdSysUser = this.baseMapper.selectOne(cond); if (Objects.isNull(tdSysUser)){ throw new BusinessException("用户不存在或者已被删除"); } @@ -361,26 +157,4 @@ public class TdSysUserServiceImpl extends ServiceImpl cond = new LambdaQueryWrapper() - .eq(TdSysUser::getUserId, loginUser.getUserId()); - - TdSysUser tdSysUser = this.baseMapper.selectOne(cond); - if (Objects.isNull(tdSysUser)){ - throw new BusinessException("用户不存在或者已被删除"); - } - tdSysUser.setSchoolId(schoolDto.getSchoolId()) - .setSchoolName(schoolDto.getSchoolName()) - .setSchoolPhone(schoolDto.getSchoolPhone()); - - boolean result = this.updateById(tdSysUser); - if (!result){ - throw new BusinessException("绑定驾校失败"); - } - return Boolean.TRUE; - } - } diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdTenantAppletServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdTenantAppletServiceImpl.java deleted file mode 100644 index e96088c..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdTenantAppletServiceImpl.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.TdTenantApplet; -import com.wrj.driver.server.mapper.TdTenantAppletMapper; -import com.wrj.driver.server.service.ITdTenantAppletService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Service -@Slf4j -public class TdTenantAppletServiceImpl extends ServiceImpl implements ITdTenantAppletService { -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdTenantCarServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdTenantCarServiceImpl.java deleted file mode 100644 index 5df422c..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdTenantCarServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.wrj.driver.server.entity.TdTenantCar; -import com.wrj.driver.server.mapper.TdTenantCarMapper; -import com.wrj.driver.server.service.ITdTenantCarService; -import com.wrj.driver.server.vo.CarVo; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -public class TdTenantCarServiceImpl extends ServiceImpl implements ITdTenantCarService { - @Override - public List queryList(Long tenantId) { - return this.baseMapper.selectListByTenantId(tenantId); - } -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignCategoryServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignCategoryServiceImpl.java deleted file mode 100644 index 793eca4..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignCategoryServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdTrafficSignCategory; -import com.wrj.driver.server.mapper.TdTrafficSignCategoryMapper; -import com.wrj.driver.server.service.ITdTrafficSignCategoryService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 图标分类表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdTrafficSignCategoryServiceImpl extends ServiceImpl implements ITdTrafficSignCategoryService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignQuestionServiceImpl.java deleted file mode 100644 index 72c7be0..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdTrafficSignQuestionServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdTrafficSignQuestion; -import com.wrj.driver.server.mapper.TdTrafficSignQuestionMapper; -import com.wrj.driver.server.service.ITdTrafficSignQuestionService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 图标分类相关题目表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Service -public class TdTrafficSignQuestionServiceImpl extends ServiceImpl implements ITdTrafficSignQuestionService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdVideosServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/TdVideosServiceImpl.java deleted file mode 100644 index ce67777..0000000 --- a/src/main/java/com/wrj/driver/server/service/impl/TdVideosServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.service.impl; - -import com.wrj.driver.server.entity.TdVideos; -import com.wrj.driver.server.mapper.TdVideosMapper; -import com.wrj.driver.server.service.ITdVideosService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 视频标识表; 服务实现类 - *

- * - * @author Automated procedures - * @since 2023-08-20 - */ -@Service -public class TdVideosServiceImpl extends ServiceImpl implements ITdVideosService { - -} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdChapterServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/WrjChapterServiceImpl.java similarity index 63% rename from src/main/java/com/wrj/driver/server/service/impl/TdChapterServiceImpl.java rename to src/main/java/com/wrj/driver/server/service/impl/WrjChapterServiceImpl.java index ca94c52..fe23a9b 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdChapterServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/WrjChapterServiceImpl.java @@ -3,9 +3,9 @@ package com.wrj.driver.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.wrj.driver.server.dto.ChapterDto; import com.wrj.driver.server.dto.ChapterQueryDto; -import com.wrj.driver.server.entity.TdChapter; -import com.wrj.driver.server.mapper.TdChapterMapper; -import com.wrj.driver.server.service.ITdChapterService; +import com.wrj.driver.server.entity.WrjChapter; +import com.wrj.driver.server.mapper.WrjChapterMapper; +import com.wrj.driver.server.service.IWrjChapterService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,10 +14,10 @@ import java.util.List; @Service @Slf4j -public class TdChapterServiceImpl extends ServiceImpl implements ITdChapterService { +public class WrjChapterServiceImpl extends ServiceImpl implements IWrjChapterService { @Autowired - private TdChapterMapper chapterMapper; + private WrjChapterMapper chapterMapper; @Override public List queryChapter(ChapterQueryDto queryDto) { diff --git a/src/main/java/com/wrj/driver/server/service/impl/WrjDriverTypeServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/WrjDriverTypeServiceImpl.java new file mode 100644 index 0000000..714e539 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/service/impl/WrjDriverTypeServiceImpl.java @@ -0,0 +1,20 @@ +package com.wrj.driver.server.service.impl; + +import com.wrj.driver.server.entity.WrjDriverType; +import com.wrj.driver.server.mapper.WrjDriverTypeMapper; +import com.wrj.driver.server.service.IWrjDriverTypeService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 车型分类; 服务实现类 + *

+ * + * @author Automated procedures + * @since 2023-08-10 + */ +@Service +public class WrjDriverTypeServiceImpl extends ServiceImpl implements IWrjDriverTypeService { + +} diff --git a/src/main/java/com/wrj/driver/server/service/impl/WrjQuestionServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/WrjQuestionServiceImpl.java new file mode 100644 index 0000000..63207e2 --- /dev/null +++ b/src/main/java/com/wrj/driver/server/service/impl/WrjQuestionServiceImpl.java @@ -0,0 +1,266 @@ +package com.wrj.driver.server.service.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.wrj.driver.server.constant.Constants; +import com.wrj.driver.server.dto.BaseQueryDto; +import com.wrj.driver.server.dto.QuestionAddDto; +import com.wrj.driver.server.dto.QuestionQueryDto; +import com.wrj.driver.server.dto.TestQuestionTypeDto; +import com.wrj.driver.server.entity.WrjQuestion; +import com.wrj.driver.server.entity.WrjSysConfig; +import com.wrj.driver.server.exception.BusinessException; +import com.wrj.driver.server.mapper.WrjQuestionMapper; +import com.wrj.driver.server.redis.RedisCache; +import com.wrj.driver.server.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.wrj.driver.server.vo.WrjTypeChapterVo; +import com.wrj.driver.server.vo.QuestionVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.*; + +/** + *

+ * 题库; 服务实现类 + *

+ * + * @author Automated procedures + * @since 2023-08-10 + */ +@Service +@Slf4j +public class WrjQuestionServiceImpl extends ServiceImpl implements IWrjQuestionService { + + @Autowired + private IWrjSysConfigService configService; + + @Autowired + private IWrjSysConfigListService configListService; + + @Autowired + private RedisCache redisCache; + + @Autowired + private IWrjTypeChapterService wrjTypeChapterService; + + @Override + public QuestionVo queryQuestionById(QuestionQueryDto queryDto) { + QuestionQueryDto newDto = new QuestionQueryDto() + .setQuestionId(queryDto.getQuestionId()); + List questionVos = queryQuestion(newDto); + return CollectionUtil.isEmpty(questionVos) ? null : questionVos.get(0); + } + + @Override + public List queryQuestionByIdList(QuestionQueryDto queryDto) { + + QuestionQueryDto newDto = new QuestionQueryDto() + .setQuestionIdList(queryDto.getQuestionIdList()); + return queryQuestion(newDto); + } + + @Override + public List queryQuestion(QuestionQueryDto queryDto) { + + List questionVos = this.getBaseMapper().queryQuestion(queryDto); + questionOptionHandler(questionVos); + return questionVos; + } + + @Override + public List queryQuestionId(QuestionQueryDto queryDto) { + + List questionIds = this.getBaseMapper().queryQuestionId(queryDto); + return questionIds; + } + + @Override + public List getTestQuestion(QuestionQueryDto queryDto) { + + List resultList = new ArrayList<>(); + + //查询出题比例 + BaseQueryDto queryDto1 = new BaseQueryDto() + .setDriverTypeId(queryDto.getDriverTypeId()); + List wrjTypeChapters = wrjTypeChapterService.queryWrjTypeChapter(queryDto1); + if (Objects.isNull(wrjTypeChapters)) { + log.info("carChapter is not exist"); + throw new BusinessException("获取信息异常"); + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //判断题 + if (Objects.nonNull(wrjTypeChapterVo.getJudgeNum()) && wrjTypeChapterVo.getJudgeNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_ONE) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getJudgeNum()); + resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); + } + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //单选 + if (Objects.nonNull(wrjTypeChapterVo.getRadioNum()) && wrjTypeChapterVo.getRadioNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_TWO) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getRadioNum()); + resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); + } + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //多选 + if (Objects.nonNull(wrjTypeChapterVo.getMultipleChoiceNum()) && wrjTypeChapterVo.getMultipleChoiceNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_THREE) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getMultipleChoiceNum()); + resultList.addAll(this.getBaseMapper().queryQuestionByRandom(queryDto)); + } + } + questionOptionHandler(resultList); + return resultList; + } + + @Override + public List getTestQuestionId(QuestionQueryDto queryDto) { + + List resultList = new ArrayList<>(); + + //查询出题比例 + BaseQueryDto queryDto1 = new BaseQueryDto() + .setDriverTypeId(queryDto.getDriverTypeId()); + List wrjTypeChapters = wrjTypeChapterService.queryWrjTypeChapter(queryDto1); + if (Objects.isNull(wrjTypeChapters)) { + log.info("carChapter is not exist"); + throw new BusinessException("获取信息异常"); + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //判断题 + if (Objects.nonNull(wrjTypeChapterVo.getJudgeNum()) && wrjTypeChapterVo.getJudgeNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_ONE) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getJudgeNum()); + resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); + } + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //单选 + if (Objects.nonNull(wrjTypeChapterVo.getRadioNum()) && wrjTypeChapterVo.getRadioNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_TWO) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getRadioNum()); + resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); + } + } + + for (WrjTypeChapterVo wrjTypeChapterVo : wrjTypeChapters){ + //多选 + if (Objects.nonNull(wrjTypeChapterVo.getMultipleChoiceNum()) && wrjTypeChapterVo.getMultipleChoiceNum() > 0) { + queryDto.setType(Constants.QUESTION_TYPE_THREE) + .setChapter(wrjTypeChapterVo.getChapterId()) + .setNum(wrjTypeChapterVo.getMultipleChoiceNum()); + resultList.addAll(this.getBaseMapper().queryQuestionIdByRandom(queryDto)); + } + } + return resultList; + } + + + @Override + public int updateQuestion(QuestionVo questionVo) { + return this.getBaseMapper().updateQuestion(questionVo); + } + + @Override + public Boolean insertQuestion(QuestionAddDto addDto) { + + WrjQuestion question = new WrjQuestion(); + BeanUtils.copyProperties(addDto,question); + //获取该车型最大的排序 + if (Objects.isNull(question.getShowOrder())){ + Integer sort = this.getBaseMapper().queryMaxSort(); + if (Objects.isNull(sort)){ + sort = 1; + }else { + sort = sort + 1; + } + question.setShowOrder(sort); + } + question.setIsActive(Constants.IS_ACTIVE_TRUE); + return this.save(question); + } + + @Override + public Map querySpecialNum(QuestionQueryDto queryDto) { + + Map resultMap = redisCache.getCacheObject(Constants.SPECIAL_NUM_PREFIX); + if (Objects.nonNull(resultMap)) { + return resultMap; + } + resultMap = this.getBaseMapper().querySpecialNum(queryDto); + + if (CollectionUtil.isEmpty(resultMap)) { + return resultMap; + } + + WrjSysConfig tdSysConfig = configService.queryConfigByKey(Constants.REDIS_EXPIRE_TIME, Constants.DEFAULT_TYPE_ID); + if (Objects.isNull(tdSysConfig)) { + log.info("config is not exist"); + throw new BusinessException("系统异常"); + } + // 塞入redis中 + redisCache.setCacheObject(Constants.SPECIAL_NUM_PREFIX, resultMap, Long.parseLong(tdSysConfig.getConfigValue())); + return resultMap; + } + + + + /** + * 问题选项规整 + */ + private void questionOptionHandler(List questionVos) { + if (CollectionUtil.isNotEmpty(questionVos)) { + for (QuestionVo questionVo : questionVos) { + //如果选项A没有值 则为判断题 + List optionList = new ArrayList<>(); + if (StrUtil.isBlank(questionVo.getChooseA()) || StrUtil.equals(questionVo.getType(), Constants.QUESTION_TYPE_ONE)) { + optionList.add(new QuestionVo.QuestionOption("A", "正确", "A")); + optionList.add(new QuestionVo.QuestionOption("B", "错误", "B")); + } else { + //起码ABCD都有 + optionList.add(new QuestionVo.QuestionOption("A", questionVo.getChooseA(), "A")); + optionList.add(new QuestionVo.QuestionOption("B", questionVo.getChooseB(), "B")); + optionList.add(new QuestionVo.QuestionOption("C", questionVo.getChooseC(), "C")); + optionList.add(new QuestionVo.QuestionOption("D", questionVo.getChooseD(), "D")); + + if (StrUtil.isNotBlank(questionVo.getChooseE())) { + optionList.add(new QuestionVo.QuestionOption("E", questionVo.getChooseE(), "E")); + } + if (StrUtil.isNotBlank(questionVo.getChooseF())) { + optionList.add(new QuestionVo.QuestionOption("F", questionVo.getChooseF(), "F")); + } + if (StrUtil.isNotBlank(questionVo.getChooseG())) { + optionList.add(new QuestionVo.QuestionOption("G", questionVo.getChooseG(), "G")); + } + } + questionVo.setOptionList(optionList); + } + } + } + + public static void main(String[] args) { + List testQuestionTypeDtos = new ArrayList<>(); + String jsonString = JSONArray.toJSONString(testQuestionTypeDtos); + System.out.println(jsonString); + + List testQuestionTypeDtos1 = JSONArray.parseArray(jsonString, TestQuestionTypeDto.class); + System.out.println(testQuestionTypeDtos1); + } +} diff --git a/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigServiceImpl.java b/src/main/java/com/wrj/driver/server/service/impl/WrjSysConfigServiceImpl.java similarity index 56% rename from src/main/java/com/wrj/driver/server/service/impl/TdSysConfigServiceImpl.java rename to src/main/java/com/wrj/driver/server/service/impl/WrjSysConfigServiceImpl.java index ed1ad5d..4ccaf2f 100644 --- a/src/main/java/com/wrj/driver/server/service/impl/TdSysConfigServiceImpl.java +++ b/src/main/java/com/wrj/driver/server/service/impl/WrjSysConfigServiceImpl.java @@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.wrj.driver.server.constant.Constants; import com.wrj.driver.server.dto.SysConfigDto; -import com.wrj.driver.server.entity.TdSysConfig; +import com.wrj.driver.server.entity.WrjSysConfig; import com.wrj.driver.server.exception.BusinessException; -import com.wrj.driver.server.mapper.TdSysConfigMapper; +import com.wrj.driver.server.mapper.WrjSysConfigMapper; import com.wrj.driver.server.redis.RedisCache; -import com.wrj.driver.server.service.ITdSysConfigService; +import com.wrj.driver.server.service.IWrjSysConfigService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -31,24 +31,24 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class TdSysConfigServiceImpl extends ServiceImpl implements ITdSysConfigService { +public class WrjSysConfigServiceImpl extends ServiceImpl implements IWrjSysConfigService { @Autowired private RedisCache redisCache; @Override - public TdSysConfig queryConfigByKey(String configKey, Integer carTypeId) { + public WrjSysConfig queryConfigByKey(String configKey, Integer driverTypeId) { log.info("获取系统配置参数,configKey:{}", configKey); - TdSysConfig config = redisCache.getCacheObject(Constants.CONFIG_PREFIX + configKey + "_" + carTypeId); + WrjSysConfig config = redisCache.getCacheObject(Constants.CONFIG_PREFIX + configKey + "_" + driverTypeId); if (Objects.nonNull(config)){ return config; } - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .eq(TdSysConfig::getCarTypeId,carTypeId) - .eq(TdSysConfig::getConfigKey, configKey) - .eq(TdSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .eq(WrjSysConfig::getDriverTypeId,driverTypeId) + .eq(WrjSysConfig::getConfigKey, configKey) + .eq(WrjSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); config = getOne(queryWrapper); if (Objects.isNull(config)){ @@ -56,11 +56,11 @@ public class TdSysConfigServiceImpl extends ServiceImpl queryConfigByKey(String configKey) { + public List queryConfigByKey(String configKey) { log.info("获取系统配置参数,configKey:{}", configKey); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .eq(TdSysConfig::getConfigKey, configKey) - .eq(TdSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .eq(WrjSysConfig::getConfigKey, configKey) + .eq(WrjSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); return list(queryWrapper); } @Override - public String queryConfigValueByKey(String configKey, Integer carTypeId) { + public String queryConfigValueByKey(String configKey, Integer driverTypeId) { log.info("获取系统配置参数,configKey:{}", configKey); - TdSysConfig config = queryConfigByKey(configKey,carTypeId); + WrjSysConfig config = queryConfigByKey(configKey,driverTypeId); if(null == config) { return null; } @@ -94,31 +94,31 @@ public class TdSysConfigServiceImpl extends ServiceImpl queryConfigByKeys(List configKeyList,Integer carTypeId) { + public Map queryConfigByKeys(List configKeyList, Integer driverTypeId) { log.info("获取系统配置参数,configKeyList:{}", configKeyList); - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .eq(TdSysConfig::getCarTypeId,carTypeId) - .in(TdSysConfig::getConfigKey, configKeyList) - .eq(TdSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); - List configList = list(queryWrapper); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .eq(WrjSysConfig::getDriverTypeId,driverTypeId) + .in(WrjSysConfig::getConfigKey, configKeyList) + .eq(WrjSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); + List configList = list(queryWrapper); if(CollectionUtil.isEmpty(configList)) { return Collections.EMPTY_MAP; } - return configList.stream().collect(Collectors.toMap(TdSysConfig::getConfigKey, sysConfig -> sysConfig)); + return configList.stream().collect(Collectors.toMap(WrjSysConfig::getConfigKey, sysConfig -> sysConfig)); } @Override public Boolean saveConfig(SysConfigDto configDto) { - LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() - .eq(TdSysConfig::getCarTypeId,configDto.getCarTypeId()) - .eq(TdSysConfig::getConfigKey, configDto.getConfigKey()) - .eq(TdSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); - TdSysConfig config = getOne(queryWrapper); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda() + .eq(WrjSysConfig::getDriverTypeId,configDto.getDriverTypeId()) + .eq(WrjSysConfig::getConfigKey, configDto.getConfigKey()) + .eq(WrjSysConfig::getIsActive, Constants.IS_ACTIVE_TRUE); + WrjSysConfig config = getOne(queryWrapper); if (Objects.isNull(config)){ - config = new TdSysConfig(); + config = new WrjSysConfig(); BeanUtils.copyProperties(configDto, config); config.setCreateTime(LocalDateTime.now()); config.setIsActive(Constants.IS_ACTIVE_TRUE); @@ -135,7 +135,7 @@ public class TdSysConfigServiceImpl extends ServiceImpl implements IWrjTypeChapterService { + @Override + public List queryWrjTypeChapter(BaseQueryDto queryDto1) { + return this.getBaseMapper().queryWrjTypeChapter(queryDto1); + } +} diff --git a/src/main/java/com/wrj/driver/server/util/SecurityUtil.java b/src/main/java/com/wrj/driver/server/util/SecurityUtil.java index c90d91c..eaeb4ee 100644 --- a/src/main/java/com/wrj/driver/server/util/SecurityUtil.java +++ b/src/main/java/com/wrj/driver/server/util/SecurityUtil.java @@ -3,7 +3,7 @@ package com.wrj.driver.server.util; import cn.hutool.core.util.StrUtil; import com.wrj.driver.server.constant.ErrorCode; import com.wrj.driver.server.dto.SecurityUser; -import com.wrj.driver.server.entity.TdSysUser; +import com.wrj.driver.server.entity.SysUser; import com.wrj.driver.server.exception.BusinessException; import com.wrj.driver.server.redis.RedisCache; import org.slf4j.Logger; @@ -30,7 +30,7 @@ public class SecurityUtil { if (StrUtil.isBlank(token)) throw new BusinessException(ErrorCode.AUTH_ERROR, "尚未登录"); SecurityUser securityUser = new SecurityUser(); - TdSysUser tdSysUser = redisCache.getCacheObject(token); + SysUser tdSysUser = redisCache.getCacheObject(token); if (Objects.isNull(tdSysUser)){ throw new BusinessException(ErrorCode.AUTH_ERROR, "登录信息已失效"); diff --git a/src/main/java/com/wrj/driver/server/vo/AppletPayVo.java b/src/main/java/com/wrj/driver/server/vo/AppletPayVo.java deleted file mode 100644 index 2f86970..0000000 --- a/src/main/java/com/wrj/driver/server/vo/AppletPayVo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.wrj.driver.server.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -@ApiModel("微信支付") -public class AppletPayVo { - - @ApiModelProperty("支付金额") - private BigDecimal money;//金额 - - @ApiModelProperty("小程序端 获取的code") - private String code;//小程序端 获取的code - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("支付描述") - private String description; - - @ApiModelProperty("商户系统的订单类型") - private String tradeType; - - @ApiModelProperty("商户系统的订单号") - private String outTradeNo; - - @ApiModelProperty("分销配置id") - private Long detailId; - -// @ApiModelProperty("原价") -// private BigDecimal originalPrice; -// -// @ApiModelProperty("提成") -// private BigDecimal commission; - - @ApiModelProperty("租户id") - private Long tenantId; - -} diff --git a/src/main/java/com/wrj/driver/server/vo/CarVo.java b/src/main/java/com/wrj/driver/server/vo/CarVo.java deleted file mode 100644 index 89cc995..0000000 --- a/src/main/java/com/wrj/driver/server/vo/CarVo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.wrj.driver.server.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 车型分类; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class CarVo { - - - /** - * 车型标识 - */ - private Integer carTypeId; - - /** - * 车型名称 - */ - private String carName; - - - -} diff --git a/src/main/java/com/wrj/driver/server/vo/CarouselImageVo.java b/src/main/java/com/wrj/driver/server/vo/CarouselImageVo.java deleted file mode 100644 index 91203b6..0000000 --- a/src/main/java/com/wrj/driver/server/vo/CarouselImageVo.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wrj.driver.server.vo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class CarouselImageVo { - private Integer id; - - private Long tenantId; - - private String imageName; - - private String imageUrl; -} diff --git a/src/main/java/com/wrj/driver/server/vo/ChapterVo.java b/src/main/java/com/wrj/driver/server/vo/ChapterVo.java index 8d27612..b5d249b 100644 --- a/src/main/java/com/wrj/driver/server/vo/ChapterVo.java +++ b/src/main/java/com/wrj/driver/server/vo/ChapterVo.java @@ -20,15 +20,15 @@ public class ChapterVo { private String chapterName; /** - * 题目数 + * 排序 */ - @ApiModelProperty("题目数") - private Integer count; + @ApiModelProperty("排序") + private Integer sort; /** - * 科目 + * summary */ - @ApiModelProperty("科目") - private Integer subject; + @ApiModelProperty("summary") + private String summary; } diff --git a/src/main/java/com/wrj/driver/server/vo/ExamParam.java b/src/main/java/com/wrj/driver/server/vo/ExamParam.java index 3331c4a..86d4d87 100644 --- a/src/main/java/com/wrj/driver/server/vo/ExamParam.java +++ b/src/main/java/com/wrj/driver/server/vo/ExamParam.java @@ -6,6 +6,6 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) public class ExamParam { -private String subject; +private Integer driverTypeId; private ExamParamOption options; } diff --git a/src/main/java/com/wrj/driver/server/vo/H5PayVo.java b/src/main/java/com/wrj/driver/server/vo/H5PayVo.java deleted file mode 100644 index cda71e3..0000000 --- a/src/main/java/com/wrj/driver/server/vo/H5PayVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.wrj.driver.server.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.math.BigDecimal; - -@ApiModel("H5支付") -@Data -public class H5PayVo { - @ApiModelProperty("支付金额") - private BigDecimal money;//金额 - - @ApiModelProperty("用户id") - private String userId; - - @ApiModelProperty("支付描述") - private String description; - - @ApiModelProperty("商户系统的订单类型") - private String tradeType; - - @ApiModelProperty("商户系统的订单号") - private String outTradeNo; - - @ApiModelProperty("用户的客户端IP") - private String clientIp; - - @ApiModelProperty("分销配置id") - private Long detailId; - - @ApiModelProperty("原价") - private BigDecimal originalPrice; - - @ApiModelProperty("提成") - private BigDecimal commission; - - private Long tenantId; -} diff --git a/src/main/java/com/wrj/driver/server/vo/LoginUserVo.java b/src/main/java/com/wrj/driver/server/vo/LoginUserVo.java index 27eba2f..ffec8f6 100644 --- a/src/main/java/com/wrj/driver/server/vo/LoginUserVo.java +++ b/src/main/java/com/wrj/driver/server/vo/LoginUserVo.java @@ -47,25 +47,6 @@ public class LoginUserVo { @ApiModelProperty("头像") private String avatar; - /** - * 驾校标识 - */ - @ApiModelProperty("驾校标识") - private Long schoolId; - - - /** - * 驾校名称 - */ - @ApiModelProperty("驾校名称") - private String schoolName; - - /** - * 驾校电话 - */ - @ApiModelProperty("驾校电话") - private String schoolPhone; - /** * 驾校名称 */ @@ -79,9 +60,9 @@ public class LoginUserVo { private LocalDateTime createTime; /** - * 学车天数 + * 学习天数 */ - @ApiModelProperty("学车天数") + @ApiModelProperty("学习天数") private Long days; diff --git a/src/main/java/com/wrj/driver/server/vo/MemberVo.java b/src/main/java/com/wrj/driver/server/vo/MemberVo.java deleted file mode 100644 index 09b6da2..0000000 --- a/src/main/java/com/wrj/driver/server/vo/MemberVo.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.wrj.driver.server.vo; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * @author 曹林 - * @description 会员列表出参 - * @create 2023/8/13 17:13 - */ -@Data -@Accessors(chain = true) -@ApiModel("会员列表出参") -public class MemberVo { - - private static final long serialVersionUID = 1L; - - /** - * 用户标识 - */ - @ApiModelProperty("用户标识") - private Long userId; - - /** - * 会员结束时间 - */ - @ApiModelProperty("会员结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime endDate; - - /** - * 会员标识 - */ - @ApiModelProperty("会员标识") - private Integer memberId; - - /** - * 会员名称 - */ - @ApiModelProperty("会员名称") - private String memberName; - - /** - * 车型标识 - */ - @ApiModelProperty("车型标识") - private Integer carTypeId; - - /** - * 科目 - */ - @ApiModelProperty("科目") - private String subjects; - - /** - * 会员价格,单位元 - */ - @ApiModelProperty("会员价格,单位元") - private BigDecimal price; - - /** - * 会员折扣,单位元 - */ - @ApiModelProperty("会员折扣,单位元") - private BigDecimal discount; - - - @ApiModelProperty("会员折扣价") - private BigDecimal actualPrice; - - @ApiModelProperty("会员折扣结束时间") - private String actualEndTime; - - /** - * 会员时间 - */ - @ApiModelProperty("会员时间") - private Integer duration; - - /** - * 时长单位,1:天,2:月 3:年 - */ - @ApiModelProperty("时长单位,1:天,2:月 3:年") - private String unit; - - /** - * 会员描述 - */ - @ApiModelProperty("会员描述") - private String description; - - /** - * 是否生效 - */ - @ApiModelProperty("是否生效") - private String isActive; - - @ApiModelProperty("分销配置id") - private Long detailId; - - @ApiModelProperty("提成") - private BigDecimal commission; - -} diff --git a/src/main/java/com/wrj/driver/server/vo/ProjectVo.java b/src/main/java/com/wrj/driver/server/vo/ProjectVo.java deleted file mode 100644 index 2f3bb5e..0000000 --- a/src/main/java/com/wrj/driver/server/vo/ProjectVo.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.wrj.driver.server.vo; - - -import com.wrj.driver.server.entity.TdVideos; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; -import java.util.List; - -/** - *

- * 考试项目表; - *

- * - * @author Automated procedures - * @since 2023-08-10 - */ -@Data -@Accessors(chain = true) -@ApiModel("考试项目出参") -public class ProjectVo implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 考试项目 - */ - @ApiModelProperty("考试项目") - private Integer projectId; - - /** - * 类型 - */ - @ApiModelProperty("类型") - private String type; - - /** - * 所属科目 - */ - @ApiModelProperty("所属科目") - private String subject; - - /** - * 车型标识 - */ - @ApiModelProperty("车型标识") - private Integer carTypeId; - - /** - * 驾驶类型,手动挡,自动挡,A2:B2等(在字典表里配置) - */ - @ApiModelProperty("驾驶类型") - private String driveType; - - /** - * 描述 - */ - @ApiModelProperty("描述") - private String description; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private LocalDateTime createTime; - - /** - * 是否生效 - */ - @ApiModelProperty("是否生效") - private String isActive; - - /** - * 显示序号 - */ - @ApiModelProperty("显示序号") - private Integer showOrder; - - /** - * 图片url - */ - @ApiModelProperty("图片url") - private String imageUrl; - - @ApiModelProperty("视频列表") - private List videoList; -} diff --git a/src/main/java/com/wrj/driver/server/vo/QuestionJxVo.java b/src/main/java/com/wrj/driver/server/vo/QuestionJxVo.java deleted file mode 100644 index 6f5e4a2..0000000 --- a/src/main/java/com/wrj/driver/server/vo/QuestionJxVo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.wrj.driver.server.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 精选题 - */ -@Data -@Accessors(chain = true) -public class QuestionJxVo { - @ApiModelProperty("") - private Integer id; - - @ApiModelProperty("") - private String categoryTitle; - - @ApiModelProperty("") - private String categoryId; - - @ApiModelProperty("题目id") - private Long questionId; - - @ApiModelProperty("z章节id") - private Integer chapterId; - - @ApiModelProperty("车型id") - private Integer carTypeId; - - @ApiModelProperty("科目") - private Integer subject; -} diff --git a/src/main/java/com/wrj/driver/server/vo/QuestionVo.java b/src/main/java/com/wrj/driver/server/vo/QuestionVo.java index 4016f05..f107d4d 100644 --- a/src/main/java/com/wrj/driver/server/vo/QuestionVo.java +++ b/src/main/java/com/wrj/driver/server/vo/QuestionVo.java @@ -11,12 +11,12 @@ import java.util.List; /** * @author 曹林 - * @description 驾考题目出参 + * @description 无人机考试题目出参 * @create 2023/8/13 17:13 */ @Data @Accessors(chain = true) -@ApiModel("驾考题目出参") +@ApiModel("无人机考试题目出参") public class QuestionVo { private static final long serialVersionUID = 1L; @@ -81,18 +81,6 @@ public class QuestionVo { @ApiModelProperty("正确答案") private String trueAnswer; - /** - * 未知 - */ - @ApiModelProperty("未知") - private String cids; - - /** - * 题型分类 - */ - @ApiModelProperty("题型分类") - private String category; - /** * 题目图片url */ @@ -113,16 +101,16 @@ public class QuestionVo { private String skillInfo; /** - * 章节标识 + * 错误答案解析 */ - @ApiModelProperty("章节标识") - private String chapter; + @ApiModelProperty("错误答案解析") + private String errorInfo; /** - * 所属科目,1:科目1,2:科目4 + * 章节标识 */ - @ApiModelProperty("所属科目,1:科目1,2:科目4") - private String subject; + @ApiModelProperty("章节标识") + private String chapter; /** * 选择 @@ -145,12 +133,6 @@ public class QuestionVo { @ApiModelProperty("显示序号") private int showOrder; - /** - * 车型 - */ - @ApiModelProperty("车型") - private Integer carTypeId; - /** * 是否生效 */ @@ -160,38 +142,38 @@ public class QuestionVo { /** * 题目关键字 */ - @ApiModelProperty("TITLE_WORDS") + @ApiModelProperty("题目关键字") private String titleWords; /** * 答题技巧关键字 */ - @ApiModelProperty("SKILL_WORDS") + @ApiModelProperty("答题技巧关键字") private String skillWords; /** * 答案A关键字 */ - @ApiModelProperty("A_WORDS") + @ApiModelProperty("答案A关键字") private String aWords; /** * 答案B关键字 */ - @ApiModelProperty("B_WORDS") + @ApiModelProperty("答案B关键字") private String bWords; /** * 答案C关键字 */ - @ApiModelProperty("C_WORDS") + @ApiModelProperty("答案C关键字") private String cWords; /** * 答案D关键字 */ - @ApiModelProperty("D_WORDS") - private String DWords; + @ApiModelProperty("答案D关键字") + private String dWords; @Data diff --git a/src/main/java/com/wrj/driver/server/vo/QusetionCategoryVo.java b/src/main/java/com/wrj/driver/server/vo/QusetionCategoryVo.java deleted file mode 100644 index a56dad8..0000000 --- a/src/main/java/com/wrj/driver/server/vo/QusetionCategoryVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.wrj.driver.server.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * @author 曹林 - * @description 题型分类 - * @create 2023/8/13 17:13 - */ -@Data -@Accessors(chain = true) -@ApiModel("题型分类出参") -public class QusetionCategoryVo { - - private static final long serialVersionUID = 1L; - - /** - * 分类标识 - */ - @ApiModelProperty("分类标识") - private String category; - - /** - * 分类名称 - */ - @ApiModelProperty("分类名称") - private String categoryName; - - /** - * 类型数量 - */ - @ApiModelProperty("类型数量") - private Integer num; - - /** - * 错题ID列表 - */ - @ApiModelProperty("错题ID列表") - private List errorQuestionIdList; - -} diff --git a/src/main/java/com/wrj/driver/server/vo/SchoolVO.java b/src/main/java/com/wrj/driver/server/vo/SchoolVO.java deleted file mode 100644 index 59a88ad..0000000 --- a/src/main/java/com/wrj/driver/server/vo/SchoolVO.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.wrj.driver.server.vo; - -import lombok.Data; - -@Data -public class SchoolVO { - private Long schoolId; - - /** 驾校名称 */ - private String schoolName; - - /** 负责人 */ - private String leader; - - /** 联系电话 */ - private String phone; - - /** 部门状态(0正常 1停用) */ - private String status; -} diff --git a/src/main/java/com/wrj/driver/server/vo/TestScoreVO.java b/src/main/java/com/wrj/driver/server/vo/TestScoreVO.java index 08322a6..1cd1d78 100644 --- a/src/main/java/com/wrj/driver/server/vo/TestScoreVO.java +++ b/src/main/java/com/wrj/driver/server/vo/TestScoreVO.java @@ -21,21 +21,17 @@ import javax.validation.constraints.NotNull; public class TestScoreVO { /** - * 车型标识 + * 无人机驾驶员类型标识 */ - @ApiModelProperty(value = "车型标识",required = true) - @NotNull(message = "车型标识不能为空") - private Integer carTypeId; - - @ApiModelProperty(value = "车型标识",required = true) - private String carTypeName; + @ApiModelProperty(value = "无人机驾驶员类型标识",required = true) + @NotNull(message = "无人机驾驶员类型标识不能为空") + private Integer driverTypeId; /** - * 科目 + * 无人机驾驶员类型标识名称 */ - @ApiModelProperty(value = "科目",required = true) - @NotBlank(message = "考试科目不能为空") - private String subject ; + @ApiModelProperty(value = "无人机驾驶员类型标识",required = true) + private String driverTypeName; /** * 考试得分 @@ -55,14 +51,10 @@ public class TestScoreVO { @Min(0) private Integer testTime; - @ApiModelProperty(value = "租户id",required = true) - private Long tenantId; @ApiModelProperty(value = "考试时间") private String createTime; @ApiModelProperty(value = "是否合格") private String isPass; - - } diff --git a/src/main/java/com/wrj/driver/server/vo/TestTotalVo.java b/src/main/java/com/wrj/driver/server/vo/TestTotalVo.java index 8788d5c..e707a09 100644 --- a/src/main/java/com/wrj/driver/server/vo/TestTotalVo.java +++ b/src/main/java/com/wrj/driver/server/vo/TestTotalVo.java @@ -1,6 +1,6 @@ package com.wrj.driver.server.vo; -import com.wrj.driver.server.entity.TdQuestionTest; +import com.wrj.driver.server.entity.WrjQuestionTest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -43,5 +43,5 @@ public class TestTotalVo { * 最近考试情况(超过五次返回最近五次) */ @ApiModelProperty("最近考试情况(超过五次返回最近五次)") - private List recentTestList; + private List recentTestList; } diff --git a/src/main/java/com/wrj/driver/server/vo/UserDiscountVO.java b/src/main/java/com/wrj/driver/server/vo/UserDiscountVO.java deleted file mode 100644 index d4a3886..0000000 --- a/src/main/java/com/wrj/driver/server/vo/UserDiscountVO.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.wrj.driver.server.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * 用户折扣 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class UserDiscountVO { - - - private Integer id; - - private Long userId; - - private Integer discountId; - - //折扣 - private BigDecimal discount; - - private String param2; - - /** - * 会员时间 - */ - private Integer duration; - - /** - * 时长单位,1:天,2:月 3:年 - */ - private String unit; - - private LocalDateTime endTime; - - private Integer isInvalid; - -} diff --git a/src/main/java/com/wrj/driver/server/vo/UserMemberVo.java b/src/main/java/com/wrj/driver/server/vo/UserMemberVo.java deleted file mode 100644 index 8a28845..0000000 --- a/src/main/java/com/wrj/driver/server/vo/UserMemberVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.wrj.driver.server.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -@Data -@Accessors(chain = true) -@ApiModel("用户学员") -public class UserMemberVo { - - @ApiModelProperty("用户标识") - private Long userId; - - @ApiModelProperty("手机号") - private String phone; - - /** - * 会员结束时间 - */ - @ApiModelProperty("会员结束时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime endDate; - - /** - * 会员结束时间 - */ - @ApiModelProperty("会员开始时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime startDate; - - /** - * 会员标识 - */ - @ApiModelProperty("会员标识") - private Integer memberId; - - /** - * 会员名称 - */ - @ApiModelProperty("会员名称") - private String memberName; - - /** - * 车型标识 - */ - @ApiModelProperty("车型标识") - private Integer carTypeId; - - @ApiModelProperty("车型") - private String carName; - - /** - * 科目 - */ - @ApiModelProperty("科目") - private String subjects; - - /** - * 会员价格,单位元 - */ - @ApiModelProperty("会员价格,单位元") - private BigDecimal price; - -} diff --git a/src/main/java/com/wrj/driver/server/vo/CarChapterVo.java b/src/main/java/com/wrj/driver/server/vo/WrjTypeChapterVo.java similarity index 51% rename from src/main/java/com/wrj/driver/server/vo/CarChapterVo.java rename to src/main/java/com/wrj/driver/server/vo/WrjTypeChapterVo.java index 7f113f9..b22933c 100644 --- a/src/main/java/com/wrj/driver/server/vo/CarChapterVo.java +++ b/src/main/java/com/wrj/driver/server/vo/WrjTypeChapterVo.java @@ -1,7 +1,5 @@ package com.wrj.driver.server.vo; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,51 +8,49 @@ import lombok.experimental.Accessors; import java.io.Serializable; /** - * 车型章节表 + * 无人机驾驶员类型章节表 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class CarChapterVo implements Serializable { +public class WrjTypeChapterVo implements Serializable { - @ApiModelProperty("ID") - private Integer ID; + @ApiModelProperty("主键") + private Integer id; /** * 章节id */ - @ApiModelProperty("CHAPTER_ID") + @ApiModelProperty("章节id") private Integer chapterId; /** - * 车型id + * 驾驶类型id */ - @ApiModelProperty("CAR_TYPE_ID") - private Integer carTypeId; + @ApiModelProperty("驾驶类型id") + private Integer typeId; + + /** + * 机型iD + */ + @ApiModelProperty("机型iD") + private Integer modelId; /** * 判断题 */ - @ApiModelProperty("JUDGE_NUM") + @ApiModelProperty("判断题") private Integer judgeNum; /** * 单选题 */ - @ApiModelProperty("RADIO_NUM") + @ApiModelProperty("单选题") private Integer radioNum; - /** * 多选题 */ - @ApiModelProperty("MULTIPLE_CHOICE_NUM") + @ApiModelProperty("多选题") private Integer multipleChoiceNum; - - /** - * 科目 - */ - @ApiModelProperty("SUBJECT") - private Integer subject; - } diff --git a/src/main/resources/mapper/PayNoticeLogMapper.xml b/src/main/resources/mapper/PayNoticeLogMapper.xml deleted file mode 100644 index 0bc0bed..0000000 --- a/src/main/resources/mapper/PayNoticeLogMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/PayPrepayMapper.xml b/src/main/resources/mapper/PayPrepayMapper.xml deleted file mode 100644 index 1158e8d..0000000 --- a/src/main/resources/mapper/PayPrepayMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/PayPrepayResultMapper.xml b/src/main/resources/mapper/PayPrepayResultMapper.xml deleted file mode 100644 index ce45d35..0000000 --- a/src/main/resources/mapper/PayPrepayResultMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/PayRefundMapper.xml b/src/main/resources/mapper/PayRefundMapper.xml deleted file mode 100644 index 029a8cc..0000000 --- a/src/main/resources/mapper/PayRefundMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/PayRefundResultMapper.xml b/src/main/resources/mapper/PayRefundResultMapper.xml deleted file mode 100644 index 8806a18..0000000 --- a/src/main/resources/mapper/PayRefundResultMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/SysDistributionDetailMapper.xml b/src/main/resources/mapper/SysDistributionDetailMapper.xml deleted file mode 100644 index 4a62336..0000000 --- a/src/main/resources/mapper/SysDistributionDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/SysDistributionMapper.xml b/src/main/resources/mapper/SysDistributionMapper.xml deleted file mode 100644 index dc051f4..0000000 --- a/src/main/resources/mapper/SysDistributionMapper.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/TdCarChapterMapper.xml b/src/main/resources/mapper/TdCarChapterMapper.xml deleted file mode 100644 index b4c0dde..0000000 --- a/src/main/resources/mapper/TdCarChapterMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdCarMapper.xml b/src/main/resources/mapper/TdCarMapper.xml deleted file mode 100644 index aaa6372..0000000 --- a/src/main/resources/mapper/TdCarMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdCarouselImageMapper.xml b/src/main/resources/mapper/TdCarouselImageMapper.xml deleted file mode 100644 index a107c67..0000000 --- a/src/main/resources/mapper/TdCarouselImageMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdCategoryQuestionMapper.xml b/src/main/resources/mapper/TdCategoryQuestionMapper.xml deleted file mode 100644 index efd6bd9..0000000 --- a/src/main/resources/mapper/TdCategoryQuestionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdChapterMapper.xml b/src/main/resources/mapper/TdChapterMapper.xml deleted file mode 100644 index 8228b6a..0000000 --- a/src/main/resources/mapper/TdChapterMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdExaminationRoomMapper.xml b/src/main/resources/mapper/TdExaminationRoomMapper.xml deleted file mode 100644 index b3f72b7..0000000 --- a/src/main/resources/mapper/TdExaminationRoomMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdExaminationRoomRoadMapper.xml b/src/main/resources/mapper/TdExaminationRoomRoadMapper.xml deleted file mode 100644 index 64763d8..0000000 --- a/src/main/resources/mapper/TdExaminationRoomRoadMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdMemberMapper.xml b/src/main/resources/mapper/TdMemberMapper.xml deleted file mode 100644 index d87dee5..0000000 --- a/src/main/resources/mapper/TdMemberMapper.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - diff --git a/src/main/resources/mapper/TdModuleQuestionMapper.xml b/src/main/resources/mapper/TdModuleQuestionMapper.xml deleted file mode 100644 index c867368..0000000 --- a/src/main/resources/mapper/TdModuleQuestionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdPointQuestionMapper.xml b/src/main/resources/mapper/TdPointQuestionMapper.xml deleted file mode 100644 index 9a0ca97..0000000 --- a/src/main/resources/mapper/TdPointQuestionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdProjectMapper.xml b/src/main/resources/mapper/TdProjectMapper.xml deleted file mode 100644 index 97adb94..0000000 --- a/src/main/resources/mapper/TdProjectMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdQuestionJxMapper.xml b/src/main/resources/mapper/TdQuestionJxMapper.xml deleted file mode 100644 index 53929f3..0000000 --- a/src/main/resources/mapper/TdQuestionJxMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/mapper/TdQuestionMapper.xml b/src/main/resources/mapper/TdQuestionMapper.xml deleted file mode 100644 index 2a28e22..0000000 --- a/src/main/resources/mapper/TdQuestionMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - update td_question - - - SKILL_INFO = #{questionVo.skillInfo}, - - - IMAGE_URL = #{questionVo.imageUrl}, - - - where QUESTION_ID = #{questionVo.questionId} - - - - - - - - - - - diff --git a/src/main/resources/mapper/TdQuestionTestMapper.xml b/src/main/resources/mapper/TdQuestionTestMapper.xml deleted file mode 100644 index dfd2de7..0000000 --- a/src/main/resources/mapper/TdQuestionTestMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/src/main/resources/mapper/TdQuestionVersionMapper.xml b/src/main/resources/mapper/TdQuestionVersionMapper.xml deleted file mode 100644 index adf66df..0000000 --- a/src/main/resources/mapper/TdQuestionVersionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdSecretMapper.xml b/src/main/resources/mapper/TdSecretMapper.xml deleted file mode 100644 index 3e23b40..0000000 --- a/src/main/resources/mapper/TdSecretMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/TdSecretQuestionMapper.xml b/src/main/resources/mapper/TdSecretQuestionMapper.xml deleted file mode 100644 index 6daf6cf..0000000 --- a/src/main/resources/mapper/TdSecretQuestionMapper.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdSysConfigListMapper.xml b/src/main/resources/mapper/TdSysConfigListMapper.xml deleted file mode 100644 index 6418730..0000000 --- a/src/main/resources/mapper/TdSysConfigListMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdSysUserDiscountMapper.xml b/src/main/resources/mapper/TdSysUserDiscountMapper.xml deleted file mode 100644 index 5d10889..0000000 --- a/src/main/resources/mapper/TdSysUserDiscountMapper.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - diff --git a/src/main/resources/mapper/TdSysUserMapper.xml b/src/main/resources/mapper/TdSysUserMapper.xml index 1e7e99e..b5982e7 100644 --- a/src/main/resources/mapper/TdSysUserMapper.xml +++ b/src/main/resources/mapper/TdSysUserMapper.xml @@ -1,28 +1,4 @@ - diff --git a/src/main/resources/mapper/TdSysUserMemberMapper.xml b/src/main/resources/mapper/TdSysUserMemberMapper.xml deleted file mode 100644 index 7c0753a..0000000 --- a/src/main/resources/mapper/TdSysUserMemberMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - diff --git a/src/main/resources/mapper/TdTenantAppletMapper.xml b/src/main/resources/mapper/TdTenantAppletMapper.xml deleted file mode 100644 index 3bdea80..0000000 --- a/src/main/resources/mapper/TdTenantAppletMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdTenantCarMapper.xml b/src/main/resources/mapper/TdTenantCarMapper.xml deleted file mode 100644 index 4bfa379..0000000 --- a/src/main/resources/mapper/TdTenantCarMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/src/main/resources/mapper/TdTenantUserMapper.xml b/src/main/resources/mapper/TdTenantUserMapper.xml deleted file mode 100644 index 9dccb0e..0000000 --- a/src/main/resources/mapper/TdTenantUserMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdTrafficSignCategoryMapper.xml b/src/main/resources/mapper/TdTrafficSignCategoryMapper.xml deleted file mode 100644 index a174c71..0000000 --- a/src/main/resources/mapper/TdTrafficSignCategoryMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdTrafficSignQuestionMapper.xml b/src/main/resources/mapper/TdTrafficSignQuestionMapper.xml deleted file mode 100644 index 1d0dcfa..0000000 --- a/src/main/resources/mapper/TdTrafficSignQuestionMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/TdUserDistributionMapper.xml b/src/main/resources/mapper/TdUserDistributionMapper.xml deleted file mode 100644 index fe493c3..0000000 --- a/src/main/resources/mapper/TdUserDistributionMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/src/main/resources/mapper/TdVideosMapper.xml b/src/main/resources/mapper/TdVideosMapper.xml deleted file mode 100644 index 2399f08..0000000 --- a/src/main/resources/mapper/TdVideosMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/WrjChapterMapper.xml b/src/main/resources/mapper/WrjChapterMapper.xml new file mode 100644 index 0000000..3859d81 --- /dev/null +++ b/src/main/resources/mapper/WrjChapterMapper.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/src/main/resources/mapper/OrderPayInfoMapper.xml b/src/main/resources/mapper/WrjDriverTypeMapper.xml similarity index 69% rename from src/main/resources/mapper/OrderPayInfoMapper.xml rename to src/main/resources/mapper/WrjDriverTypeMapper.xml index 2760f46..f4be30f 100644 --- a/src/main/resources/mapper/OrderPayInfoMapper.xml +++ b/src/main/resources/mapper/WrjDriverTypeMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/WrjQuestionMapper.xml b/src/main/resources/mapper/WrjQuestionMapper.xml new file mode 100644 index 0000000..c986c5a --- /dev/null +++ b/src/main/resources/mapper/WrjQuestionMapper.xml @@ -0,0 +1,200 @@ + + + + + + + + + + update wrj_question + + + skill_info = #{questionVo.skillInfo}, + + + image_url = #{questionVo.imageUrl}, + + + where question_id = #{questionVo.questionId} + + + + + + + + + + + diff --git a/src/main/resources/mapper/WrjQuestionTestMapper.xml b/src/main/resources/mapper/WrjQuestionTestMapper.xml new file mode 100644 index 0000000..c1ff81c --- /dev/null +++ b/src/main/resources/mapper/WrjQuestionTestMapper.xml @@ -0,0 +1,29 @@ + + + + + + + diff --git a/src/main/resources/mapper/TdMemberDiscountMapper.xml b/src/main/resources/mapper/WrjSysConfigListMapper.xml similarity index 72% rename from src/main/resources/mapper/TdMemberDiscountMapper.xml rename to src/main/resources/mapper/WrjSysConfigListMapper.xml index 51629ce..b3384a6 100644 --- a/src/main/resources/mapper/TdMemberDiscountMapper.xml +++ b/src/main/resources/mapper/WrjSysConfigListMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/TdSysConfigMapper.xml b/src/main/resources/mapper/WrjSysConfigMapper.xml similarity index 80% rename from src/main/resources/mapper/TdSysConfigMapper.xml rename to src/main/resources/mapper/WrjSysConfigMapper.xml index d76821f..91be48a 100644 --- a/src/main/resources/mapper/TdSysConfigMapper.xml +++ b/src/main/resources/mapper/WrjSysConfigMapper.xml @@ -1,9 +1,9 @@ - + - update td_sys_config + update wrj_sys_config CONFIG_VALUE = #{param.configValue}, @@ -13,7 +13,7 @@ CONFIG_JSON = #{param.configJson}, IS_ACTIVE = #{param.isActive}, - where CAR_TYPE_ID = #{param.carTypeId} and CONFIG_KEY = #{param.configKey} + where DRIVER_TYPE_ID = #{param.driverTypeId} and CONFIG_KEY = #{param.configKey} diff --git a/src/main/resources/mapper/WrjTypeChapterMapper.xml b/src/main/resources/mapper/WrjTypeChapterMapper.xml new file mode 100644 index 0000000..3aa9eb7 --- /dev/null +++ b/src/main/resources/mapper/WrjTypeChapterMapper.xml @@ -0,0 +1,18 @@ + + + + +