From 8de9482790c0a097e08de5acd63e87834cbbaae8 Mon Sep 17 00:00:00 2001 From: soul2 <1052986332@qq.com> Date: Wed, 20 Mar 2024 16:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=90=8D=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=83=A8=E7=BD=B2=E6=97=B6=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E5=92=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/JavaJyjcAdminApplication.java} | 12 +++++--- .../admin}/codemessage/BackCodeMessage.java | 2 +- .../admin}/config/BeanConfig.java | 2 +- .../admin}/config/CorsConfig.java | 2 +- .../config/MetaObjectHandlerConfig.java | 2 +- .../admin}/controller/DemoController.java | 16 +++++----- .../ExternalBackhaulController.java | 8 ++--- .../admin}/controller/QrController.java | 20 ++++++------- .../controller/QuestionnaireController.java | 22 +++++++------- .../admin}/controller/SubjectController.java | 28 ++++++++--------- .../admin}/dto/AnswerDetailsSaveDTO.java | 2 +- .../admin}/dto/AnswerPageQueryDTO.java | 4 +-- .../admin}/dto/AnswerSheetSaveDTO.java | 2 +- .../{demo => jyjc/admin}/dto/DemoDTO.java | 4 +-- .../admin}/dto/DemoSaveOrUpdateDTO.java | 2 +- .../admin}/dto/ExternalBackhaulDTO.java | 4 +-- .../admin}/dto/QnSubjectRefItemDTO.java | 4 +-- .../admin}/dto/QnSubjectRefSaveDTO.java | 2 +- .../soul2/{demo => jyjc/admin}/dto/QrDTO.java | 4 +-- .../admin}/dto/QuestionnaireDTO.java | 4 +-- .../{demo => jyjc/admin}/dto/SubjectDTO.java | 4 +-- .../admin}/dto/SubjectItemDTO.java | 2 +- .../admin}/dto/SubjectItemRefDTO.java | 2 +- .../admin}/dto/base/PageParams.java | 2 +- .../admin}/dto/base/UpdateStatusDTO.java | 2 +- .../admin}/entity/AnswerDetailsDO.java | 2 +- .../admin}/entity/AnswerSheetDO.java | 2 +- .../admin}/entity/DataTableDemoDO.java | 2 +- .../admin}/entity/ExternalBackhaulDO.java | 2 +- .../{demo => jyjc/admin}/entity/QrDO.java | 2 +- .../admin}/entity/QuestionnaireDO.java | 2 +- .../entity/RefQuestionnaireSubjectDO.java | 2 +- .../admin}/entity/RefSubjectItemsDO.java | 2 +- .../admin}/entity/SubjectDO.java | 2 +- .../admin}/entity/SubjectItemsDO.java | 2 +- .../RefQuestionnaireSubjectUseCountDO.java | 2 +- .../entity/sqlresult/SubjectChooseListDO.java | 2 +- .../admin}/mapper/AnswerDetailsMapper.java | 4 +-- .../admin}/mapper/AnswerSheetMapper.java | 4 +-- .../admin}/mapper/DataTableDemoMapper.java | 4 +-- .../admin}/mapper/ExternalBackhaulMapper.java | 4 +-- .../{demo => jyjc/admin}/mapper/QrMapper.java | 4 +-- .../admin}/mapper/QuestionnaireMapper.java | 8 ++--- .../mapper/RefQuestionnaireSubjectMapper.java | 4 +-- .../admin}/mapper/RefSubjectItemsMapper.java | 4 +-- .../admin}/mapper/SubjectItemsMapper.java | 4 +-- .../admin}/mapper/SubjectMapper.java | 8 ++--- .../repository/IAnswerDetailsRepository.java | 4 +-- .../repository/IAnswerSheetRepository.java | 10 +++---- .../repository/IDataTableDemoRepository.java | 10 +++---- .../IExternalBackhaulRepository.java | 10 +++---- .../admin}/repository/IQrRepository.java | 10 +++---- .../repository/IQuestionnaireRepository.java | 12 ++++---- .../IRefQuestionnaireSubjectRepository.java | 8 ++--- .../IRefSubjectItemsRepository.java | 8 ++--- .../repository/ISubjectItemsRepository.java | 4 +-- .../admin}/repository/ISubjectRepository.java | 16 +++++----- .../impl/AnswerDetailsRepositoryImpl.java | 8 ++--- .../impl/AnswerSheetRepositoryImpl.java | 30 +++++++++---------- .../impl/DataTableDemoRepositoryImpl.java | 16 +++++----- .../impl/ExternalBackhaulRepositoryImpl.java | 16 +++++----- .../repository/impl/QrRepositoryImpl.java | 16 +++++----- .../impl/QuestionnaireRepositoryImpl.java | 20 ++++++------- ...RefQuestionnaireSubjectRepositoryImpl.java | 14 ++++----- .../impl/RefSubjectItemsRepositoryImpl.java | 14 ++++----- .../impl/SubjectItemsRepositoryImpl.java | 8 ++--- .../impl/SubjectRepositoryImpl.java | 28 ++++++++--------- .../admin}/service/IDemoService.java | 12 ++++---- .../admin}/service/impl/DemoServiceImpl.java | 24 +++++++-------- .../admin}/utils/MybatisFastGenerator.java | 2 +- .../{demo => jyjc/admin}/utils/Test.java | 2 +- .../admin}/utils/base/BackUtils.java | 6 ++-- .../admin}/utils/base/PageUtils.java | 6 ++-- .../admin}/vo/AnswerDetailsVO.java | 2 +- .../admin}/vo/AnswerSheetVO.java | 2 +- .../soul2/{demo => jyjc/admin}/vo/DemoVO.java | 2 +- .../admin}/vo/ExternalBackhaulVO.java | 2 +- .../soul2/{demo => jyjc/admin}/vo/QrVO.java | 2 +- .../admin}/vo/QuestionnaireVO.java | 2 +- .../admin}/vo/SubjectItemVO.java | 2 +- .../{demo => jyjc/admin}/vo/SubjectVO.java | 2 +- .../{demo => jyjc/admin}/vo/base/Back.java | 4 +-- .../{demo => jyjc/admin}/vo/base/VPage.java | 2 +- src/main/resources/application-cors.yml | 3 ++ src/main/resources/application-datasource.yml | 9 ++++-- src/main/resources/application.yml | 2 +- .../admin/JavaJyjcAdminApplicationTests.java} | 4 +-- 87 files changed, 297 insertions(+), 287 deletions(-) rename src/main/java/cn/soul2/{demo/JavaDemoApplication.java => jyjc/admin/JavaJyjcAdminApplication.java} (52%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/codemessage/BackCodeMessage.java (93%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/config/BeanConfig.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/config/CorsConfig.java (96%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/config/MetaObjectHandlerConfig.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/controller/DemoController.java (75%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/controller/ExternalBackhaulController.java (80%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/controller/QrController.java (79%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/controller/QuestionnaireController.java (75%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/controller/SubjectController.java (75%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/AnswerDetailsSaveDTO.java (93%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/AnswerPageQueryDTO.java (79%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/AnswerSheetSaveDTO.java (94%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/DemoDTO.java (82%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/DemoSaveOrUpdateDTO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/ExternalBackhaulDTO.java (80%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/QnSubjectRefItemDTO.java (89%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/QnSubjectRefSaveDTO.java (91%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/QrDTO.java (91%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/QuestionnaireDTO.java (90%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/SubjectDTO.java (88%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/SubjectItemDTO.java (94%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/SubjectItemRefDTO.java (91%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/base/PageParams.java (86%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/dto/base/UpdateStatusDTO.java (88%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/AnswerDetailsDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/AnswerSheetDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/DataTableDemoDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/ExternalBackhaulDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/QrDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/QuestionnaireDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/RefQuestionnaireSubjectDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/RefSubjectItemsDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/SubjectDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/SubjectItemsDO.java (97%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java (87%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/entity/sqlresult/SubjectChooseListDO.java (93%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/AnswerDetailsMapper.java (73%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/AnswerSheetMapper.java (73%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/DataTableDemoMapper.java (76%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/ExternalBackhaulMapper.java (74%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/QrMapper.java (78%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/QuestionnaireMapper.java (76%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/RefQuestionnaireSubjectMapper.java (73%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/RefSubjectItemsMapper.java (73%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/SubjectItemsMapper.java (73%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/mapper/SubjectMapper.java (80%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IAnswerDetailsRepository.java (85%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IAnswerSheetRepository.java (74%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IDataTableDemoRepository.java (64%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IExternalBackhaulRepository.java (77%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IQrRepository.java (67%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IQuestionnaireRepository.java (58%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IRefQuestionnaireSubjectRepository.java (74%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/IRefSubjectItemsRepository.java (87%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/ISubjectItemsRepository.java (91%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/ISubjectRepository.java (75%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/AnswerDetailsRepositoryImpl.java (82%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/AnswerSheetRepositoryImpl.java (86%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/DataTableDemoRepositoryImpl.java (81%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/ExternalBackhaulRepositoryImpl.java (80%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/QrRepositoryImpl.java (86%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/QuestionnaireRepositoryImpl.java (83%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/RefQuestionnaireSubjectRepositoryImpl.java (89%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/RefSubjectItemsRepositoryImpl.java (90%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/SubjectItemsRepositoryImpl.java (89%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/repository/impl/SubjectRepositoryImpl.java (89%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/service/IDemoService.java (51%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/service/impl/DemoServiceImpl.java (68%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/utils/MybatisFastGenerator.java (99%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/utils/Test.java (93%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/utils/base/BackUtils.java (87%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/utils/base/PageUtils.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/AnswerDetailsVO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/AnswerSheetVO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/DemoVO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/ExternalBackhaulVO.java (93%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/QrVO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/QuestionnaireVO.java (95%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/SubjectItemVO.java (94%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/SubjectVO.java (94%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/base/Back.java (90%) rename src/main/java/cn/soul2/{demo => jyjc/admin}/vo/base/VPage.java (97%) rename src/test/java/cn/soul2/{demo/JavaDemoApplicationTests.java => jyjc/admin/JavaJyjcAdminApplicationTests.java} (70%) diff --git a/src/main/java/cn/soul2/demo/JavaDemoApplication.java b/src/main/java/cn/soul2/jyjc/admin/JavaJyjcAdminApplication.java similarity index 52% rename from src/main/java/cn/soul2/demo/JavaDemoApplication.java rename to src/main/java/cn/soul2/jyjc/admin/JavaJyjcAdminApplication.java index 8868612..3b83517 100644 --- a/src/main/java/cn/soul2/demo/JavaDemoApplication.java +++ b/src/main/java/cn/soul2/jyjc/admin/JavaJyjcAdminApplication.java @@ -1,15 +1,19 @@ -package cn.soul2.demo; +package cn.soul2.jyjc.admin; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +/** + * @author Soul2 + * @date 2024-03-17 + */ @SpringBootApplication -@MapperScan("cn.soul2.demo.mapper") -public class JavaDemoApplication { +@MapperScan("cn.soul2.jyjc.admin.mapper") +public class JavaJyjcAdminApplication { public static void main(String[] args) { - SpringApplication.run(JavaDemoApplication.class, args); + SpringApplication.run(JavaJyjcAdminApplication.class, args); } } diff --git a/src/main/java/cn/soul2/demo/codemessage/BackCodeMessage.java b/src/main/java/cn/soul2/jyjc/admin/codemessage/BackCodeMessage.java similarity index 93% rename from src/main/java/cn/soul2/demo/codemessage/BackCodeMessage.java rename to src/main/java/cn/soul2/jyjc/admin/codemessage/BackCodeMessage.java index 0863235..366a173 100644 --- a/src/main/java/cn/soul2/demo/codemessage/BackCodeMessage.java +++ b/src/main/java/cn/soul2/jyjc/admin/codemessage/BackCodeMessage.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.codemessage; +package cn.soul2.jyjc.admin.codemessage; /** * @author Soul2 diff --git a/src/main/java/cn/soul2/demo/config/BeanConfig.java b/src/main/java/cn/soul2/jyjc/admin/config/BeanConfig.java similarity index 95% rename from src/main/java/cn/soul2/demo/config/BeanConfig.java rename to src/main/java/cn/soul2/jyjc/admin/config/BeanConfig.java index 21157fd..d13ed1d 100644 --- a/src/main/java/cn/soul2/demo/config/BeanConfig.java +++ b/src/main/java/cn/soul2/jyjc/admin/config/BeanConfig.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.config; +package cn.soul2.jyjc.admin.config; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; diff --git a/src/main/java/cn/soul2/demo/config/CorsConfig.java b/src/main/java/cn/soul2/jyjc/admin/config/CorsConfig.java similarity index 96% rename from src/main/java/cn/soul2/demo/config/CorsConfig.java rename to src/main/java/cn/soul2/jyjc/admin/config/CorsConfig.java index 63768ae..668552e 100644 --- a/src/main/java/cn/soul2/demo/config/CorsConfig.java +++ b/src/main/java/cn/soul2/jyjc/admin/config/CorsConfig.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.config; +package cn.soul2.jyjc.admin.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/cn/soul2/demo/config/MetaObjectHandlerConfig.java b/src/main/java/cn/soul2/jyjc/admin/config/MetaObjectHandlerConfig.java similarity index 95% rename from src/main/java/cn/soul2/demo/config/MetaObjectHandlerConfig.java rename to src/main/java/cn/soul2/jyjc/admin/config/MetaObjectHandlerConfig.java index be63e1b..6aa13fd 100644 --- a/src/main/java/cn/soul2/demo/config/MetaObjectHandlerConfig.java +++ b/src/main/java/cn/soul2/jyjc/admin/config/MetaObjectHandlerConfig.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.config; +package cn.soul2.jyjc.admin.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/cn/soul2/demo/controller/DemoController.java b/src/main/java/cn/soul2/jyjc/admin/controller/DemoController.java similarity index 75% rename from src/main/java/cn/soul2/demo/controller/DemoController.java rename to src/main/java/cn/soul2/jyjc/admin/controller/DemoController.java index a715d71..83b73fe 100644 --- a/src/main/java/cn/soul2/demo/controller/DemoController.java +++ b/src/main/java/cn/soul2/jyjc/admin/controller/DemoController.java @@ -1,11 +1,11 @@ -package cn.soul2.demo.controller; - -import cn.soul2.demo.dto.DemoDTO; -import cn.soul2.demo.dto.DemoSaveOrUpdateDTO; -import cn.soul2.demo.service.IDemoService; -import cn.soul2.demo.vo.DemoVO; -import cn.soul2.demo.vo.base.Back; -import cn.soul2.demo.vo.base.VPage; +package cn.soul2.jyjc.admin.controller; + +import cn.soul2.jyjc.admin.dto.DemoDTO; +import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO; +import cn.soul2.jyjc.admin.service.IDemoService; +import cn.soul2.jyjc.admin.vo.DemoVO; +import cn.soul2.jyjc.admin.vo.base.Back; +import cn.soul2.jyjc.admin.vo.base.VPage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/cn/soul2/demo/controller/ExternalBackhaulController.java b/src/main/java/cn/soul2/jyjc/admin/controller/ExternalBackhaulController.java similarity index 80% rename from src/main/java/cn/soul2/demo/controller/ExternalBackhaulController.java rename to src/main/java/cn/soul2/jyjc/admin/controller/ExternalBackhaulController.java index 78caf1b..1afed00 100644 --- a/src/main/java/cn/soul2/demo/controller/ExternalBackhaulController.java +++ b/src/main/java/cn/soul2/jyjc/admin/controller/ExternalBackhaulController.java @@ -1,8 +1,8 @@ -package cn.soul2.demo.controller; +package cn.soul2.jyjc.admin.controller; -import cn.soul2.demo.repository.IExternalBackhaulRepository; -import cn.soul2.demo.utils.base.BackUtils; -import cn.soul2.demo.vo.base.Back; +import cn.soul2.jyjc.admin.repository.IExternalBackhaulRepository; +import cn.soul2.jyjc.admin.utils.base.BackUtils; +import cn.soul2.jyjc.admin.vo.base.Back; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/soul2/demo/controller/QrController.java b/src/main/java/cn/soul2/jyjc/admin/controller/QrController.java similarity index 79% rename from src/main/java/cn/soul2/demo/controller/QrController.java rename to src/main/java/cn/soul2/jyjc/admin/controller/QrController.java index b8c6370..5eee768 100644 --- a/src/main/java/cn/soul2/demo/controller/QrController.java +++ b/src/main/java/cn/soul2/jyjc/admin/controller/QrController.java @@ -1,13 +1,13 @@ -package cn.soul2.demo.controller; - -import cn.soul2.demo.dto.QrDTO; -import cn.soul2.demo.entity.QrDO; -import cn.soul2.demo.repository.IQrRepository; -import cn.soul2.demo.utils.base.BackUtils; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.QrVO; -import cn.soul2.demo.vo.base.Back; -import cn.soul2.demo.vo.base.VPage; +package cn.soul2.jyjc.admin.controller; + +import cn.soul2.jyjc.admin.dto.QrDTO; +import cn.soul2.jyjc.admin.entity.QrDO; +import cn.soul2.jyjc.admin.repository.IQrRepository; +import cn.soul2.jyjc.admin.utils.base.BackUtils; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.QrVO; +import cn.soul2.jyjc.admin.vo.base.Back; +import cn.soul2.jyjc.admin.vo.base.VPage; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/soul2/demo/controller/QuestionnaireController.java b/src/main/java/cn/soul2/jyjc/admin/controller/QuestionnaireController.java similarity index 75% rename from src/main/java/cn/soul2/demo/controller/QuestionnaireController.java rename to src/main/java/cn/soul2/jyjc/admin/controller/QuestionnaireController.java index cfcb4ae..bde59e7 100644 --- a/src/main/java/cn/soul2/demo/controller/QuestionnaireController.java +++ b/src/main/java/cn/soul2/jyjc/admin/controller/QuestionnaireController.java @@ -1,14 +1,14 @@ -package cn.soul2.demo.controller; - -import cn.soul2.demo.dto.QnSubjectRefSaveDTO; -import cn.soul2.demo.dto.QuestionnaireDTO; -import cn.soul2.demo.dto.base.UpdateStatusDTO; -import cn.soul2.demo.repository.IQuestionnaireRepository; -import cn.soul2.demo.repository.IRefQuestionnaireSubjectRepository; -import cn.soul2.demo.utils.base.BackUtils; -import cn.soul2.demo.vo.QuestionnaireVO; -import cn.soul2.demo.vo.base.Back; -import cn.soul2.demo.vo.base.VPage; +package cn.soul2.jyjc.admin.controller; + +import cn.soul2.jyjc.admin.dto.QnSubjectRefSaveDTO; +import cn.soul2.jyjc.admin.dto.QuestionnaireDTO; +import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO; +import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository; +import cn.soul2.jyjc.admin.repository.IRefQuestionnaireSubjectRepository; +import cn.soul2.jyjc.admin.utils.base.BackUtils; +import cn.soul2.jyjc.admin.vo.QuestionnaireVO; +import cn.soul2.jyjc.admin.vo.base.Back; +import cn.soul2.jyjc.admin.vo.base.VPage; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/cn/soul2/demo/controller/SubjectController.java b/src/main/java/cn/soul2/jyjc/admin/controller/SubjectController.java similarity index 75% rename from src/main/java/cn/soul2/demo/controller/SubjectController.java rename to src/main/java/cn/soul2/jyjc/admin/controller/SubjectController.java index 823cfaf..46ef38f 100644 --- a/src/main/java/cn/soul2/demo/controller/SubjectController.java +++ b/src/main/java/cn/soul2/jyjc/admin/controller/SubjectController.java @@ -1,18 +1,18 @@ -package cn.soul2.demo.controller; +package cn.soul2.jyjc.admin.controller; -import cn.soul2.demo.dto.QnSubjectRefItemDTO; -import cn.soul2.demo.dto.SubjectDTO; -import cn.soul2.demo.dto.base.UpdateStatusDTO; -import cn.soul2.demo.entity.SubjectItemsDO; -import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO; -import cn.soul2.demo.repository.IRefSubjectItemsRepository; -import cn.soul2.demo.repository.ISubjectItemsRepository; -import cn.soul2.demo.repository.ISubjectRepository; -import cn.soul2.demo.utils.base.BackUtils; -import cn.soul2.demo.vo.SubjectItemVO; -import cn.soul2.demo.vo.SubjectVO; -import cn.soul2.demo.vo.base.Back; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QnSubjectRefItemDTO; +import cn.soul2.jyjc.admin.dto.SubjectDTO; +import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO; +import cn.soul2.jyjc.admin.entity.SubjectItemsDO; +import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO; +import cn.soul2.jyjc.admin.repository.IRefSubjectItemsRepository; +import cn.soul2.jyjc.admin.repository.ISubjectItemsRepository; +import cn.soul2.jyjc.admin.repository.ISubjectRepository; +import cn.soul2.jyjc.admin.utils.base.BackUtils; +import cn.soul2.jyjc.admin.vo.SubjectItemVO; +import cn.soul2.jyjc.admin.vo.SubjectVO; +import cn.soul2.jyjc.admin.vo.base.Back; +import cn.soul2.jyjc.admin.vo.base.VPage; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cn/soul2/demo/dto/AnswerDetailsSaveDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerDetailsSaveDTO.java similarity index 93% rename from src/main/java/cn/soul2/demo/dto/AnswerDetailsSaveDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/AnswerDetailsSaveDTO.java index 8a1c72a..c6e73e0 100644 --- a/src/main/java/cn/soul2/demo/dto/AnswerDetailsSaveDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerDetailsSaveDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/AnswerPageQueryDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerPageQueryDTO.java similarity index 79% rename from src/main/java/cn/soul2/demo/dto/AnswerPageQueryDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/AnswerPageQueryDTO.java index cf0fece..16d01a5 100644 --- a/src/main/java/cn/soul2/demo/dto/AnswerPageQueryDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerPageQueryDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/AnswerSheetSaveDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerSheetSaveDTO.java similarity index 94% rename from src/main/java/cn/soul2/demo/dto/AnswerSheetSaveDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/AnswerSheetSaveDTO.java index 7091282..0bd8eb2 100644 --- a/src/main/java/cn/soul2/demo/dto/AnswerSheetSaveDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/AnswerSheetSaveDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/DemoDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/DemoDTO.java similarity index 82% rename from src/main/java/cn/soul2/demo/dto/DemoDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/DemoDTO.java index ee4e2ae..ab8816f 100644 --- a/src/main/java/cn/soul2/demo/dto/DemoDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/DemoDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/DemoSaveOrUpdateDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/DemoSaveOrUpdateDTO.java similarity index 95% rename from src/main/java/cn/soul2/demo/dto/DemoSaveOrUpdateDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/DemoSaveOrUpdateDTO.java index 32363bb..cff127d 100644 --- a/src/main/java/cn/soul2/demo/dto/DemoSaveOrUpdateDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/DemoSaveOrUpdateDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/cn/soul2/demo/dto/ExternalBackhaulDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/ExternalBackhaulDTO.java similarity index 80% rename from src/main/java/cn/soul2/demo/dto/ExternalBackhaulDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/ExternalBackhaulDTO.java index fb9c5ab..d0d309b 100644 --- a/src/main/java/cn/soul2/demo/dto/ExternalBackhaulDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/ExternalBackhaulDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/QnSubjectRefItemDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefItemDTO.java similarity index 89% rename from src/main/java/cn/soul2/demo/dto/QnSubjectRefItemDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefItemDTO.java index b976195..584458f 100644 --- a/src/main/java/cn/soul2/demo/dto/QnSubjectRefItemDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefItemDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/QnSubjectRefSaveDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefSaveDTO.java similarity index 91% rename from src/main/java/cn/soul2/demo/dto/QnSubjectRefSaveDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefSaveDTO.java index eae355f..380ff27 100644 --- a/src/main/java/cn/soul2/demo/dto/QnSubjectRefSaveDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/QnSubjectRefSaveDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/QrDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/QrDTO.java similarity index 91% rename from src/main/java/cn/soul2/demo/dto/QrDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/QrDTO.java index 80b1c2b..991124f 100644 --- a/src/main/java/cn/soul2/demo/dto/QrDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/QrDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/QuestionnaireDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/QuestionnaireDTO.java similarity index 90% rename from src/main/java/cn/soul2/demo/dto/QuestionnaireDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/QuestionnaireDTO.java index 1cd9d8b..ee8106b 100644 --- a/src/main/java/cn/soul2/demo/dto/QuestionnaireDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/QuestionnaireDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/SubjectDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectDTO.java similarity index 88% rename from src/main/java/cn/soul2/demo/dto/SubjectDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/SubjectDTO.java index 744d0b9..4dfe5c8 100644 --- a/src/main/java/cn/soul2/demo/dto/SubjectDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectDTO.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; -import cn.soul2.demo.dto.base.PageParams; +import cn.soul2.jyjc.admin.dto.base.PageParams; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/SubjectItemDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemDTO.java similarity index 94% rename from src/main/java/cn/soul2/demo/dto/SubjectItemDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemDTO.java index b3b25ea..4b21588 100644 --- a/src/main/java/cn/soul2/demo/dto/SubjectItemDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/SubjectItemRefDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemRefDTO.java similarity index 91% rename from src/main/java/cn/soul2/demo/dto/SubjectItemRefDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemRefDTO.java index 6b5e3e5..e740b84 100644 --- a/src/main/java/cn/soul2/demo/dto/SubjectItemRefDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/SubjectItemRefDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto; +package cn.soul2.jyjc.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/base/PageParams.java b/src/main/java/cn/soul2/jyjc/admin/dto/base/PageParams.java similarity index 86% rename from src/main/java/cn/soul2/demo/dto/base/PageParams.java rename to src/main/java/cn/soul2/jyjc/admin/dto/base/PageParams.java index b361bad..680c917 100644 --- a/src/main/java/cn/soul2/demo/dto/base/PageParams.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/base/PageParams.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto.base; +package cn.soul2.jyjc.admin.dto.base; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/dto/base/UpdateStatusDTO.java b/src/main/java/cn/soul2/jyjc/admin/dto/base/UpdateStatusDTO.java similarity index 88% rename from src/main/java/cn/soul2/demo/dto/base/UpdateStatusDTO.java rename to src/main/java/cn/soul2/jyjc/admin/dto/base/UpdateStatusDTO.java index 00212b1..61ab4e4 100644 --- a/src/main/java/cn/soul2/demo/dto/base/UpdateStatusDTO.java +++ b/src/main/java/cn/soul2/jyjc/admin/dto/base/UpdateStatusDTO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.dto.base; +package cn.soul2.jyjc.admin.dto.base; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/entity/AnswerDetailsDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/AnswerDetailsDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/AnswerDetailsDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/AnswerDetailsDO.java index 3f720e5..6078772 100644 --- a/src/main/java/cn/soul2/demo/entity/AnswerDetailsDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/AnswerDetailsDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/AnswerSheetDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/AnswerSheetDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/AnswerSheetDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/AnswerSheetDO.java index 98d9091..a822660 100644 --- a/src/main/java/cn/soul2/demo/entity/AnswerSheetDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/AnswerSheetDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/DataTableDemoDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/DataTableDemoDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/DataTableDemoDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/DataTableDemoDO.java index cef3da0..b04aaf0 100644 --- a/src/main/java/cn/soul2/demo/entity/DataTableDemoDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/DataTableDemoDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/ExternalBackhaulDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/ExternalBackhaulDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/ExternalBackhaulDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/ExternalBackhaulDO.java index c8a3964..095f763 100644 --- a/src/main/java/cn/soul2/demo/entity/ExternalBackhaulDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/ExternalBackhaulDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/QrDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/QrDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/QrDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/QrDO.java index 2d09eba..f799db6 100644 --- a/src/main/java/cn/soul2/demo/entity/QrDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/QrDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/QuestionnaireDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/QuestionnaireDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/QuestionnaireDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/QuestionnaireDO.java index 5bab683..0d09309 100644 --- a/src/main/java/cn/soul2/demo/entity/QuestionnaireDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/QuestionnaireDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/RefQuestionnaireSubjectDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/RefQuestionnaireSubjectDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/RefQuestionnaireSubjectDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/RefQuestionnaireSubjectDO.java index 628e280..2f8eea8 100644 --- a/src/main/java/cn/soul2/demo/entity/RefQuestionnaireSubjectDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/RefQuestionnaireSubjectDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/RefSubjectItemsDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/RefSubjectItemsDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/RefSubjectItemsDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/RefSubjectItemsDO.java index d9576ea..18725d0 100644 --- a/src/main/java/cn/soul2/demo/entity/RefSubjectItemsDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/RefSubjectItemsDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/SubjectDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/SubjectDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/SubjectDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/SubjectDO.java index e6b5fa5..d4abd9a 100644 --- a/src/main/java/cn/soul2/demo/entity/SubjectDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/SubjectDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/SubjectItemsDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/SubjectItemsDO.java similarity index 97% rename from src/main/java/cn/soul2/demo/entity/SubjectItemsDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/SubjectItemsDO.java index c298335..dc43e7f 100644 --- a/src/main/java/cn/soul2/demo/entity/SubjectItemsDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/SubjectItemsDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity; +package cn.soul2.jyjc.admin.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/src/main/java/cn/soul2/demo/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java similarity index 87% rename from src/main/java/cn/soul2/demo/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java index 317344f..619fbf2 100644 --- a/src/main/java/cn/soul2/demo/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/RefQuestionnaireSubjectUseCountDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity.sqlresult; +package cn.soul2.jyjc.admin.entity.sqlresult; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/entity/sqlresult/SubjectChooseListDO.java b/src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/SubjectChooseListDO.java similarity index 93% rename from src/main/java/cn/soul2/demo/entity/sqlresult/SubjectChooseListDO.java rename to src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/SubjectChooseListDO.java index db813b4..6d9ebd8 100644 --- a/src/main/java/cn/soul2/demo/entity/sqlresult/SubjectChooseListDO.java +++ b/src/main/java/cn/soul2/jyjc/admin/entity/sqlresult/SubjectChooseListDO.java @@ -1,4 +1,4 @@ -package cn.soul2.demo.entity.sqlresult; +package cn.soul2.jyjc.admin.entity.sqlresult; import lombok.Data; import lombok.experimental.Accessors; diff --git a/src/main/java/cn/soul2/demo/mapper/AnswerDetailsMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/AnswerDetailsMapper.java similarity index 73% rename from src/main/java/cn/soul2/demo/mapper/AnswerDetailsMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/AnswerDetailsMapper.java index a8c9c68..93ebe5d 100644 --- a/src/main/java/cn/soul2/demo/mapper/AnswerDetailsMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/AnswerDetailsMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.AnswerDetailsDO; +import cn.soul2.jyjc.admin.entity.AnswerDetailsDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/AnswerSheetMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/AnswerSheetMapper.java similarity index 73% rename from src/main/java/cn/soul2/demo/mapper/AnswerSheetMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/AnswerSheetMapper.java index 6437c0f..93013cf 100644 --- a/src/main/java/cn/soul2/demo/mapper/AnswerSheetMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/AnswerSheetMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.AnswerSheetDO; +import cn.soul2.jyjc.admin.entity.AnswerSheetDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/DataTableDemoMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/DataTableDemoMapper.java similarity index 76% rename from src/main/java/cn/soul2/demo/mapper/DataTableDemoMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/DataTableDemoMapper.java index 4f38cc6..362d206 100644 --- a/src/main/java/cn/soul2/demo/mapper/DataTableDemoMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/DataTableDemoMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.DataTableDemoDO; +import cn.soul2.jyjc.admin.entity.DataTableDemoDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/soul2/demo/mapper/ExternalBackhaulMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/ExternalBackhaulMapper.java similarity index 74% rename from src/main/java/cn/soul2/demo/mapper/ExternalBackhaulMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/ExternalBackhaulMapper.java index 538bec5..f3806ca 100644 --- a/src/main/java/cn/soul2/demo/mapper/ExternalBackhaulMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/ExternalBackhaulMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.ExternalBackhaulDO; +import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/QrMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/QrMapper.java similarity index 78% rename from src/main/java/cn/soul2/demo/mapper/QrMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/QrMapper.java index e890bbd..6514e90 100644 --- a/src/main/java/cn/soul2/demo/mapper/QrMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/QrMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.QrDO; +import cn.soul2.jyjc.admin.entity.QrDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/cn/soul2/demo/mapper/QuestionnaireMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/QuestionnaireMapper.java similarity index 76% rename from src/main/java/cn/soul2/demo/mapper/QuestionnaireMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/QuestionnaireMapper.java index e01c497..19578eb 100644 --- a/src/main/java/cn/soul2/demo/mapper/QuestionnaireMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/QuestionnaireMapper.java @@ -1,7 +1,7 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.QuestionnaireDO; -import cn.soul2.demo.vo.QuestionnaireVO; +import cn.soul2.jyjc.admin.entity.QuestionnaireDO; +import cn.soul2.jyjc.admin.vo.QuestionnaireVO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -26,7 +26,7 @@ public interface QuestionnaireMapper extends BaseMapper { * @param wrapper 查询条件 * @return {@link IPage}<{@link QuestionnaireVO}> */ - @Select("select a.*, IFNULL(r.has_subject_count,0) as has_subject_count from (SELECT * FROM tb_questionnaire WHERE removed=0) a left join (select qn_id, count(subject_id) as has_subject_count from tb_ref_questionnaire_subject WHERE removed=0) r on a.id=r.qn_id " + + @Select("select a.*, IFNULL(r.has_subject_count,0) as has_subject_count from (SELECT * FROM tb_questionnaire WHERE removed=0) a left join (select max(qn_id) as qn_id, count(subject_id) as has_subject_count from tb_ref_questionnaire_subject WHERE removed=0) r on a.id=r.qn_id " + "${ew.customSqlSegment}") IPage page(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/src/main/java/cn/soul2/demo/mapper/RefQuestionnaireSubjectMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/RefQuestionnaireSubjectMapper.java similarity index 73% rename from src/main/java/cn/soul2/demo/mapper/RefQuestionnaireSubjectMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/RefQuestionnaireSubjectMapper.java index c5ad2a7..9ee7c57 100644 --- a/src/main/java/cn/soul2/demo/mapper/RefQuestionnaireSubjectMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/RefQuestionnaireSubjectMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.RefQuestionnaireSubjectDO; +import cn.soul2.jyjc.admin.entity.RefQuestionnaireSubjectDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/RefSubjectItemsMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/RefSubjectItemsMapper.java similarity index 73% rename from src/main/java/cn/soul2/demo/mapper/RefSubjectItemsMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/RefSubjectItemsMapper.java index da24749..b26668e 100644 --- a/src/main/java/cn/soul2/demo/mapper/RefSubjectItemsMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/RefSubjectItemsMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.RefSubjectItemsDO; +import cn.soul2.jyjc.admin.entity.RefSubjectItemsDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/SubjectItemsMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/SubjectItemsMapper.java similarity index 73% rename from src/main/java/cn/soul2/demo/mapper/SubjectItemsMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/SubjectItemsMapper.java index 411d0e8..314c4ab 100644 --- a/src/main/java/cn/soul2/demo/mapper/SubjectItemsMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/SubjectItemsMapper.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.SubjectItemsDO; +import cn.soul2.jyjc.admin.entity.SubjectItemsDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/cn/soul2/demo/mapper/SubjectMapper.java b/src/main/java/cn/soul2/jyjc/admin/mapper/SubjectMapper.java similarity index 80% rename from src/main/java/cn/soul2/demo/mapper/SubjectMapper.java rename to src/main/java/cn/soul2/jyjc/admin/mapper/SubjectMapper.java index 5befbbe..f20a753 100644 --- a/src/main/java/cn/soul2/demo/mapper/SubjectMapper.java +++ b/src/main/java/cn/soul2/jyjc/admin/mapper/SubjectMapper.java @@ -1,7 +1,7 @@ -package cn.soul2.demo.mapper; +package cn.soul2.jyjc.admin.mapper; -import cn.soul2.demo.entity.SubjectDO; -import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO; +import cn.soul2.jyjc.admin.entity.SubjectDO; +import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,7 +27,7 @@ public interface SubjectMapper extends BaseMapper { * @param qnId 问卷id * @return {@link IPage}<{@link SubjectChooseListDO}> */ - @Select("select a.id, ifnull(r.use_count, 0) as use_count, a.content, a.sort, a.title, a.type, (CASE WHEN EXISTS (SELECT 1 FROM tb_ref_questionnaire_subject WHERE removed = 0 and qn_id = #{qnId} AND subject_id = a.id) THEN 1 ELSE 0 END) AS selected from (select * from tb_subject WHERE removed = 0) a left join (select subject_id, count(qn_id) as use_count from tb_ref_questionnaire_subject WHERE removed = 0) r on a.id=r.subject_id " + + @Select("select a.id, ifnull(r.use_count, 0) as use_count, a.content, a.sort, a.title, a.type, (CASE WHEN EXISTS (SELECT 1 FROM tb_ref_questionnaire_subject WHERE removed = 0 and qn_id = #{qnId} AND subject_id = a.id) THEN 1 ELSE 0 END) AS selected from (select * from tb_subject WHERE removed = 0) a left join (select min(subject_id) subject_id, count(qn_id) as use_count from tb_ref_questionnaire_subject WHERE removed = 0) r on a.id=r.subject_id " + "${ew.customSqlSegment}") IPage useCounts(IPage page, @Param(Constants.WRAPPER) Wrapper wrapper, String qnId); diff --git a/src/main/java/cn/soul2/demo/repository/IAnswerDetailsRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IAnswerDetailsRepository.java similarity index 85% rename from src/main/java/cn/soul2/demo/repository/IAnswerDetailsRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IAnswerDetailsRepository.java index 10d7c9c..db1751f 100644 --- a/src/main/java/cn/soul2/demo/repository/IAnswerDetailsRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IAnswerDetailsRepository.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.entity.AnswerDetailsDO; +import cn.soul2.jyjc.admin.entity.AnswerDetailsDO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/IAnswerSheetRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IAnswerSheetRepository.java similarity index 74% rename from src/main/java/cn/soul2/demo/repository/IAnswerSheetRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IAnswerSheetRepository.java index 06aecfb..e1b0e1b 100644 --- a/src/main/java/cn/soul2/demo/repository/IAnswerSheetRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IAnswerSheetRepository.java @@ -1,9 +1,9 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.AnswerPageQueryDTO; -import cn.soul2.demo.entity.AnswerSheetDO; -import cn.soul2.demo.vo.AnswerSheetVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.AnswerPageQueryDTO; +import cn.soul2.jyjc.admin.entity.AnswerSheetDO; +import cn.soul2.jyjc.admin.vo.AnswerSheetVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IDataTableDemoRepository.java similarity index 64% rename from src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IDataTableDemoRepository.java index b36bd5a..5771a0b 100644 --- a/src/main/java/cn/soul2/demo/repository/IDataTableDemoRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IDataTableDemoRepository.java @@ -1,9 +1,9 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.DemoDTO; -import cn.soul2.demo.dto.DemoSaveOrUpdateDTO; -import cn.soul2.demo.entity.DataTableDemoDO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.DemoDTO; +import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO; +import cn.soul2.jyjc.admin.entity.DataTableDemoDO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/IExternalBackhaulRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IExternalBackhaulRepository.java similarity index 77% rename from src/main/java/cn/soul2/demo/repository/IExternalBackhaulRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IExternalBackhaulRepository.java index b820ae4..c54a38b 100644 --- a/src/main/java/cn/soul2/demo/repository/IExternalBackhaulRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IExternalBackhaulRepository.java @@ -1,9 +1,9 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.ExternalBackhaulDTO; -import cn.soul2.demo.entity.ExternalBackhaulDO; -import cn.soul2.demo.vo.ExternalBackhaulVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.ExternalBackhaulDTO; +import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO; +import cn.soul2.jyjc.admin.vo.ExternalBackhaulVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/src/main/java/cn/soul2/demo/repository/IQrRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IQrRepository.java similarity index 67% rename from src/main/java/cn/soul2/demo/repository/IQrRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IQrRepository.java index 1a62699..9e4dcab 100644 --- a/src/main/java/cn/soul2/demo/repository/IQrRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IQrRepository.java @@ -1,9 +1,9 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.QrDTO; -import cn.soul2.demo.entity.QrDO; -import cn.soul2.demo.vo.QrVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QrDTO; +import cn.soul2.jyjc.admin.entity.QrDO; +import cn.soul2.jyjc.admin.vo.QrVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/IQuestionnaireRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IQuestionnaireRepository.java similarity index 58% rename from src/main/java/cn/soul2/demo/repository/IQuestionnaireRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IQuestionnaireRepository.java index 8460822..5a41589 100644 --- a/src/main/java/cn/soul2/demo/repository/IQuestionnaireRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IQuestionnaireRepository.java @@ -1,10 +1,10 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.QuestionnaireDTO; -import cn.soul2.demo.dto.base.UpdateStatusDTO; -import cn.soul2.demo.entity.QuestionnaireDO; -import cn.soul2.demo.vo.QuestionnaireVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QuestionnaireDTO; +import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO; +import cn.soul2.jyjc.admin.entity.QuestionnaireDO; +import cn.soul2.jyjc.admin.vo.QuestionnaireVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/cn/soul2/demo/repository/IRefQuestionnaireSubjectRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IRefQuestionnaireSubjectRepository.java similarity index 74% rename from src/main/java/cn/soul2/demo/repository/IRefQuestionnaireSubjectRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IRefQuestionnaireSubjectRepository.java index e45ef2e..e6922c3 100644 --- a/src/main/java/cn/soul2/demo/repository/IRefQuestionnaireSubjectRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IRefQuestionnaireSubjectRepository.java @@ -1,8 +1,8 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.QnSubjectRefSaveDTO; -import cn.soul2.demo.entity.RefQuestionnaireSubjectDO; -import cn.soul2.demo.entity.SubjectDO; +import cn.soul2.jyjc.admin.dto.QnSubjectRefSaveDTO; +import cn.soul2.jyjc.admin.entity.RefQuestionnaireSubjectDO; +import cn.soul2.jyjc.admin.entity.SubjectDO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/IRefSubjectItemsRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/IRefSubjectItemsRepository.java similarity index 87% rename from src/main/java/cn/soul2/demo/repository/IRefSubjectItemsRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/IRefSubjectItemsRepository.java index 638de27..e5a0110 100644 --- a/src/main/java/cn/soul2/demo/repository/IRefSubjectItemsRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/IRefSubjectItemsRepository.java @@ -1,8 +1,8 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.SubjectItemRefDTO; -import cn.soul2.demo.entity.RefSubjectItemsDO; -import cn.soul2.demo.entity.SubjectItemsDO; +import cn.soul2.jyjc.admin.dto.SubjectItemRefDTO; +import cn.soul2.jyjc.admin.entity.RefSubjectItemsDO; +import cn.soul2.jyjc.admin.entity.SubjectItemsDO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/ISubjectItemsRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/ISubjectItemsRepository.java similarity index 91% rename from src/main/java/cn/soul2/demo/repository/ISubjectItemsRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/ISubjectItemsRepository.java index 42a6e80..c0cb4a1 100644 --- a/src/main/java/cn/soul2/demo/repository/ISubjectItemsRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/ISubjectItemsRepository.java @@ -1,6 +1,6 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.entity.SubjectItemsDO; +import cn.soul2.jyjc.admin.entity.SubjectItemsDO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/ISubjectRepository.java b/src/main/java/cn/soul2/jyjc/admin/repository/ISubjectRepository.java similarity index 75% rename from src/main/java/cn/soul2/demo/repository/ISubjectRepository.java rename to src/main/java/cn/soul2/jyjc/admin/repository/ISubjectRepository.java index bd80214..a2ea17e 100644 --- a/src/main/java/cn/soul2/demo/repository/ISubjectRepository.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/ISubjectRepository.java @@ -1,12 +1,12 @@ -package cn.soul2.demo.repository; +package cn.soul2.jyjc.admin.repository; -import cn.soul2.demo.dto.QnSubjectRefItemDTO; -import cn.soul2.demo.dto.SubjectDTO; -import cn.soul2.demo.dto.base.UpdateStatusDTO; -import cn.soul2.demo.entity.SubjectDO; -import cn.soul2.demo.entity.sqlresult.SubjectChooseListDO; -import cn.soul2.demo.vo.SubjectVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QnSubjectRefItemDTO; +import cn.soul2.jyjc.admin.dto.SubjectDTO; +import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO; +import cn.soul2.jyjc.admin.entity.SubjectDO; +import cn.soul2.jyjc.admin.entity.sqlresult.SubjectChooseListDO; +import cn.soul2.jyjc.admin.vo.SubjectVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.Collection; diff --git a/src/main/java/cn/soul2/demo/repository/impl/AnswerDetailsRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerDetailsRepositoryImpl.java similarity index 82% rename from src/main/java/cn/soul2/demo/repository/impl/AnswerDetailsRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerDetailsRepositoryImpl.java index 30b505e..1fea32d 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/AnswerDetailsRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerDetailsRepositoryImpl.java @@ -1,8 +1,8 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.entity.AnswerDetailsDO; -import cn.soul2.demo.mapper.AnswerDetailsMapper; -import cn.soul2.demo.repository.IAnswerDetailsRepository; +import cn.soul2.jyjc.admin.entity.AnswerDetailsDO; +import cn.soul2.jyjc.admin.mapper.AnswerDetailsMapper; +import cn.soul2.jyjc.admin.repository.IAnswerDetailsRepository; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/cn/soul2/demo/repository/impl/AnswerSheetRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerSheetRepositoryImpl.java similarity index 86% rename from src/main/java/cn/soul2/demo/repository/impl/AnswerSheetRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerSheetRepositoryImpl.java index 587d1e4..be37efe 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/AnswerSheetRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/AnswerSheetRepositoryImpl.java @@ -1,19 +1,19 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.dto.AnswerPageQueryDTO; -import cn.soul2.demo.entity.AnswerDetailsDO; -import cn.soul2.demo.entity.AnswerSheetDO; -import cn.soul2.demo.entity.QrDO; -import cn.soul2.demo.entity.QuestionnaireDO; -import cn.soul2.demo.mapper.AnswerSheetMapper; -import cn.soul2.demo.repository.IAnswerDetailsRepository; -import cn.soul2.demo.repository.IAnswerSheetRepository; -import cn.soul2.demo.repository.IQrRepository; -import cn.soul2.demo.repository.IQuestionnaireRepository; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.AnswerDetailsVO; -import cn.soul2.demo.vo.AnswerSheetVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.AnswerPageQueryDTO; +import cn.soul2.jyjc.admin.entity.AnswerDetailsDO; +import cn.soul2.jyjc.admin.entity.AnswerSheetDO; +import cn.soul2.jyjc.admin.entity.QrDO; +import cn.soul2.jyjc.admin.entity.QuestionnaireDO; +import cn.soul2.jyjc.admin.mapper.AnswerSheetMapper; +import cn.soul2.jyjc.admin.repository.IAnswerDetailsRepository; +import cn.soul2.jyjc.admin.repository.IAnswerSheetRepository; +import cn.soul2.jyjc.admin.repository.IQrRepository; +import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.AnswerDetailsVO; +import cn.soul2.jyjc.admin.vo.AnswerSheetVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/cn/soul2/demo/repository/impl/DataTableDemoRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/DataTableDemoRepositoryImpl.java similarity index 81% rename from src/main/java/cn/soul2/demo/repository/impl/DataTableDemoRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/DataTableDemoRepositoryImpl.java index d534d15..10b9772 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/DataTableDemoRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/DataTableDemoRepositoryImpl.java @@ -1,12 +1,12 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.dto.DemoDTO; -import cn.soul2.demo.dto.DemoSaveOrUpdateDTO; -import cn.soul2.demo.entity.DataTableDemoDO; -import cn.soul2.demo.mapper.DataTableDemoMapper; -import cn.soul2.demo.repository.IDataTableDemoRepository; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.DemoDTO; +import cn.soul2.jyjc.admin.dto.DemoSaveOrUpdateDTO; +import cn.soul2.jyjc.admin.entity.DataTableDemoDO; +import cn.soul2.jyjc.admin.mapper.DataTableDemoMapper; +import cn.soul2.jyjc.admin.repository.IDataTableDemoRepository; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/cn/soul2/demo/repository/impl/ExternalBackhaulRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/ExternalBackhaulRepositoryImpl.java similarity index 80% rename from src/main/java/cn/soul2/demo/repository/impl/ExternalBackhaulRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/ExternalBackhaulRepositoryImpl.java index d85f5a2..0e47baa 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/ExternalBackhaulRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/ExternalBackhaulRepositoryImpl.java @@ -1,12 +1,12 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.dto.ExternalBackhaulDTO; -import cn.soul2.demo.entity.ExternalBackhaulDO; -import cn.soul2.demo.mapper.ExternalBackhaulMapper; -import cn.soul2.demo.repository.IExternalBackhaulRepository; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.ExternalBackhaulVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.ExternalBackhaulDTO; +import cn.soul2.jyjc.admin.entity.ExternalBackhaulDO; +import cn.soul2.jyjc.admin.mapper.ExternalBackhaulMapper; +import cn.soul2.jyjc.admin.repository.IExternalBackhaulRepository; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.ExternalBackhaulVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/cn/soul2/demo/repository/impl/QrRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/QrRepositoryImpl.java similarity index 86% rename from src/main/java/cn/soul2/demo/repository/impl/QrRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/QrRepositoryImpl.java index 54a0844..554c459 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/QrRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/QrRepositoryImpl.java @@ -1,12 +1,12 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.dto.QrDTO; -import cn.soul2.demo.entity.QrDO; -import cn.soul2.demo.mapper.QrMapper; -import cn.soul2.demo.repository.IQrRepository; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.QrVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QrDTO; +import cn.soul2.jyjc.admin.entity.QrDO; +import cn.soul2.jyjc.admin.mapper.QrMapper; +import cn.soul2.jyjc.admin.repository.IQrRepository; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.QrVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; diff --git a/src/main/java/cn/soul2/demo/repository/impl/QuestionnaireRepositoryImpl.java b/src/main/java/cn/soul2/jyjc/admin/repository/impl/QuestionnaireRepositoryImpl.java similarity index 83% rename from src/main/java/cn/soul2/demo/repository/impl/QuestionnaireRepositoryImpl.java rename to src/main/java/cn/soul2/jyjc/admin/repository/impl/QuestionnaireRepositoryImpl.java index a96b0f2..0acbbce 100644 --- a/src/main/java/cn/soul2/demo/repository/impl/QuestionnaireRepositoryImpl.java +++ b/src/main/java/cn/soul2/jyjc/admin/repository/impl/QuestionnaireRepositoryImpl.java @@ -1,13 +1,13 @@ -package cn.soul2.demo.repository.impl; +package cn.soul2.jyjc.admin.repository.impl; -import cn.soul2.demo.dto.QuestionnaireDTO; -import cn.soul2.demo.dto.base.UpdateStatusDTO; -import cn.soul2.demo.entity.QuestionnaireDO; -import cn.soul2.demo.mapper.QuestionnaireMapper; -import cn.soul2.demo.repository.IQuestionnaireRepository; -import cn.soul2.demo.utils.base.PageUtils; -import cn.soul2.demo.vo.QuestionnaireVO; -import cn.soul2.demo.vo.base.VPage; +import cn.soul2.jyjc.admin.dto.QuestionnaireDTO; +import cn.soul2.jyjc.admin.dto.base.UpdateStatusDTO; +import cn.soul2.jyjc.admin.entity.QuestionnaireDO; +import cn.soul2.jyjc.admin.mapper.QuestionnaireMapper; +import cn.soul2.jyjc.admin.repository.IQuestionnaireRepository; +import cn.soul2.jyjc.admin.utils.base.PageUtils; +import cn.soul2.jyjc.admin.vo.QuestionnaireVO; +import cn.soul2.jyjc.admin.vo.base.VPage; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -57,7 +57,7 @@ public class QuestionnaireRepositoryImpl extends ServiceImpl