From 8249edb0ef29c4a1d26d0c234666d9613f18b8c1 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sat, 20 Apr 2024 15:23:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=93=E5=8C=BA=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E7=AD=89=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kqapi/src/main/java/com/ningdatech/kqapi/App.java | 2 +- .../kqapi/admin/controller/WindowController.java | 61 +++ .../kqapi/admin/controller/ZoneController.java | 60 +++ .../kqapi/admin/manage/WindowManage.java | 84 ++++ .../ningdatech/kqapi/admin/manage/ZoneManage.java | 102 +++++ .../kqapi/admin/mapper/WindowMapper.java | 23 ++ .../ningdatech/kqapi/admin/mapper/WindowMapper.xml | 13 + .../ningdatech/kqapi/admin/mapper/ZoneMapper.java | 16 + .../ningdatech/kqapi/admin/mapper/ZoneMapper.xml | 5 + .../admin/model/dto/WindowCountByZoneIdDTO.java | 20 + .../kqapi/admin/model/entity/Window.java | 54 +++ .../ningdatech/kqapi/admin/model/entity/Zone.java | 52 +++ .../kqapi/admin/model/req/ListWindowReq.java | 26 ++ .../kqapi/admin/model/req/ListZoneReq.java | 23 ++ .../kqapi/admin/model/req/WindowSaveReq.java | 29 ++ .../kqapi/admin/model/req/ZoneSaveReq.java | 26 ++ .../kqapi/admin/model/vo/WindowDetailVO.java | 34 ++ .../kqapi/admin/model/vo/ZoneDetailVO.java | 31 ++ .../kqapi/admin/service/IWindowService.java | 21 + .../kqapi/admin/service/IZoneService.java | 16 + .../admin/service/impl/WindowServiceImpl.java | 38 ++ .../kqapi/admin/service/impl/ZoneServiceImpl.java | 20 + .../ningdatech/kqapi/common/config/BeanConfig.java | 11 +- .../ningdatech/kqapi/common/constant/BizConst.java | 7 +- .../kqapi/common/handler/BaseFieldFillHandler.java | 49 +++ .../common/handler/GlobalExceptionHandler.java | 9 +- .../common/handler/GlobalResponseHandler.java | 32 +- .../kqapi/common/helper/MatterCacheHelper.java | 3 +- .../helper/basic/AbstractMatterCacheHelper.java | 8 +- .../common/helper/impl/MattersCacheHelperImpl.java | 2 +- .../ningdatech/kqapi/common/util/SpringUtils.java | 95 ----- .../kqapi/scheduler/manage/SynManage.java | 13 +- .../kqapi/scheduler/task/CheckMattersUrlTask.java | 9 +- .../kqapi/scheduler/task/RemoveMattersTask.java | 2 +- .../ningdatech/kqapi/scheduler/task/SynTask.java | 10 +- ...SxAdsShareItemQltQlsxCommonIDVKqController.java | 4 +- .../zzsfw/controller/NdKqZzsfwMenuController.java | 11 +- .../controller/PolicyRegulationsController.java | 4 +- .../DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java | 417 -------------------- .../entity/dto/NdKqZzsfwMattersDeduplicateDTO.java | 35 -- .../kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java | 50 --- .../kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java | 56 --- .../entity/ComponentsMatterEliminateEntity.java | 44 --- .../DscSxAdsShareItemQltQlsxCommonIDVKq.java | 422 --------------------- .../kqapi/zzsfw/entity/entity/MatterKey.java | 24 -- .../entity/entity/NdKqZzsfwMattersDeduplicate.java | 51 --- .../kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java | 69 ---- .../kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java | 64 ---- .../kqapi/zzsfw/entity/vo/MatterTopVO.java | 31 -- .../kqapi/zzsfw/entity/vo/MattersVO.java | 49 --- .../kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java | 59 --- .../ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java | 56 --- .../ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java | 29 -- .../ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java | 29 -- .../kqapi/zzsfw/manage/MatterManage.java | 20 +- .../kqapi/zzsfw/manage/PolicyManage.java | 6 +- .../ningdatech/kqapi/zzsfw/manage/QlManage.java | 16 +- .../mapper/ComponentsMatterEliminateMapper.java | 2 +- .../DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java | 2 +- .../mapper/NdKqZzsfwMatterDeduplicateMapper.java | 2 +- .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java | 2 +- .../kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java | 3 +- .../DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java | 417 ++++++++++++++++++++ .../model/dto/NdKqZzsfwMattersDeduplicateDTO.java | 35 ++ .../kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java | 50 +++ .../kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java | 56 +++ .../entity/ComponentsMatterEliminateEntity.java | 43 +++ .../DscSxAdsShareItemQltQlsxCommonIDVKq.java | 422 +++++++++++++++++++++ .../kqapi/zzsfw/model/entity/MatterKey.java | 24 ++ .../model/entity/NdKqZzsfwMattersDeduplicate.java | 51 +++ .../kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java | 69 ++++ .../kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java | 64 ++++ .../kqapi/zzsfw/model/vo/MatterTopVO.java | 31 ++ .../ningdatech/kqapi/zzsfw/model/vo/MattersVO.java | 49 +++ .../kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java | 59 +++ .../ningdatech/kqapi/zzsfw/model/vo/TreeVO.java | 56 +++ .../ningdatech/kqapi/zzsfw/model/vo/WindowVO.java | 29 ++ .../ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java | 29 ++ .../service/ComponentsMatterEliminateService.java | 2 +- ...DscSxAdsShareItemQltQlsxCommonIDVKqService.java | 2 +- .../INdKqZzsfwMatterDeduplicateService.java | 2 +- .../kqapi/zzsfw/service/INdKqZzsfwMenuService.java | 2 +- .../zzsfw/service/INdKqZzsfwPolicyService.java | 2 +- .../impl/ComponentsMatterEliminateServiceImpl.java | 2 +- ...xAdsShareItemQltQlsxCommonIDVKqServiceImpl.java | 2 +- .../NdKqZzsfwMatterDeduplicateServiceImpl.java | 2 +- .../service/impl/NdKqZzsfwMenuServiceImpl.java | 2 +- .../service/impl/NdKqZzsfwPolicyServiceImpl.java | 2 +- kqapi/src/main/resources/application-dev.yml | 1 + kqapi/src/main/resources/application-prod.yml | 1 + .../com/ningdatech/kqapi/menu/DuplicationTest.java | 4 +- .../java/com/ningdatech/kqapi/menu/MenuTest.java | 5 +- .../java/com/ningdatech/kqapi/menu/PolicyTest.java | 6 +- .../classes/BOOT-INF/classes/application-dev.yml | 1 + .../classes/BOOT-INF/classes/application-prod.yml | 1 + kqapi/target/classes/application-dev.yml | 1 + kqapi/target/classes/application-prod.yml | 1 + .../target/classes/com/ningdatech/kqapi/App.class | Bin 1774 -> 1767 bytes .../kqapi/common/config/BeanConfig.class | Bin 10279 -> 10279 bytes .../kqapi/common/constant/BizConst.class | Bin 2271 -> 1239 bytes .../common/handler/GlobalExceptionHandler.class | Bin 4835 -> 4835 bytes .../common/handler/GlobalResponseHandler.class | Bin 3505 -> 3472 bytes .../kqapi/common/helper/MatterCacheHelper.class | Bin 532 -> 530 bytes .../helper/basic/AbstractMatterCacheHelper.class | Bin 13563 -> 13543 bytes .../helper/impl/MattersCacheHelperImpl.class | Bin 1652 -> 1650 bytes .../kqapi/common/util/HmacAuthUtil.class | Bin 6958 -> 0 bytes .../kqapi/common/util/SpringUtils$1.class | Bin 247 -> 0 bytes .../util/SpringUtils$SpringUtilsHolder.class | Bin 830 -> 0 bytes .../ningdatech/kqapi/common/util/SpringUtils.class | Bin 3067 -> 0 bytes .../kqapi/scheduler/manage/SynManage.class | Bin 5469 -> 5454 bytes .../kqapi/scheduler/task/CheckMattersUrlTask.class | Bin 12580 -> 12576 bytes .../kqapi/scheduler/task/RemoveMattersTask.class | Bin 2886 -> 2885 bytes .../ningdatech/kqapi/scheduler/task/SynTask.class | Bin 15321 -> 15298 bytes .../ningdatech/kqapi/sso/utils/HmacAuthUtil.class | Bin 8633 -> 8759 bytes .../kqapi/zzsfw/constants/ZzsfwMenuConstant.class | Bin 579 -> 626 bytes ...xAdsShareItemQltQlsxCommonIDVKqController.class | Bin 1747 -> 1743 bytes .../zzsfw/controller/NdKqZzsfwMenuController.class | Bin 2501 -> 5107 bytes .../controller/PolicyRegulationsController.class | Bin 2549 -> 2544 bytes .../DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class | Bin 116401 -> 0 bytes .../dto/NdKqZzsfwMattersDeduplicateDTO.class | Bin 3448 -> 0 bytes .../kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.class | Bin 5780 -> 0 bytes .../zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class | Bin 6851 -> 0 bytes .../entity/ComponentsMatterEliminateEntity.class | Bin 3428 -> 0 bytes .../DscSxAdsShareItemQltQlsxCommonIDVKq.class | Bin 116731 -> 0 bytes .../kqapi/zzsfw/entity/entity/MatterKey.class | Bin 2139 -> 0 bytes .../entity/NdKqZzsfwMattersDeduplicate.class | Bin 4504 -> 0 bytes .../kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class | Bin 6486 -> 0 bytes .../zzsfw/entity/entity/NdKqZzsfwPolicy.class | Bin 7574 -> 0 bytes .../kqapi/zzsfw/entity/vo/MatterTopVO.class | Bin 2816 -> 0 bytes .../kqapi/zzsfw/entity/vo/MattersVO.class | Bin 3247 -> 0 bytes .../kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.class | Bin 7371 -> 0 bytes .../ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class | Bin 4317 -> 0 bytes .../kqapi/zzsfw/entity/vo/WindowVO.class | Bin 2613 -> 0 bytes .../ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.class | Bin 2577 -> 0 bytes .../kqapi/zzsfw/manage/MatterManage.class | Bin 11898 -> 23904 bytes .../kqapi/zzsfw/manage/PolicyManage.class | Bin 7134 -> 7118 bytes .../ningdatech/kqapi/zzsfw/manage/QlManage.class | Bin 4246 -> 4238 bytes .../mapper/ComponentsMatterEliminateMapper.class | Bin 398 -> 397 bytes ...DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class | Bin 422 -> 421 bytes .../mapper/NdKqZzsfwMatterDeduplicateMapper.class | Bin 396 -> 395 bytes .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class | Bin 356 -> 355 bytes .../kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class | Bin 362 -> 361 bytes .../service/ComponentsMatterEliminateService.class | Bin 409 -> 408 bytes ...scSxAdsShareItemQltQlsxCommonIDVKqService.class | Bin 435 -> 434 bytes .../INdKqZzsfwMatterDeduplicateService.class | Bin 409 -> 408 bytes .../zzsfw/service/INdKqZzsfwMenuService.class | Bin 369 -> 368 bytes .../zzsfw/service/INdKqZzsfwPolicyService.class | Bin 375 -> 374 bytes .../ComponentsMatterEliminateServiceImpl.class | Bin 910 -> 909 bytes ...AdsShareItemQltQlsxCommonIDVKqServiceImpl.class | Bin 976 -> 975 bytes .../NdKqZzsfwMatterDeduplicateServiceImpl.class | Bin 914 -> 913 bytes .../service/impl/NdKqZzsfwMenuServiceImpl.class | Bin 822 -> 821 bytes .../service/impl/NdKqZzsfwPolicyServiceImpl.class | Bin 836 -> 835 bytes .../ningdatech/kqapi/menu/DuplicationTest.class | Bin 7082 -> 7073 bytes .../com/ningdatech/kqapi/menu/MenuTest.class | Bin 3735 -> 6961 bytes .../com/ningdatech/kqapi/menu/PolicyTest.class | Bin 4320 -> 4318 bytes .../com/ningdatech/generator/config/CodeGen.java | 64 ++++ .../config/GeneratorCodeKingbaseConfig.java | 63 --- 157 files changed, 2447 insertions(+), 1768 deletions(-) create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$SpringUtilsHolder.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.class create mode 100644 ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java delete mode 100644 ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/App.java b/kqapi/src/main/java/com/ningdatech/kqapi/App.java index 0daeacc..85ee652 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/App.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/App.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi; +import com.ningdatech.basic.util.SpringUtils; import com.ningdatech.kqapi.common.util.SpringContextHolder; -import com.ningdatech.kqapi.common.util.SpringUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java new file mode 100644 index 0000000..31c1807 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/WindowController.java @@ -0,0 +1,61 @@ +package com.ningdatech.kqapi.admin.controller; + + +import com.ningdatech.basic.model.IdVo; +import com.ningdatech.kqapi.admin.manage.WindowManage; +import com.ningdatech.kqapi.admin.model.req.ListWindowReq; +import com.ningdatech.kqapi.admin.model.req.WindowSaveReq; +import com.ningdatech.kqapi.admin.model.vo.WindowDetailVO; +import com.ningdatech.log.annotation.WebLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Api(tags = "窗口管理") +@RestController +@AllArgsConstructor +@RequestMapping("/api/v1/window") +public class WindowController { + + private final WindowManage windowManage; + + @PostMapping("/save") + @WebLog("窗口新增或修改") + @ApiOperation("窗口新增或修改") + public void saveOrUpdate(@RequestBody WindowSaveReq req) { + windowManage.windowSaveOrUpdate(req); + } + + @DeleteMapping("/del") + @WebLog("窗口删除") + @ApiOperation("窗口删除") + public void delete(@RequestBody IdVo id) { + windowManage.delete(id); + } + + @GetMapping("/page") + @WebLog("窗口列表") + @ApiOperation("窗口列表") + public void page(ListWindowReq req) { + windowManage.pageWindow(req); + } + + @GetMapping("/option") + @WebLog("窗口下拉选择") + @ApiOperation("窗口下拉选择") + public List option(ListWindowReq req) { + return windowManage.windowOption(req); + } + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java new file mode 100644 index 0000000..0bb196e --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/controller/ZoneController.java @@ -0,0 +1,60 @@ +package com.ningdatech.kqapi.admin.controller; + + +import com.ningdatech.basic.model.IdVo; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.kqapi.admin.manage.ZoneManage; +import com.ningdatech.kqapi.admin.model.req.ListZoneReq; +import com.ningdatech.kqapi.admin.model.req.ZoneSaveReq; +import com.ningdatech.kqapi.admin.model.vo.ZoneDetailVO; +import com.ningdatech.log.annotation.WebLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + *

+ * 前端控制器 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Api(tags = "专区管理") +@RestController +@AllArgsConstructor +@RequestMapping("/api/v1/zone") +public class ZoneController { + + private final ZoneManage zoneManage; + + @PostMapping("/save") + @WebLog("专区保存或修改") + @ApiOperation("专区保存或修改") + public void zoneSaveOrUpdate(@RequestBody ZoneSaveReq req) { + zoneManage.zoneSaveOrUpdate(req); + } + + @DeleteMapping("/del") + public void delete(@RequestBody IdVo id) { + zoneManage.delete(id); + } + + @GetMapping("/page") + @WebLog("专区列表") + @ApiOperation("专区列表") + public PageVo pageZone(ListZoneReq req) { + return zoneManage.pageZone(req); + } + + @GetMapping("/option") + @WebLog("专区下拉选择") + @ApiOperation("专区下拉选择") + public List zoneOption(ListZoneReq req) { + return zoneManage.zoneOption(req); + } + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java new file mode 100644 index 0000000..d46e69f --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java @@ -0,0 +1,84 @@ +package com.ningdatech.kqapi.admin.manage; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.IdVo; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.kqapi.admin.model.entity.Window; +import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.ningdatech.kqapi.admin.model.req.ListWindowReq; +import com.ningdatech.kqapi.admin.model.req.WindowSaveReq; +import com.ningdatech.kqapi.admin.model.vo.WindowDetailVO; +import com.ningdatech.kqapi.admin.service.IWindowService; +import com.ningdatech.kqapi.admin.service.IZoneService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * WindowManage + *

+ * + * @author WendyYang + * @since 12:17 2024/4/20 + */ +@Component +@RequiredArgsConstructor +public class WindowManage { + + private final IWindowService windowService; + private final IZoneService zoneService; + + public void windowSaveOrUpdate(WindowSaveReq req) { + Window win = BeanUtil.copyProperties(req, Window.class); + windowService.saveOrUpdate(win); + } + + public void delete(IdVo id) { + windowService.removeById(id.getId()); + } + + public PageVo pageWindow(ListWindowReq req) { + Wrapper query = buildWindowQuery(req); + Page page = windowService.page(req.page(), query); + if (page.getTotal() == 0) { + return PageVo.empty(); + } + List records = page.getRecords(); + List windowIds = CollUtils.fieldList(records, Window::getId); + List data = records.stream().map(w -> { + WindowDetailVO window = BeanUtil.copyProperties(w, WindowDetailVO.class); + window.setItemCount(0); + return window; + }).collect(Collectors.toList()); + return PageVo.of(data, page.getTotal()); + } + + public List windowOption(ListWindowReq req) { + Wrapper query = buildWindowQuery(req); + Page page = windowService.page(req.page(), query); + if (page.getTotal() == 0) { + return Collections.emptyList(); + } + return page.getRecords().stream().map(w -> WindowDetailVO.builder() + .windowName(w.getWindowName()) + .id(w.getId()) + .build()).collect(Collectors.toList()); + } + + private static Wrapper buildWindowQuery(ListWindowReq req) { + return Wrappers.lambdaQuery(Window.class) + .like(StrUtil.isNotBlank(req.getWindowName()), Window::getWindowName, req.getWindowName()) + .eq(req.getZoneId() != null, Window::getZoneId, req.getZoneId()) + .orderByDesc(Window::getUpdateOn); + } + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java new file mode 100644 index 0000000..4be4204 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/ZoneManage.java @@ -0,0 +1,102 @@ +package com.ningdatech.kqapi.admin.manage; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ningdatech.basic.model.IdVo; +import com.ningdatech.basic.model.PageVo; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.kqapi.admin.mapper.ZoneMapper; +import com.ningdatech.kqapi.admin.model.entity.Window; +import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.ningdatech.kqapi.admin.model.req.ListZoneReq; +import com.ningdatech.kqapi.admin.model.req.ZoneSaveReq; +import com.ningdatech.kqapi.admin.model.vo.ZoneDetailVO; +import com.ningdatech.kqapi.admin.service.IWindowService; +import com.ningdatech.kqapi.admin.service.IZoneService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * ZoneManage + *

+ * + * @author WendyYang + * @since 12:17 2024/4/20 + */ +@Component +@RequiredArgsConstructor +public class ZoneManage { + + private final IZoneService zoneService; + private final ZoneMapper zoneMapper; + private final IWindowService windowService; + + @Transactional(rollbackFor = Exception.class) + public synchronized void zoneSaveOrUpdate(ZoneSaveReq req) { + Zone zone = BeanUtil.copyProperties(req, Zone.class); + if (zone.getId() != null) { + Zone oldZone = zoneService.getById(req.getId()); + if (!StrUtil.equals(zone.getZoneName(), oldZone.getZoneName())) { + Wrapper wUpdate = Wrappers.lambdaUpdate(Window.class) + .set(Window::getZoneName, req.getZoneName()) + .eq(Window::getZoneId, req.getId()); + windowService.update(wUpdate); + } + } + zoneService.saveOrUpdate(zone); + } + + + public void delete(IdVo id) { + zoneService.removeById(id.getId()); + } + + public PageVo pageZone(ListZoneReq req) { + Wrapper query = buildZoneQuery(req); + Page page = zoneService.page(req.page(), query); + if (page.getTotal() == 0) { + return PageVo.empty(); + } + List records = page.getRecords(); + List zoneIds = CollUtils.fieldList(records, Zone::getId); + Map windowCountMap = windowService.windowCountByZoneIds(zoneIds); + List data = records.stream().map(w -> { + ZoneDetailVO zone = BeanUtil.copyProperties(w, ZoneDetailVO.class); + zone.setWindowCount(windowCountMap.getOrDefault(w.getId(), 0)); + return zone; + }).collect(Collectors.toList()); + return PageVo.of(data, page.getTotal()); + } + + public List zoneOption(ListZoneReq req) { + Wrapper query = buildZoneQuery(req); + Page page = zoneService.page(req.page(), query); + if (page.getTotal() == 0) { + return Collections.emptyList(); + } + return CollUtils.convert(page.getRecords(), + w -> ZoneDetailVO.builder() + .id(w.getId()) + .zoneName(w.getZoneName()) + .build()); + } + + private static Wrapper buildZoneQuery(ListZoneReq req) { + return Wrappers.lambdaQuery(Zone.class) + .like(StrUtil.isNotBlank(req.getZoneName()), Zone::getZoneName, req.getZoneName()) + .orderByDesc(Zone::getUpdateOn); + } + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java new file mode 100644 index 0000000..5831b18 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.java @@ -0,0 +1,23 @@ +package com.ningdatech.kqapi.admin.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.kqapi.admin.model.dto.WindowCountByZoneIdDTO; +import com.ningdatech.kqapi.admin.model.entity.Window; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +public interface WindowMapper extends BaseMapper { + + List selectWindowCountByZoneIds(@Param("zoneIds") Collection zoneIds); + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml new file mode 100644 index 0000000..93aef87 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/WindowMapper.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java new file mode 100644 index 0000000..3f08445 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.admin.mapper; + +import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + *

+ * Mapper 接口 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +public interface ZoneMapper extends BaseMapper { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml new file mode 100644 index 0000000..752a645 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/mapper/ZoneMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java new file mode 100644 index 0000000..0abf7a0 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/dto/WindowCountByZoneIdDTO.java @@ -0,0 +1,20 @@ +package com.ningdatech.kqapi.admin.model.dto; + +import lombok.Data; + +/** + *

+ * WindowCountByZoneIdDTO + *

+ * + * @author WendyYang + * @since 14:14 2024/4/20 + */ +@Data +public class WindowCountByZoneIdDTO { + + private Integer zoneId; + + private Integer windowCount; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java new file mode 100644 index 0000000..5f78af7 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Window.java @@ -0,0 +1,54 @@ +package com.ningdatech.kqapi.admin.model.entity; + +import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 窗口对象 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Data +@TableName("nd_window") +@ApiModel(value = "Window对象") +public class Window implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("窗口名称") + private String windowName; + + @ApiModelProperty("专区ID") + private Integer zoneId; + + @ApiModelProperty("专区名称") + private String zoneName; + + @TableLogic + private Boolean deleted; + + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createOn; + + @TableField(fill = FieldFill.INSERT) + private Long createBy; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateOn; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateBy; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java new file mode 100644 index 0000000..a5adbed --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/entity/Zone.java @@ -0,0 +1,52 @@ +package com.ningdatech.kqapi.admin.model.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.io.Serializable; +import java.time.LocalDateTime; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 专区对象 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Data +@TableName("nd_zone") +@ApiModel(value = "Zone对象") +public class Zone implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + @ApiModelProperty("专区名称") + private String zoneName; + + @ApiModelProperty("专区图标") + private String zoneIcon; + + @TableLogic + private Boolean deleted; + + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createOn; + + @TableField(fill = FieldFill.INSERT) + private Long createBy; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateOn; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateBy; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java new file mode 100644 index 0000000..05be92b --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListWindowReq.java @@ -0,0 +1,26 @@ +package com.ningdatech.kqapi.admin.model.req; + +import com.ningdatech.kqapi.common.model.PagePo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * WindowSaveReq + *

+ * + * @author WendyYang + * @since 13:25 2024/4/20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ListWindowReq extends PagePo { + + @ApiModelProperty("专区ID") + private Integer zoneId; + + @ApiModelProperty("窗口名称") + private String windowName; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java new file mode 100644 index 0000000..43c2b11 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ListZoneReq.java @@ -0,0 +1,23 @@ +package com.ningdatech.kqapi.admin.model.req; + +import com.ningdatech.kqapi.common.model.PagePo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * ListZoneReq + *

+ * + * @author WendyYang + * @since 13:25 2024/4/20 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ListZoneReq extends PagePo { + + @ApiModelProperty("专区名称") + private String zoneName; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java new file mode 100644 index 0000000..d71352f --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/WindowSaveReq.java @@ -0,0 +1,29 @@ +package com.ningdatech.kqapi.admin.model.req; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * WindowSaveReq + *

+ * + * @author WendyYang + * @since 13:25 2024/4/20 + */ +@Data +public class WindowSaveReq { + + @ApiModelProperty("窗口ID") + private Integer id; + + @ApiModelProperty("专区ID") + private Integer zoneId; + + @ApiModelProperty("专区名称") + private String zoneName; + + @ApiModelProperty("窗口名称") + private String windowName; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java new file mode 100644 index 0000000..b6ed691 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/req/ZoneSaveReq.java @@ -0,0 +1,26 @@ +package com.ningdatech.kqapi.admin.model.req; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * ZoneSaveReq + *

+ * + * @author WendyYang + * @since 13:25 2024/4/20 + */ +@Data +public class ZoneSaveReq { + + @ApiModelProperty("专区ID") + private Integer id; + + @ApiModelProperty("专区名称") + private String zoneName; + + @ApiModelProperty("专区图标") + private String zoneIcon; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java new file mode 100644 index 0000000..0bf29f5 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/WindowDetailVO.java @@ -0,0 +1,34 @@ +package com.ningdatech.kqapi.admin.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +/** + *

+ * WindowDetailVO + *

+ * + * @author WendyYang + * @since 13:47 2024/4/20 + */ +@Builder +@Data +public class WindowDetailVO { + + @ApiModelProperty("窗口ID") + private Integer id; + + @ApiModelProperty("窗口名称") + private String windowName; + + @ApiModelProperty("专区ID") + private Integer zoneId; + + @ApiModelProperty("专区名称") + private String zoneName; + + @ApiModelProperty("事项数量") + private Integer itemCount; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java new file mode 100644 index 0000000..011bcd8 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/model/vo/ZoneDetailVO.java @@ -0,0 +1,31 @@ +package com.ningdatech.kqapi.admin.model.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +/** + *

+ * ZoneDetailVO + *

+ * + * @author WendyYang + * @since 13:48 2024/4/20 + */ +@Data +@Builder +public class ZoneDetailVO { + + @ApiModelProperty("专区ID") + private Integer id; + + @ApiModelProperty("专区名称") + private String zoneName; + + @ApiModelProperty("专区图标") + private String zoneIcon; + + @ApiModelProperty("窗口数量") + private Integer windowCount; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java new file mode 100644 index 0000000..65a10a1 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IWindowService.java @@ -0,0 +1,21 @@ +package com.ningdatech.kqapi.admin.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.kqapi.admin.model.entity.Window; + +import java.util.Collection; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +public interface IWindowService extends IService { + + Map windowCountByZoneIds(Collection zoneIds); + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java new file mode 100644 index 0000000..17644a5 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/IZoneService.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.admin.service; + +import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 服务类 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +public interface IZoneService extends IService { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java new file mode 100644 index 0000000..f8d5746 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/WindowServiceImpl.java @@ -0,0 +1,38 @@ +package com.ningdatech.kqapi.admin.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.kqapi.admin.mapper.WindowMapper; +import com.ningdatech.kqapi.admin.model.dto.WindowCountByZoneIdDTO; +import com.ningdatech.kqapi.admin.model.entity.Window; +import com.ningdatech.kqapi.admin.service.IWindowService; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Service +public class WindowServiceImpl extends ServiceImpl implements IWindowService { + + @Override + public Map windowCountByZoneIds(Collection zoneIds) { + if (CollUtil.isEmpty(zoneIds)) { + return Collections.emptyMap(); + } + List counts = baseMapper.selectWindowCountByZoneIds(zoneIds); + return CollUtils.listToMap(counts, WindowCountByZoneIdDTO::getZoneId, + WindowCountByZoneIdDTO::getWindowCount); + } + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java new file mode 100644 index 0000000..ef69a5e --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/service/impl/ZoneServiceImpl.java @@ -0,0 +1,20 @@ +package com.ningdatech.kqapi.admin.service.impl; + +import com.ningdatech.kqapi.admin.model.entity.Zone; +import com.ningdatech.kqapi.admin.mapper.ZoneMapper; +import com.ningdatech.kqapi.admin.service.IZoneService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author WendyYang + * @since 2024-04-20 + */ +@Service +public class ZoneServiceImpl extends ServiceImpl implements IZoneService { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java index cc05b5a..7d5c11c 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/config/BeanConfig.java @@ -7,7 +7,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.ningdatech.kqapi.common.util.NdDateUtils; import com.ningdatech.kqapi.common.util.NdJacksonModule; -import com.ningdatech.kqapi.common.util.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.http.Header; import org.apache.http.client.HttpClient; @@ -21,11 +20,9 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; -import org.springframework.core.convert.converter.Converter; import org.springframework.http.MediaType; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.HttpComponentsClientHttpRequestFactory; @@ -33,16 +30,12 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; -import org.springframework.lang.NonNull; import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; import java.time.ZoneId; import java.util.*; import java.util.concurrent.TimeUnit; @@ -76,7 +69,7 @@ public class BeanConfig implements WebMvcConfigurer { converterList.remove(converterTarget); } HttpMessageConverter converter = new StringHttpMessageConverter(StandardCharsets.UTF_8); - converterList.add(1,converter); + converterList.add(1, converter); MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); mappingJackson2HttpMessageConverter.setSupportedMediaTypes(Arrays.asList( @@ -182,7 +175,7 @@ public class BeanConfig implements WebMvcConfigurer { } //解决跨域方式二 - static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE","OPTIONS"}; + static final String ORIGINS[] = new String[]{"GET", "POST", "PUT", "DELETE", "OPTIONS"}; @Override public void addCorsMappings(CorsRegistry registry) { diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java index 7dc6a93..0307599 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/constant/BizConst.java @@ -4,14 +4,17 @@ import com.ningdatech.kqapi.common.model.ApiResponse; /** *

- * 业务常量 + * BizConst *

* * @author WendyYang - * @since 13:42 2022/12/1 + * @since 11:46 2024/4/20 */ public class BizConst { + private BizConst() { + } + /** * SQL查询一条 */ diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java new file mode 100644 index 0000000..cf35c66 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/BaseFieldFillHandler.java @@ -0,0 +1,49 @@ +package com.ningdatech.kqapi.common.handler; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.ningdatech.kqapi.user.util.LoginUserUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +import static com.ningdatech.kqapi.common.constant.BaseFieldConst.*; + + +/** + *

+ * BaseFieldFillHandler + *

+ * + * @author WendyYang + * @since 14:36 2024/4/20 + */ +@Slf4j +@Component +public class BaseFieldFillHandler implements MetaObjectHandler { + + private Long getUserId() { + if (LoginUserUtil.isLogin()) { + return LoginUserUtil.getUserId(); + } + return 0L; + } + + @Override + public void insertFill(MetaObject metaObject) { + long userId = getUserId(); + LocalDateTime now = LocalDateTime.now(); + this.fillStrategy(metaObject, CREATE_BY, userId); + this.fillStrategy(metaObject, CREATE_ON, now); + this.fillStrategy(metaObject, UPDATE_BY, userId); + this.fillStrategy(metaObject, UPDATE_ON, now); + } + + @Override + public void updateFill(MetaObject metaObject) { + this.fillStrategy(metaObject, UPDATE_BY, getUserId()); + this.fillStrategy(metaObject, UPDATE_ON, LocalDateTime.now()); + } + +} \ No newline at end of file diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java index 2a331c6..3ff67e0 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalExceptionHandler.java @@ -19,9 +19,12 @@ import javax.validation.ConstraintViolationException; import java.util.stream.Collectors; /** - * @description: 统一错误处理 - * @author: liuxinxin - * @date: 2023/01/03 11:39 + *

+ * GlobalExceptionHandler + *

+ * + * @author WendyYang + * @since 15:16 2024/4/20 */ @Slf4j @ControllerAdvice diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java index fbb2695..f6745b9 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/handler/GlobalResponseHandler.java @@ -11,11 +11,17 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; /** - * @Author liuxinxin - * @Date 2021/7/21 11:26 - * @Version 1.0 - **/ + *

+ * GlobalResponseHandler + *

+ * + * @author WendyYang + * @since 15:16 2024/4/20 + */ @RestControllerAdvice(basePackages = { + "com.ningdatech.kqapi.admin.controller", + "com.ningdatech.kqapi.user.controller", + "com.ningdatech.kqapi.security.controller", "com.ningdatech.kqapi.zzsfw.controller", "com.ningdatech.kqapi.scheduler.controller" }) @@ -24,24 +30,18 @@ public class GlobalResponseHandler implements ResponseBodyAdvice { private static final String SWAGGER_CLASS_PREFIX = "springfox.documentation"; @Override - public boolean supports(MethodParameter methodParameter, Class> aClass) { + public boolean supports(MethodParameter methodParameter, + Class> aClass) { return filter(methodParameter); } @Override - public Object beforeBodyWrite(Object o, MethodParameter methodParameter, MediaType mediaType, - Class> aClass, ServerHttpRequest serverHttpRequest, + public Object beforeBodyWrite(Object o, MethodParameter methodParameter, + MediaType mediaType, + Class> aClass, + ServerHttpRequest serverHttpRequest, ServerHttpResponse serverHttpResponse) { - ApiResponse apiResponse = ApiResponse.ofSuccess(o); - // 处理字符串时,遇到了类型转换的问题,debug一步一步跟踪,原来是对于字符串的ContentType是“text-plain”, - // ConverterType是StringHttpMessageConverter这个类型转换, - // 由于将结果封装成了自定义的ApiResponse类型,所以有ApiResponse转换成String报错 - // 所以需要对String类型的返回值单独进行处理 -// if (o instanceof String) { -// return JSONUtil.toJsonStr(apiResponse); -// } return ApiResponse.ofSuccess(o); -// return o; } private Boolean filter(MethodParameter methodParameter) { diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java index 307978a..257f74a 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/MatterCacheHelper.java @@ -1,8 +1,7 @@ package com.ningdatech.kqapi.common.helper; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; import java.util.List; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java index 9a52c94..ac7ed37 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/basic/AbstractMatterCacheHelper.java @@ -5,11 +5,11 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.Lists; import com.ningdatech.kqapi.common.constant.BizConst; -import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.MatterKey; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.MatterKey; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java index af3e623..309eee9 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.java @@ -2,7 +2,7 @@ package com.ningdatech.kqapi.common.helper.impl; import com.ningdatech.kqapi.common.helper.MatterCacheHelper; import com.ningdatech.kqapi.common.helper.basic.AbstractMatterCacheHelper; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java b/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java deleted file mode 100644 index 540560c..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/common/util/SpringUtils.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.ningdatech.kqapi.common.util; - -import org.springframework.context.ApplicationContext; -import org.springframework.util.Assert; - -import java.util.Map; - -/** - * Spring工具类 - * - * @author WendyYang - * @date 2017-12-25 16:27 - */ -public final class SpringUtils { - private SpringUtils() { - } - - /** - * 单例Holder模式: 优点:将懒加载和线程安全完美结合的一种方式(无锁)。(推荐) - * - * @return 实实例 - */ - public static SpringUtils getInstance() { - return SpringUtilsHolder.INSTANCE; - } - - private static ApplicationContext applicationContext; - private static ApplicationContext parentApplicationContext; - - public static ApplicationContext getApplicationContext() { - return applicationContext; - } - - public static void setApplicationContext(ApplicationContext ctx) { - Assert.notNull(ctx, "SpringUtil injection ApplicationContext is null"); - applicationContext = ctx; - parentApplicationContext = ctx.getParent(); - } - - public static Object getBean(String name) { - Assert.hasText(name, "SpringUtil name is null or empty"); - try { - return applicationContext.getBean(name); - } catch (Exception e) { - return parentApplicationContext.getBean(name); - } - } - - public static T getBean(String name, Class type) { - Assert.hasText(name, "SpringUtil name is null or empty"); - Assert.notNull(type, "SpringUtil type is null"); - try { - return applicationContext.getBean(name, type); - } catch (Exception e) { - return parentApplicationContext.getBean(name, type); - } - } - - public static T getBean(Class type) { - Assert.notNull(type, "SpringUtil type is null"); - try { - return applicationContext.getBean(type); - } catch (Exception e) { - return parentApplicationContext.getBean(type); - } - } - - public static Map getBeansOfType(Class type) { - Assert.notNull(type, "SpringUtil type is null"); - try { - return applicationContext.getBeansOfType(type); - } catch (Exception e) { - return parentApplicationContext.getBeansOfType(type); - } - } - - public static ApplicationContext publishEvent(Object event) { - applicationContext.publishEvent(event); - return applicationContext; - } - - - /** - *

- * 类级的内部类,也就是静态的成员式内部类,该内部类的实例与外部类的实例 - * 没有绑定关系,而且只有被调用到才会装载,从而实现了延迟加载 - */ - private static class SpringUtilsHolder { - /** - * 静态初始化器,由JVM来保证线程安全 - */ - private static final SpringUtils INSTANCE = new SpringUtils(); - } - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java index 4fa1224..b6f6f94 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/manage/SynManage.java @@ -1,14 +1,13 @@ package com.ningdatech.kqapi.scheduler.manage; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java index 676e8cb..27d5963 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/CheckMattersUrlTask.java @@ -4,8 +4,7 @@ import cn.hutool.core.date.StopWatch; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; import com.ningdatech.kqapi.common.model.entity.Item; -import com.ningdatech.kqapi.common.util.HttpUtil; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,17 +29,11 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import javax.net.ssl.SSLContext; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.net.*; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.concurrent.CompletableFuture; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * @author ZPF diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java index fd9a279..dbbc3a7 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.java @@ -3,7 +3,7 @@ package com.ningdatech.kqapi.scheduler.task; import cn.hutool.core.date.StopWatch; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.kqapi.scheduler.contants.TaskContant; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java index 04ecebd..51e07e9 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/scheduler/task/SynTask.java @@ -7,12 +7,12 @@ import com.github.benmanes.caffeine.cache.LoadingCache; import com.ningdatech.kqapi.common.constant.BizConst; import com.ningdatech.kqapi.common.enumeration.CommonEnum; import com.ningdatech.kqapi.common.helper.MatterCacheHelper; -import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.MatterKey; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.MatterKey; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.manage.MatterManage; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java index d3d13aa..e5bb0d8 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.controller; -import com.ningdatech.kqapi.zzsfw.entity.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.ningdatech.kqapi.zzsfw.manage.QlManage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java index bdfe317..d353d3d 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java @@ -1,12 +1,11 @@ package com.ningdatech.kqapi.zzsfw.controller; -import cn.hutool.core.collection.CollUtil; import com.ningdatech.kqapi.common.exception.BizException; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO; -import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO; -import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO; -import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO; +import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO; +import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO; +import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO; import com.ningdatech.kqapi.zzsfw.manage.MatterManage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java index 1bbc6cd..e79c46e 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.java @@ -1,8 +1,8 @@ package com.ningdatech.kqapi.zzsfw.controller; import com.ningdatech.kqapi.common.model.PageVo; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO; -import com.ningdatech.kqapi.zzsfw.entity.vo.NdKqZzsfwPolicyVO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.vo.NdKqZzsfwPolicyVO; import com.ningdatech.kqapi.zzsfw.manage.PolicyManage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java deleted file mode 100644 index 301e34a..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java +++ /dev/null @@ -1,417 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * 省回流_政务服务_数据共享_事项基本信息表 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -public class DscSxAdsShareItemQltQlsxCommonIDVKqDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("事项唯一标识") - private String rowguid; - - @ApiModelProperty("写入同步时间") - private LocalDateTime updateDate; - - @ApiModelProperty("事项更新类型") - private String updateType; - - @ApiModelProperty("事项类型") - private String qlKind; - - @ApiModelProperty("主项编码") - private String qlMainitemId; - - @ApiModelProperty("子项编码") - private String qlSubitemId; - - @ApiModelProperty("事权层级") - private String shiquancj; - - @ApiModelProperty("行政区划代码") - private String belongxiaqucode; - - @ApiModelProperty("实施机关组织机构代码(主管部门组织机构代码)") - private String qlDepOrgcdoe; - - @ApiModelProperty("权力来源") - private String itemsource; - - @ApiModelProperty("版本号") - private String versionNumber; - - @ApiModelProperty("事项入库时间") - private LocalDateTime versionDate; - - @ApiModelProperty("事项状态生效时间") - private LocalDateTime qlEffectTime; - - @ApiModelProperty("事项内部编码") - private String qlInnerCode; - - @ApiModelProperty("事项名称") - private String qlName; - - @ApiModelProperty("事项状态") - private String qlState; - - @ApiModelProperty("法定依据(审批依据;实施依据)") - private String lawbasis; - - @ApiModelProperty("法定期限") - private Long anticipateDay; - - @ApiModelProperty("法定期限单位") - private String anticipateType; - - @ApiModelProperty("承诺期限") - private Long promiseDay; - - @ApiModelProperty("办事者到办事现场次数") - private Long applyerminCount; - - @ApiModelProperty("是否列为国家、省、市、县级行政审批制度改革试点") - private String isPilot; - - @ApiModelProperty("实施机关(主管部门名称)") - private String qlDep; - - @ApiModelProperty("实施或牵头的处(科)室名称") - private String leadDept; - - @ApiModelProperty("办件类型") - private String bjtype; - - @ApiModelProperty("本级审批性质") - private String benjispxz; - - @ApiModelProperty("办理频率") - private String handleFrequency; - - @ApiModelProperty("行政相对人性质(适用对象(行政相对人性质);服务相对人性质)") - private String xingzhenxdrxz; - - @ApiModelProperty("审批条件(申请条件;受理条件)") - private String applyCondition; - - @ApiModelProperty("办件结果文件名称(审批结果)") - private String banjianFinishfiles; - - @ApiModelProperty("咨询电话") - private String linkTel; - - @ApiModelProperty("监督投诉电话") - private String superviseTel; - - @ApiModelProperty("电脑端网上办理地址") - private String webapplyurl; - - @ApiModelProperty("网上咨询网址") - private String webconsulturl; - - @ApiModelProperty("是否收费") - private String chargeFlag; - - @ApiModelProperty("收费依据") - private String chargeBasis; - - @ApiModelProperty("法人关注点") - private String rightclassQiyezt; - - @ApiModelProperty("面向法人的对象分类") - private String rightclassQiyedx; - - @ApiModelProperty("个人关注点") - private String rightclassGerensx; - - @ApiModelProperty("面向个人的对象分类") - private String rightclassGerendx; - - @ApiModelProperty("内部流程信息") - private String inFlowInfo; - - @ApiModelProperty("业务申报材料") - private String materialInfo; - - @ApiModelProperty("材料情形说明") - private String materialCaseInfo; - - @ApiModelProperty("收费项目") - private String chargeitemInfo; - - @ApiModelProperty("常见问题解答") - private String qaInfo; - - @ApiModelProperty("受理地点信息") - private String acceptAddressInfo; - - @ApiModelProperty("交换标识") - private String syncSign; - - @ApiModelProperty("交换时间") - private LocalDateTime syncDate; - - @ApiModelProperty("交换错误描述") - private String syncErrorDesc; - - @ApiModelProperty("部门组织机构代码") - private String ouorgcode; - - @ApiModelProperty("部门编码") - private String ouguid; - - @ApiModelProperty("法人登录地址(电脑端法人认证地址)") - private String farenurl; - - @ApiModelProperty("电脑端个人认证标识") - private String gerenflag; - - @ApiModelProperty("是否统建系统(是否使用统一网上申报)") - private String isTongjian; - - @ApiModelProperty("事项编码") - private String qlFullId; - - @ApiModelProperty("委托下放") - private String entrust; - - @ApiModelProperty("委托下放说明") - private String entrustdes; - - @ApiModelProperty("最少上门次数说明") - private String applyerminCountDesc; - - @ApiModelProperty("事项所属业务类型") - private String outypecode; - - @ApiModelProperty("对外公布办理程序描述") - private String outFlowDesc; - - @ApiModelProperty("办结类型") - private String banjianFinishtype; - - @ApiModelProperty("是否允许特别程序申请") - private String isSpecialpro; - - @ApiModelProperty("删除数据标识") - private String state2; - - @ApiModelProperty("不适宜开展网上申报") - private String nosuitApply; - - @ApiModelProperty("是否接入统一办件库") - private String isUnifydo; - - @ApiModelProperty("是否是上级主管部门统建系统") - private String isUpunify; - - @ApiModelProperty("权力属性") - private String qlAtt; - - @ApiModelProperty("备注") - private String baknote; - - @ApiModelProperty("星级服务(网上办理业务模式)") - private String webapplymode; - - @ApiModelProperty("权力来源方式") - private String itemsourcetype; - - @ApiModelProperty("是否可以适用处罚简易程序") - private String isSimplepunish; - - @ApiModelProperty("是否涉及征收(税)费减免的审批") - private String isLevywaiver; - - @ApiModelProperty("征收标准") - private String feebasis; - - @ApiModelProperty("自由裁量") - private String factInfo; - - @ApiModelProperty("涉密或敏感") - private String isCs; - - @ApiModelProperty("未接入统一办件库其他原因说明") - private String unifydodes; - - @ApiModelProperty("极少业务") - private String isVlb; - - @ApiModelProperty("nounify_do") - private String nounifyDo; - - @ApiModelProperty("乡镇延伸事项的部门源事项") - private String qlInnerCodeItem; - - @ApiModelProperty("是否投资(bak1)") - private String isTouzip; - - @ApiModelProperty("行业主题分类") - private String hangyeclasstype; - - @ApiModelProperty("其他行政权力子类型") - private String qlSubKind; - - @ApiModelProperty("移动端网上办理地址") - private String appwebapplyurl; - - @ApiModelProperty("移动端网上预约地址") - private String appappointmenturl; - - @ApiModelProperty("电脑端网上预约地址") - private String appointmenturl; - - @ApiModelProperty("是否网上预约") - private String isWebappointment; - - @ApiModelProperty("网上预约时段") - private String webappointmentperiod; - - @ApiModelProperty("主要内容") - private String maincontext; - - @ApiModelProperty("共同实施单位") - private String doDept; - - @ApiModelProperty("相关附件") - private String relatedguid; - - @ApiModelProperty("相关附件信息") - private String related; - - @ApiModelProperty("是否提供快递送达") - private String isExpress; - - @ApiModelProperty("公共服务事项子类型") - private String serviceSubKind; - - @ApiModelProperty("是否列入最多跑一次事项清单") - private String ispyc; - - @ApiModelProperty("联办事项") - private String lbsx; - - @ApiModelProperty("外部流程图") - private String outFlowUrl; - - @ApiModelProperty("受理机构") - private String acpInstitution; - - @ApiModelProperty("决定机构") - private String decInstitution; - - @ApiModelProperty("涉及的内容(公共服务:主要内容)") - private String contentInvolve; - - @ApiModelProperty("适用对象说明") - private String applicableObject; - - @ApiModelProperty("行政相对人权利和义务") - private String xingzhenxdrxy; - - @ApiModelProperty("有无数量限制") - private String countLimit; - - @ApiModelProperty("数量限制情况说明") - private String countNote; - - @ApiModelProperty("禁止性要求") - private String banRequirement; - - @ApiModelProperty("事项审查类型") - private String shixiangsctype; - - @ApiModelProperty("事项审查类型说明") - private String shixiangsclx; - - @ApiModelProperty("申请方式") - private String applyType; - - @ApiModelProperty("联系电话") - private String applyTypeTel; - - @ApiModelProperty("邮箱") - private String applyTypeMail; - - @ApiModelProperty("传真") - private String applyTypeFax; - - @ApiModelProperty("办理方式") - private String handleType; - - @ApiModelProperty("手机端法人认证地址") - private String mbfarenadd; - - @ApiModelProperty("手机端个人认证标识") - private String mbgerenflag; - - @ApiModelProperty("时限说明") - private String destime; - - @ApiModelProperty("送达方式") - private String serviceMode; - - @ApiModelProperty("送达时限") - private String serviceDay; - - @ApiModelProperty("其他") - private String ununifydoOther; - - @ApiModelProperty("是否自有") - private String ishasownflow; - - @ApiModelProperty("分区") - private String dt; - - @ApiModelProperty("所属地市") - private String dscCity; - - @ApiModelProperty("所需区/县") - private String dscAdmRegion; - - @ApiModelProperty("数源单位代码") - private String dscSydepCode; - - @ApiModelProperty("数源单位") - private String dscSydepName; - - @ApiModelProperty("数据所属系统名称") - private String dscSydepSys; - - @ApiModelProperty("数源单位表名") - private String dscSydepTblname; - - @ApiModelProperty("唯一自增序列号") - private String dscBizRecordId; - - @ApiModelProperty("I插入U更新D删除") - private String dscBizOperation; - - @ApiModelProperty("源表数据同步时间") - private LocalDateTime dscBizTimestamp; - - @ApiModelProperty("数据来源表名(清洗库或基础库表名)") - private String dscDatasrTblname; - - @ApiModelProperty("业务主键MD5值(清洗增加)") - private String dscHashUnique; - - @ApiModelProperty("清洗时间(清洗增加)") - private String dscCleanTimestamp; - - @ApiModelProperty("地市仓数据入库时间") - private LocalDateTime dscDwRksj; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java deleted file mode 100644 index 5523ebd..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMattersDeduplicateDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Data -@ApiModel(value = "NdKqZzsfwMattersDeduplicate", description = "") -public class NdKqZzsfwMattersDeduplicateDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("事项名称") - private String qlName; - - @ApiModelProperty("链接") - private String webapplyurl; - - @ApiModelProperty("重复数") - private Integer countNum; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java deleted file mode 100644 index e3d537f..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwMenuDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Data -@ApiModel(value = "NdKqZzsfwMenu对象", description = "") -public class NdKqZzsfwMenuDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("社区名") - private String zoneName; - - @ApiModelProperty("窗口") - private String window; - - @ApiModelProperty("部门") - private String department; - - @ApiModelProperty("事项名称") - private String itemName; - - @ApiModelProperty("事项在政务中心的rowid") - private String itemRowid; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("链接") - private String webapplyurl; - - @ApiModelProperty("是否在政务中心查到url") - private Integer hasUrl; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java deleted file mode 100644 index b9f794b..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.dto; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-11-02 - */ -@Data -@ApiModel(value = "NdKqZzsfwPolicyDTO", description = "") -public class NdKqZzsfwPolicyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("抬头") - private String header; - - @ApiModelProperty("标题") - private String title; - - @ApiModelProperty("二级标题") - private String secondTitle; - - @ApiModelProperty("适用地区") - private String regionName; - - @ApiModelProperty("责任部门") - private String department; - - @ApiModelProperty("发文日期") - private String issueDate; - - @ApiModelProperty("状态") - private String status; - - @ApiModelProperty("申报时间") - private String applyTime; - - @ApiModelProperty("在线咨询url") - private String onlineConsultationUrl; - - @ApiModelProperty("排序") - private Integer sort; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java deleted file mode 100644 index bfe883b..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.security.Timestamp; - -// ComponentsMatterEliminateEntity.java -@Data -@TableName("components_matter_eliminate") -public class ComponentsMatterEliminateEntity { - - /** - * 事项名称剔除表,主要剔除事项url报错404链接 - */ - - @ApiModelProperty("id主键") - @TableId(type = IdType.AUTO) - private Long id; - /** - * 组件名称 - */ - private String qlName; - - /** - * 剔除时间 - */ - private Timestamp eliminateTime; - - /** - * 剔除标识,0未剔除,1已剔除 - */ - private String isDelete; - - public ComponentsMatterEliminateEntity(String qlName,String isDelete) { - this.qlName = qlName; - this.isDelete = isDelete; - } -} - diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java deleted file mode 100644 index dc7df47..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java +++ /dev/null @@ -1,422 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * 省回流_政务服务_数据共享_事项基本信息表 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@TableName("dsc_sx_ads_share_item_qlt_qlsx_common_i_d_v_kq") -@ApiModel(value = "DscSxAdsShareItemQltQlsxCommonIDVKq对象", description = "省回流_政务服务_数据共享_事项基本信息表") -public class DscSxAdsShareItemQltQlsxCommonIDVKq implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("事项唯一标识") - @TableId - private String rowguid; - - @ApiModelProperty("写入同步时间") - private LocalDateTime updateDate; - - @ApiModelProperty("事项更新类型") - private String updateType; - - @ApiModelProperty("事项类型") - private String qlKind; - - @ApiModelProperty("主项编码") - private String qlMainitemId; - - @ApiModelProperty("子项编码") - private String qlSubitemId; - - @ApiModelProperty("事权层级") - private String shiquancj; - - @ApiModelProperty("行政区划代码") - private String belongxiaqucode; - - @ApiModelProperty("实施机关组织机构代码(主管部门组织机构代码)") - private String qlDepOrgcdoe; - - @ApiModelProperty("权力来源") - private String itemsource; - - @ApiModelProperty("版本号") - private String versionNumber; - - @ApiModelProperty("事项入库时间") - private LocalDateTime versionDate; - - @ApiModelProperty("事项状态生效时间") - private LocalDateTime qlEffectTime; - - @ApiModelProperty("事项内部编码") - private String qlInnerCode; - - @ApiModelProperty("事项名称") - private String qlName; - - @ApiModelProperty("事项状态") - private String qlState; - - @ApiModelProperty("法定依据(审批依据;实施依据)") - private String lawbasis; - - @ApiModelProperty("法定期限") - private Long anticipateDay; - - @ApiModelProperty("法定期限单位") - private String anticipateType; - - @ApiModelProperty("承诺期限") - private Long promiseDay; - - @ApiModelProperty("办事者到办事现场次数") - private Long applyerminCount; - - @ApiModelProperty("是否列为国家、省、市、县级行政审批制度改革试点") - private String isPilot; - - @ApiModelProperty("实施机关(主管部门名称)") - private String qlDep; - - @ApiModelProperty("实施或牵头的处(科)室名称") - private String leadDept; - - @ApiModelProperty("办件类型") - private String bjtype; - - @ApiModelProperty("本级审批性质") - private String benjispxz; - - @ApiModelProperty("办理频率") - private String handleFrequency; - - @ApiModelProperty("行政相对人性质(适用对象(行政相对人性质);服务相对人性质)") - private String xingzhenxdrxz; - - @ApiModelProperty("审批条件(申请条件;受理条件)") - private String applyCondition; - - @ApiModelProperty("办件结果文件名称(审批结果)") - private String banjianFinishfiles; - - @ApiModelProperty("咨询电话") - private String linkTel; - - @ApiModelProperty("监督投诉电话") - private String superviseTel; - - @ApiModelProperty("电脑端网上办理地址") - private String webapplyurl; - - @ApiModelProperty("网上咨询网址") - private String webconsulturl; - - @ApiModelProperty("是否收费") - private String chargeFlag; - - @ApiModelProperty("收费依据") - private String chargeBasis; - - @ApiModelProperty("法人关注点") - private String rightclassQiyezt; - - @ApiModelProperty("面向法人的对象分类") - private String rightclassQiyedx; - - @ApiModelProperty("个人关注点") - private String rightclassGerensx; - - @ApiModelProperty("面向个人的对象分类") - private String rightclassGerendx; - - @ApiModelProperty("内部流程信息") - private String inFlowInfo; - - @ApiModelProperty("业务申报材料") - private String materialInfo; - - @ApiModelProperty("材料情形说明") - private String materialCaseInfo; - - @ApiModelProperty("收费项目") - private String chargeitemInfo; - - @ApiModelProperty("常见问题解答") - private String qaInfo; - - @ApiModelProperty("受理地点信息") - private String acceptAddressInfo; - - @ApiModelProperty("交换标识") - private String syncSign; - - @ApiModelProperty("交换时间") - private LocalDateTime syncDate; - - @ApiModelProperty("交换错误描述") - private String syncErrorDesc; - - @ApiModelProperty("部门组织机构代码") - private String ouorgcode; - - @ApiModelProperty("部门编码") - private String ouguid; - - @ApiModelProperty("法人登录地址(电脑端法人认证地址)") - private String farenurl; - - @ApiModelProperty("电脑端个人认证标识") - private String gerenflag; - - @ApiModelProperty("是否统建系统(是否使用统一网上申报)") - private String isTongjian; - - @ApiModelProperty("事项编码") - private String qlFullId; - - @ApiModelProperty("委托下放") - private String entrust; - - @ApiModelProperty("委托下放说明") - private String entrustdes; - - @ApiModelProperty("最少上门次数说明") - private String applyerminCountDesc; - - @ApiModelProperty("事项所属业务类型") - private String outypecode; - - @ApiModelProperty("对外公布办理程序描述") - private String outFlowDesc; - - @ApiModelProperty("办结类型") - private String banjianFinishtype; - - @ApiModelProperty("是否允许特别程序申请") - private String isSpecialpro; - - @ApiModelProperty("删除数据标识") - private String state2; - - @ApiModelProperty("不适宜开展网上申报") - private String nosuitApply; - - @ApiModelProperty("是否接入统一办件库") - private String isUnifydo; - - @ApiModelProperty("是否是上级主管部门统建系统") - private String isUpunify; - - @ApiModelProperty("权力属性") - private String qlAtt; - - @ApiModelProperty("备注") - private String baknote; - - @ApiModelProperty("星级服务(网上办理业务模式)") - private String webapplymode; - - @ApiModelProperty("权力来源方式") - private String itemsourcetype; - - @ApiModelProperty("是否可以适用处罚简易程序") - private String isSimplepunish; - - @ApiModelProperty("是否涉及征收(税)费减免的审批") - private String isLevywaiver; - - @ApiModelProperty("征收标准") - private String feebasis; - - @ApiModelProperty("自由裁量") - private String factInfo; - - @ApiModelProperty("涉密或敏感") - private String isCs; - - @ApiModelProperty("未接入统一办件库其他原因说明") - private String unifydodes; - - @ApiModelProperty("极少业务") - private String isVlb; - - @ApiModelProperty("nounify_do") - private String nounifyDo; - - @ApiModelProperty("乡镇延伸事项的部门源事项") - private String qlInnerCodeItem; - - @ApiModelProperty("是否投资(bak1)") - private String isTouzip; - - @ApiModelProperty("行业主题分类") - private String hangyeclasstype; - - @ApiModelProperty("其他行政权力子类型") - private String qlSubKind; - - @ApiModelProperty("移动端网上办理地址") - private String appwebapplyurl; - - @ApiModelProperty("移动端网上预约地址") - private String appappointmenturl; - - @ApiModelProperty("电脑端网上预约地址") - private String appointmenturl; - - @ApiModelProperty("是否网上预约") - private String isWebappointment; - - @ApiModelProperty("网上预约时段") - private String webappointmentperiod; - - @ApiModelProperty("主要内容") - private String maincontext; - - @ApiModelProperty("共同实施单位") - private String doDept; - - @ApiModelProperty("相关附件") - private String relatedguid; - - @ApiModelProperty("相关附件信息") - private String related; - - @ApiModelProperty("是否提供快递送达") - private String isExpress; - - @ApiModelProperty("公共服务事项子类型") - private String serviceSubKind; - - @ApiModelProperty("是否列入最多跑一次事项清单") - private String ispyc; - - @ApiModelProperty("联办事项") - private String lbsx; - - @ApiModelProperty("外部流程图") - private String outFlowUrl; - - @ApiModelProperty("受理机构") - private String acpInstitution; - - @ApiModelProperty("决定机构") - private String decInstitution; - - @ApiModelProperty("涉及的内容(公共服务:主要内容)") - private String contentInvolve; - - @ApiModelProperty("适用对象说明") - private String applicableObject; - - @ApiModelProperty("行政相对人权利和义务") - private String xingzhenxdrxy; - - @ApiModelProperty("有无数量限制") - private String countLimit; - - @ApiModelProperty("数量限制情况说明") - private String countNote; - - @ApiModelProperty("禁止性要求") - private String banRequirement; - - @ApiModelProperty("事项审查类型") - private String shixiangsctype; - - @ApiModelProperty("事项审查类型说明") - private String shixiangsclx; - - @ApiModelProperty("申请方式") - private String applyType; - - @ApiModelProperty("联系电话") - private String applyTypeTel; - - @ApiModelProperty("邮箱") - private String applyTypeMail; - - @ApiModelProperty("传真") - private String applyTypeFax; - - @ApiModelProperty("办理方式") - private String handleType; - - @ApiModelProperty("手机端法人认证地址") - private String mbfarenadd; - - @ApiModelProperty("手机端个人认证标识") - private String mbgerenflag; - - @ApiModelProperty("时限说明") - private String destime; - - @ApiModelProperty("送达方式") - private String serviceMode; - - @ApiModelProperty("送达时限") - private String serviceDay; - - @ApiModelProperty("其他") - private String ununifydoOther; - - @ApiModelProperty("是否自有") - private String ishasownflow; - - @ApiModelProperty("分区") - private String dt; - - @ApiModelProperty("所属地市") - private String dscCity; - - @ApiModelProperty("所需区/县") - private String dscAdmRegion; - - @ApiModelProperty("数源单位代码") - private String dscSydepCode; - - @ApiModelProperty("数源单位") - private String dscSydepName; - - @ApiModelProperty("数据所属系统名称") - private String dscSydepSys; - - @ApiModelProperty("数源单位表名") - private String dscSydepTblname; - - @ApiModelProperty("唯一自增序列号") - private String dscBizRecordId; - - @ApiModelProperty("I插入U更新D删除") - private String dscBizOperation; - - @ApiModelProperty("源表数据同步时间") - private LocalDateTime dscBizTimestamp; - - @ApiModelProperty("数据来源表名(清洗库或基础库表名)") - private String dscDatasrTblname; - - @ApiModelProperty("业务主键MD5值(清洗增加)") - private String dscHashUnique; - - @ApiModelProperty("清洗时间(清洗增加)") - private String dscCleanTimestamp; - - @ApiModelProperty("地市仓数据入库时间") - private LocalDateTime dscDwRksj; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java deleted file mode 100644 index 1b477b2..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/MatterKey.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import lombok.Data; - -/** - * @Classname MatterKey - * @Description - * @Date 2024/1/3 11:13 - * @Author PoffyZhang - */ -@Data -public class MatterKey { - - private String qlName; - - private String webapplyurl; - - public static MatterKey of(String qlName, String webapplyurl) { - MatterKey matterKey = new MatterKey(); - matterKey.setQlName(qlName); - matterKey.setWebapplyurl(webapplyurl); - return matterKey; - } -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java deleted file mode 100644 index 6de3237..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Data -@TableName("nd_kq_zzsfw_matters_deduplicate") -@ApiModel(value = "NdKqZzsfwMattersDeduplicate", description = "") -public class NdKqZzsfwMattersDeduplicate implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - @TableId(type = IdType.AUTO) - private Long id; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("事项名称") - private String qlName; - - @ApiModelProperty("链接") - private String webapplyurl; - - @ApiModelProperty("重复数") - private Integer countNum = 0; - - public static NdKqZzsfwMattersDeduplicate of(String qlName, String webapplyurl) { - NdKqZzsfwMattersDeduplicate dup = new NdKqZzsfwMattersDeduplicate(); - dup.setQlName(qlName); - dup.setWebapplyurl(webapplyurl); - dup.setCountNum(1); - return dup; - } -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java deleted file mode 100644 index 90cb53c..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.time.LocalDateTime; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Data -@TableName("nd_kq_zzsfw_menu") -@ApiModel(value = "NdKqZzsfwMenu对象", description = "") -public class NdKqZzsfwMenu implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - @TableId(type = IdType.AUTO) - private Long id; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("社区名") - private String zoneName; - - @ApiModelProperty("窗口") - private String window; - - @ApiModelProperty("部门") - private String department; - - @ApiModelProperty("事项名称") - private String itemName; - - @ApiModelProperty("事项在政务中心的rowid") - private String itemRowid; - - @ApiModelProperty("排序") - private Integer sort; - - @ApiModelProperty("链接") - private String webapplyurl; - - @ApiModelProperty("是否在政务中心查到url") - private Integer hasUrl; - - @ApiModelProperty("类型 1.政府服务 2.增值服务 3.特殊") - private Integer type; - - @ApiModelProperty("服务内容") - private String serviceContent; - - @ApiModelProperty("服务流程") - private String serviceProcess; - - @ApiModelProperty("咨询电话") - private String telephone; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java deleted file mode 100644 index a46b3b0..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-11-02 - */ -@Data -@TableName("nd_kq_zzsfw_policy") -@ApiModel(value = "NdKqZzsfwPolicy对象", description = "") -public class NdKqZzsfwPolicy implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - @TableId(type = IdType.AUTO) - private Long id; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("抬头") - private String header; - - @ApiModelProperty("标题") - private String title; - - @ApiModelProperty("二级标题") - private String secondTitle; - - @ApiModelProperty("适用地区") - private String regionName; - - @ApiModelProperty("责任部门") - private String department; - - @ApiModelProperty("发文日期") - private String issueDate; - - @ApiModelProperty("状态") - private String status; - - @ApiModelProperty("申报时间") - private String applyTime; - - @ApiModelProperty("在线咨询url") - private String onlineConsultationUrl; - - @ApiModelProperty("排序") - private Integer sort; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java deleted file mode 100644 index 791602c..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MatterTopVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 事项 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "MatterTopVO", description = "事项top") -public class MatterTopVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("事项名称") - private String matterName; - - @ApiModelProperty("事项链接") - private String webapplyurl; - - @ApiModelProperty("数量") - private Integer count; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java deleted file mode 100644 index 30a965e..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - *

- * 事项 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "MattersVO", description = "事项") -public class MattersVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - private Long id; - - @ApiModelProperty("id") - private String rowguid; - - @ApiModelProperty("事项名称") - private String matterName; - - @ApiModelProperty("事项链接") - private String webapplyurl; - - @ApiModelProperty("排序编号") - private Integer sort; - - @ApiModelProperty("类型 1.政府服务 2.增值服务 3.特殊") - private Integer type; - - @ApiModelProperty("服务内容") - private String serviceContent; - - @ApiModelProperty("服务流程") - private String serviceProcess; - - @ApiModelProperty("咨询电话") - private String telephone; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java deleted file mode 100644 index 87d73f7..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/NdKqZzsfwPolicyVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.time.LocalDateTime; - -/** - *

- * - *

- * - * @author ZPF - * @since 2023-11-02 - */ -@Data -@ApiModel(value = "NdKqZzsfwPolicy VO", description = "") -public class NdKqZzsfwPolicyVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("id主键") - private Long id; - - @ApiModelProperty("数据同步时间") - private LocalDateTime createOn; - - @ApiModelProperty("抬头") - private String header; - - @ApiModelProperty("标题") - private String title; - - @ApiModelProperty("二级标题") - private String secondTitle; - - @ApiModelProperty("适用地区") - private String regionName; - - @ApiModelProperty("责任部门") - private String department; - - @ApiModelProperty("发文日期") - private String issueDate; - - @ApiModelProperty("状态") - private String status; - - @ApiModelProperty("申报时间") - private String applyTime; - - @ApiModelProperty("在线咨询url") - private String onlineConsultationUrl; - - @ApiModelProperty("排序") - private Integer sort; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java deleted file mode 100644 index acf1a43..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 树结构 - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "TreeVO", description = "树结构") -public class TreeVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("rowid") - private String id; - - @ApiModelProperty("名称") - private String name; - - @ApiModelProperty("类型") - private String type; - - @ApiModelProperty("链接") - private String url; - - @ApiModelProperty("链接") - private Integer sort; - - @ApiModelProperty("事项类型") - private Integer itemType; - - @ApiModelProperty("事项类型") - private Integer itemTypeName; - - @ApiModelProperty("服务内容") - private String serviceContent; - - @ApiModelProperty("服务流程") - private String serviceProcess; - - @ApiModelProperty("咨询电话") - private String telephone; - - @ApiModelProperty("子级") - private List chilren; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java deleted file mode 100644 index d932609..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 社区VO - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "WindowVO", description = "窗口VO") -public class WindowVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("窗口") - private String windowName; - - @ApiModelProperty("事项") - private List matters; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java deleted file mode 100644 index 0a0a05f..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/entity/vo/ZoneVO.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.entity.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.util.List; - -/** - *

- * 社区VO - *

- * - * @author ZPF - * @since 2023-10-25 - */ -@Data -@ApiModel(value = "ZoneVO", description = "社区VO") -public class ZoneVO implements Serializable { - - private static final long serialVersionUID = 1L; - - @ApiModelProperty("社区") - private String zoneName; - - @ApiModelProperty("社区") - private List windows; -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java index 2b08d7e..8976ef1 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/MatterManage.java @@ -2,19 +2,16 @@ package com.ningdatech.kqapi.zzsfw.manage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.StopWatch; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ningdatech.kqapi.common.enumeration.CommonEnum; -import com.ningdatech.kqapi.common.helper.MatterCacheHelper; import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO; -import com.ningdatech.kqapi.zzsfw.entity.vo.MattersVO; -import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwMenuDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.vo.MatterTopVO; +import com.ningdatech.kqapi.zzsfw.model.vo.MattersVO; +import com.ningdatech.kqapi.zzsfw.model.vo.TreeVO; import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; @@ -102,13 +99,12 @@ public class MatterManage { (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set zoneSet = new HashSet<>(); - List res = finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> { + return finalMatters.stream().filter(m -> zoneSet.add(m.getZoneName())).map(m -> { TreeVO zone = new TreeVO(); zone.setName(m.getZoneName()); zone.setType(ZzsfwMenuConstant.MENU_TYPE_ZONE); return zone; }).collect(Collectors.toList()); - return res; } public List getWindows(String zoneName) { diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java index 4c23e8f..66f5804 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.java @@ -5,9 +5,9 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ningdatech.kqapi.common.model.PageVo; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwPolicyDTO; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; -import com.ningdatech.kqapi.zzsfw.entity.vo.NdKqZzsfwPolicyVO; +import com.ningdatech.kqapi.zzsfw.model.dto.NdKqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.vo.NdKqZzsfwPolicyVO; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java index a18755f..d9bb2bd 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/manage/QlManage.java @@ -1,27 +1,15 @@ package com.ningdatech.kqapi.zzsfw.manage; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant; -import com.ningdatech.kqapi.zzsfw.entity.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMattersDeduplicateDTO; -import com.ningdatech.kqapi.zzsfw.entity.dto.NdKqZzsfwMenuDTO; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.entity.vo.MatterTopVO; -import com.ningdatech.kqapi.zzsfw.entity.vo.TreeVO; +import com.ningdatech.kqapi.zzsfw.model.dto.DscSxAdsShareItemQltQlsxCommonIDVKqDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.util.*; -import java.util.stream.Collectors; /** * @Classname MatterManage diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java index 33867b0..cd555c4 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; /** * @author wangrenkang diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java index 151931d..88b5f87 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.mapper; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java index 292ddf9..63b3e1a 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; /** *

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java index 89ce80e..7d4cad9 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.mapper; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java index 7d26e08..6258a3b 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java @@ -1,8 +1,7 @@ package com.ningdatech.kqapi.zzsfw.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; /** *

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java new file mode 100644 index 0000000..cbee986 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.java @@ -0,0 +1,417 @@ +package com.ningdatech.kqapi.zzsfw.model.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 省回流_政务服务_数据共享_事项基本信息表 + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +public class DscSxAdsShareItemQltQlsxCommonIDVKqDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("事项唯一标识") + private String rowguid; + + @ApiModelProperty("写入同步时间") + private LocalDateTime updateDate; + + @ApiModelProperty("事项更新类型") + private String updateType; + + @ApiModelProperty("事项类型") + private String qlKind; + + @ApiModelProperty("主项编码") + private String qlMainitemId; + + @ApiModelProperty("子项编码") + private String qlSubitemId; + + @ApiModelProperty("事权层级") + private String shiquancj; + + @ApiModelProperty("行政区划代码") + private String belongxiaqucode; + + @ApiModelProperty("实施机关组织机构代码(主管部门组织机构代码)") + private String qlDepOrgcdoe; + + @ApiModelProperty("权力来源") + private String itemsource; + + @ApiModelProperty("版本号") + private String versionNumber; + + @ApiModelProperty("事项入库时间") + private LocalDateTime versionDate; + + @ApiModelProperty("事项状态生效时间") + private LocalDateTime qlEffectTime; + + @ApiModelProperty("事项内部编码") + private String qlInnerCode; + + @ApiModelProperty("事项名称") + private String qlName; + + @ApiModelProperty("事项状态") + private String qlState; + + @ApiModelProperty("法定依据(审批依据;实施依据)") + private String lawbasis; + + @ApiModelProperty("法定期限") + private Long anticipateDay; + + @ApiModelProperty("法定期限单位") + private String anticipateType; + + @ApiModelProperty("承诺期限") + private Long promiseDay; + + @ApiModelProperty("办事者到办事现场次数") + private Long applyerminCount; + + @ApiModelProperty("是否列为国家、省、市、县级行政审批制度改革试点") + private String isPilot; + + @ApiModelProperty("实施机关(主管部门名称)") + private String qlDep; + + @ApiModelProperty("实施或牵头的处(科)室名称") + private String leadDept; + + @ApiModelProperty("办件类型") + private String bjtype; + + @ApiModelProperty("本级审批性质") + private String benjispxz; + + @ApiModelProperty("办理频率") + private String handleFrequency; + + @ApiModelProperty("行政相对人性质(适用对象(行政相对人性质);服务相对人性质)") + private String xingzhenxdrxz; + + @ApiModelProperty("审批条件(申请条件;受理条件)") + private String applyCondition; + + @ApiModelProperty("办件结果文件名称(审批结果)") + private String banjianFinishfiles; + + @ApiModelProperty("咨询电话") + private String linkTel; + + @ApiModelProperty("监督投诉电话") + private String superviseTel; + + @ApiModelProperty("电脑端网上办理地址") + private String webapplyurl; + + @ApiModelProperty("网上咨询网址") + private String webconsulturl; + + @ApiModelProperty("是否收费") + private String chargeFlag; + + @ApiModelProperty("收费依据") + private String chargeBasis; + + @ApiModelProperty("法人关注点") + private String rightclassQiyezt; + + @ApiModelProperty("面向法人的对象分类") + private String rightclassQiyedx; + + @ApiModelProperty("个人关注点") + private String rightclassGerensx; + + @ApiModelProperty("面向个人的对象分类") + private String rightclassGerendx; + + @ApiModelProperty("内部流程信息") + private String inFlowInfo; + + @ApiModelProperty("业务申报材料") + private String materialInfo; + + @ApiModelProperty("材料情形说明") + private String materialCaseInfo; + + @ApiModelProperty("收费项目") + private String chargeitemInfo; + + @ApiModelProperty("常见问题解答") + private String qaInfo; + + @ApiModelProperty("受理地点信息") + private String acceptAddressInfo; + + @ApiModelProperty("交换标识") + private String syncSign; + + @ApiModelProperty("交换时间") + private LocalDateTime syncDate; + + @ApiModelProperty("交换错误描述") + private String syncErrorDesc; + + @ApiModelProperty("部门组织机构代码") + private String ouorgcode; + + @ApiModelProperty("部门编码") + private String ouguid; + + @ApiModelProperty("法人登录地址(电脑端法人认证地址)") + private String farenurl; + + @ApiModelProperty("电脑端个人认证标识") + private String gerenflag; + + @ApiModelProperty("是否统建系统(是否使用统一网上申报)") + private String isTongjian; + + @ApiModelProperty("事项编码") + private String qlFullId; + + @ApiModelProperty("委托下放") + private String entrust; + + @ApiModelProperty("委托下放说明") + private String entrustdes; + + @ApiModelProperty("最少上门次数说明") + private String applyerminCountDesc; + + @ApiModelProperty("事项所属业务类型") + private String outypecode; + + @ApiModelProperty("对外公布办理程序描述") + private String outFlowDesc; + + @ApiModelProperty("办结类型") + private String banjianFinishtype; + + @ApiModelProperty("是否允许特别程序申请") + private String isSpecialpro; + + @ApiModelProperty("删除数据标识") + private String state2; + + @ApiModelProperty("不适宜开展网上申报") + private String nosuitApply; + + @ApiModelProperty("是否接入统一办件库") + private String isUnifydo; + + @ApiModelProperty("是否是上级主管部门统建系统") + private String isUpunify; + + @ApiModelProperty("权力属性") + private String qlAtt; + + @ApiModelProperty("备注") + private String baknote; + + @ApiModelProperty("星级服务(网上办理业务模式)") + private String webapplymode; + + @ApiModelProperty("权力来源方式") + private String itemsourcetype; + + @ApiModelProperty("是否可以适用处罚简易程序") + private String isSimplepunish; + + @ApiModelProperty("是否涉及征收(税)费减免的审批") + private String isLevywaiver; + + @ApiModelProperty("征收标准") + private String feebasis; + + @ApiModelProperty("自由裁量") + private String factInfo; + + @ApiModelProperty("涉密或敏感") + private String isCs; + + @ApiModelProperty("未接入统一办件库其他原因说明") + private String unifydodes; + + @ApiModelProperty("极少业务") + private String isVlb; + + @ApiModelProperty("nounify_do") + private String nounifyDo; + + @ApiModelProperty("乡镇延伸事项的部门源事项") + private String qlInnerCodeItem; + + @ApiModelProperty("是否投资(bak1)") + private String isTouzip; + + @ApiModelProperty("行业主题分类") + private String hangyeclasstype; + + @ApiModelProperty("其他行政权力子类型") + private String qlSubKind; + + @ApiModelProperty("移动端网上办理地址") + private String appwebapplyurl; + + @ApiModelProperty("移动端网上预约地址") + private String appappointmenturl; + + @ApiModelProperty("电脑端网上预约地址") + private String appointmenturl; + + @ApiModelProperty("是否网上预约") + private String isWebappointment; + + @ApiModelProperty("网上预约时段") + private String webappointmentperiod; + + @ApiModelProperty("主要内容") + private String maincontext; + + @ApiModelProperty("共同实施单位") + private String doDept; + + @ApiModelProperty("相关附件") + private String relatedguid; + + @ApiModelProperty("相关附件信息") + private String related; + + @ApiModelProperty("是否提供快递送达") + private String isExpress; + + @ApiModelProperty("公共服务事项子类型") + private String serviceSubKind; + + @ApiModelProperty("是否列入最多跑一次事项清单") + private String ispyc; + + @ApiModelProperty("联办事项") + private String lbsx; + + @ApiModelProperty("外部流程图") + private String outFlowUrl; + + @ApiModelProperty("受理机构") + private String acpInstitution; + + @ApiModelProperty("决定机构") + private String decInstitution; + + @ApiModelProperty("涉及的内容(公共服务:主要内容)") + private String contentInvolve; + + @ApiModelProperty("适用对象说明") + private String applicableObject; + + @ApiModelProperty("行政相对人权利和义务") + private String xingzhenxdrxy; + + @ApiModelProperty("有无数量限制") + private String countLimit; + + @ApiModelProperty("数量限制情况说明") + private String countNote; + + @ApiModelProperty("禁止性要求") + private String banRequirement; + + @ApiModelProperty("事项审查类型") + private String shixiangsctype; + + @ApiModelProperty("事项审查类型说明") + private String shixiangsclx; + + @ApiModelProperty("申请方式") + private String applyType; + + @ApiModelProperty("联系电话") + private String applyTypeTel; + + @ApiModelProperty("邮箱") + private String applyTypeMail; + + @ApiModelProperty("传真") + private String applyTypeFax; + + @ApiModelProperty("办理方式") + private String handleType; + + @ApiModelProperty("手机端法人认证地址") + private String mbfarenadd; + + @ApiModelProperty("手机端个人认证标识") + private String mbgerenflag; + + @ApiModelProperty("时限说明") + private String destime; + + @ApiModelProperty("送达方式") + private String serviceMode; + + @ApiModelProperty("送达时限") + private String serviceDay; + + @ApiModelProperty("其他") + private String ununifydoOther; + + @ApiModelProperty("是否自有") + private String ishasownflow; + + @ApiModelProperty("分区") + private String dt; + + @ApiModelProperty("所属地市") + private String dscCity; + + @ApiModelProperty("所需区/县") + private String dscAdmRegion; + + @ApiModelProperty("数源单位代码") + private String dscSydepCode; + + @ApiModelProperty("数源单位") + private String dscSydepName; + + @ApiModelProperty("数据所属系统名称") + private String dscSydepSys; + + @ApiModelProperty("数源单位表名") + private String dscSydepTblname; + + @ApiModelProperty("唯一自增序列号") + private String dscBizRecordId; + + @ApiModelProperty("I插入U更新D删除") + private String dscBizOperation; + + @ApiModelProperty("源表数据同步时间") + private LocalDateTime dscBizTimestamp; + + @ApiModelProperty("数据来源表名(清洗库或基础库表名)") + private String dscDatasrTblname; + + @ApiModelProperty("业务主键MD5值(清洗增加)") + private String dscHashUnique; + + @ApiModelProperty("清洗时间(清洗增加)") + private String dscCleanTimestamp; + + @ApiModelProperty("地市仓数据入库时间") + private LocalDateTime dscDwRksj; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java new file mode 100644 index 0000000..7930245 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java @@ -0,0 +1,35 @@ +package com.ningdatech.kqapi.zzsfw.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Data +@ApiModel(value = "NdKqZzsfwMattersDeduplicate", description = "") +public class NdKqZzsfwMattersDeduplicateDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("事项名称") + private String qlName; + + @ApiModelProperty("链接") + private String webapplyurl; + + @ApiModelProperty("重复数") + private Integer countNum; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java new file mode 100644 index 0000000..a51c19b --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java @@ -0,0 +1,50 @@ +package com.ningdatech.kqapi.zzsfw.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Data +@ApiModel(value = "NdKqZzsfwMenu对象", description = "") +public class NdKqZzsfwMenuDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("社区名") + private String zoneName; + + @ApiModelProperty("窗口") + private String window; + + @ApiModelProperty("部门") + private String department; + + @ApiModelProperty("事项名称") + private String itemName; + + @ApiModelProperty("事项在政务中心的rowid") + private String itemRowid; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("链接") + private String webapplyurl; + + @ApiModelProperty("是否在政务中心查到url") + private Integer hasUrl; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java new file mode 100644 index 0000000..08a5f2a --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java @@ -0,0 +1,56 @@ +package com.ningdatech.kqapi.zzsfw.model.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-11-02 + */ +@Data +@ApiModel(value = "NdKqZzsfwPolicyDTO", description = "") +public class NdKqZzsfwPolicyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("抬头") + private String header; + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("二级标题") + private String secondTitle; + + @ApiModelProperty("适用地区") + private String regionName; + + @ApiModelProperty("责任部门") + private String department; + + @ApiModelProperty("发文日期") + private String issueDate; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("申报时间") + private String applyTime; + + @ApiModelProperty("在线咨询url") + private String onlineConsultationUrl; + + @ApiModelProperty("排序") + private Integer sort; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java new file mode 100644 index 0000000..7d08674 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/ComponentsMatterEliminateEntity.java @@ -0,0 +1,43 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.security.Timestamp; + +// ComponentsMatterEliminateEntity.java +@Data +@TableName("components_matter_eliminate") +public class ComponentsMatterEliminateEntity { + + /** + * 事项名称剔除表,主要剔除事项url报错404链接 + */ + + @ApiModelProperty("id主键") + @TableId(type = IdType.AUTO) + private Long id; + /** + * 组件名称 + */ + private String qlName; + + /** + * 剔除时间 + */ + private Timestamp eliminateTime; + + /** + * 剔除标识,0未剔除,1已剔除 + */ + private String isDelete; + + public ComponentsMatterEliminateEntity(String qlName,String isDelete) { + this.qlName = qlName; + this.isDelete = isDelete; + } +} + diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java new file mode 100644 index 0000000..2922b59 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.java @@ -0,0 +1,422 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * 省回流_政务服务_数据共享_事项基本信息表 + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@TableName("dsc_sx_ads_share_item_qlt_qlsx_common_i_d_v_kq") +@ApiModel(value = "DscSxAdsShareItemQltQlsxCommonIDVKq对象", description = "省回流_政务服务_数据共享_事项基本信息表") +public class DscSxAdsShareItemQltQlsxCommonIDVKq implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("事项唯一标识") + @TableId + private String rowguid; + + @ApiModelProperty("写入同步时间") + private LocalDateTime updateDate; + + @ApiModelProperty("事项更新类型") + private String updateType; + + @ApiModelProperty("事项类型") + private String qlKind; + + @ApiModelProperty("主项编码") + private String qlMainitemId; + + @ApiModelProperty("子项编码") + private String qlSubitemId; + + @ApiModelProperty("事权层级") + private String shiquancj; + + @ApiModelProperty("行政区划代码") + private String belongxiaqucode; + + @ApiModelProperty("实施机关组织机构代码(主管部门组织机构代码)") + private String qlDepOrgcdoe; + + @ApiModelProperty("权力来源") + private String itemsource; + + @ApiModelProperty("版本号") + private String versionNumber; + + @ApiModelProperty("事项入库时间") + private LocalDateTime versionDate; + + @ApiModelProperty("事项状态生效时间") + private LocalDateTime qlEffectTime; + + @ApiModelProperty("事项内部编码") + private String qlInnerCode; + + @ApiModelProperty("事项名称") + private String qlName; + + @ApiModelProperty("事项状态") + private String qlState; + + @ApiModelProperty("法定依据(审批依据;实施依据)") + private String lawbasis; + + @ApiModelProperty("法定期限") + private Long anticipateDay; + + @ApiModelProperty("法定期限单位") + private String anticipateType; + + @ApiModelProperty("承诺期限") + private Long promiseDay; + + @ApiModelProperty("办事者到办事现场次数") + private Long applyerminCount; + + @ApiModelProperty("是否列为国家、省、市、县级行政审批制度改革试点") + private String isPilot; + + @ApiModelProperty("实施机关(主管部门名称)") + private String qlDep; + + @ApiModelProperty("实施或牵头的处(科)室名称") + private String leadDept; + + @ApiModelProperty("办件类型") + private String bjtype; + + @ApiModelProperty("本级审批性质") + private String benjispxz; + + @ApiModelProperty("办理频率") + private String handleFrequency; + + @ApiModelProperty("行政相对人性质(适用对象(行政相对人性质);服务相对人性质)") + private String xingzhenxdrxz; + + @ApiModelProperty("审批条件(申请条件;受理条件)") + private String applyCondition; + + @ApiModelProperty("办件结果文件名称(审批结果)") + private String banjianFinishfiles; + + @ApiModelProperty("咨询电话") + private String linkTel; + + @ApiModelProperty("监督投诉电话") + private String superviseTel; + + @ApiModelProperty("电脑端网上办理地址") + private String webapplyurl; + + @ApiModelProperty("网上咨询网址") + private String webconsulturl; + + @ApiModelProperty("是否收费") + private String chargeFlag; + + @ApiModelProperty("收费依据") + private String chargeBasis; + + @ApiModelProperty("法人关注点") + private String rightclassQiyezt; + + @ApiModelProperty("面向法人的对象分类") + private String rightclassQiyedx; + + @ApiModelProperty("个人关注点") + private String rightclassGerensx; + + @ApiModelProperty("面向个人的对象分类") + private String rightclassGerendx; + + @ApiModelProperty("内部流程信息") + private String inFlowInfo; + + @ApiModelProperty("业务申报材料") + private String materialInfo; + + @ApiModelProperty("材料情形说明") + private String materialCaseInfo; + + @ApiModelProperty("收费项目") + private String chargeitemInfo; + + @ApiModelProperty("常见问题解答") + private String qaInfo; + + @ApiModelProperty("受理地点信息") + private String acceptAddressInfo; + + @ApiModelProperty("交换标识") + private String syncSign; + + @ApiModelProperty("交换时间") + private LocalDateTime syncDate; + + @ApiModelProperty("交换错误描述") + private String syncErrorDesc; + + @ApiModelProperty("部门组织机构代码") + private String ouorgcode; + + @ApiModelProperty("部门编码") + private String ouguid; + + @ApiModelProperty("法人登录地址(电脑端法人认证地址)") + private String farenurl; + + @ApiModelProperty("电脑端个人认证标识") + private String gerenflag; + + @ApiModelProperty("是否统建系统(是否使用统一网上申报)") + private String isTongjian; + + @ApiModelProperty("事项编码") + private String qlFullId; + + @ApiModelProperty("委托下放") + private String entrust; + + @ApiModelProperty("委托下放说明") + private String entrustdes; + + @ApiModelProperty("最少上门次数说明") + private String applyerminCountDesc; + + @ApiModelProperty("事项所属业务类型") + private String outypecode; + + @ApiModelProperty("对外公布办理程序描述") + private String outFlowDesc; + + @ApiModelProperty("办结类型") + private String banjianFinishtype; + + @ApiModelProperty("是否允许特别程序申请") + private String isSpecialpro; + + @ApiModelProperty("删除数据标识") + private String state2; + + @ApiModelProperty("不适宜开展网上申报") + private String nosuitApply; + + @ApiModelProperty("是否接入统一办件库") + private String isUnifydo; + + @ApiModelProperty("是否是上级主管部门统建系统") + private String isUpunify; + + @ApiModelProperty("权力属性") + private String qlAtt; + + @ApiModelProperty("备注") + private String baknote; + + @ApiModelProperty("星级服务(网上办理业务模式)") + private String webapplymode; + + @ApiModelProperty("权力来源方式") + private String itemsourcetype; + + @ApiModelProperty("是否可以适用处罚简易程序") + private String isSimplepunish; + + @ApiModelProperty("是否涉及征收(税)费减免的审批") + private String isLevywaiver; + + @ApiModelProperty("征收标准") + private String feebasis; + + @ApiModelProperty("自由裁量") + private String factInfo; + + @ApiModelProperty("涉密或敏感") + private String isCs; + + @ApiModelProperty("未接入统一办件库其他原因说明") + private String unifydodes; + + @ApiModelProperty("极少业务") + private String isVlb; + + @ApiModelProperty("nounify_do") + private String nounifyDo; + + @ApiModelProperty("乡镇延伸事项的部门源事项") + private String qlInnerCodeItem; + + @ApiModelProperty("是否投资(bak1)") + private String isTouzip; + + @ApiModelProperty("行业主题分类") + private String hangyeclasstype; + + @ApiModelProperty("其他行政权力子类型") + private String qlSubKind; + + @ApiModelProperty("移动端网上办理地址") + private String appwebapplyurl; + + @ApiModelProperty("移动端网上预约地址") + private String appappointmenturl; + + @ApiModelProperty("电脑端网上预约地址") + private String appointmenturl; + + @ApiModelProperty("是否网上预约") + private String isWebappointment; + + @ApiModelProperty("网上预约时段") + private String webappointmentperiod; + + @ApiModelProperty("主要内容") + private String maincontext; + + @ApiModelProperty("共同实施单位") + private String doDept; + + @ApiModelProperty("相关附件") + private String relatedguid; + + @ApiModelProperty("相关附件信息") + private String related; + + @ApiModelProperty("是否提供快递送达") + private String isExpress; + + @ApiModelProperty("公共服务事项子类型") + private String serviceSubKind; + + @ApiModelProperty("是否列入最多跑一次事项清单") + private String ispyc; + + @ApiModelProperty("联办事项") + private String lbsx; + + @ApiModelProperty("外部流程图") + private String outFlowUrl; + + @ApiModelProperty("受理机构") + private String acpInstitution; + + @ApiModelProperty("决定机构") + private String decInstitution; + + @ApiModelProperty("涉及的内容(公共服务:主要内容)") + private String contentInvolve; + + @ApiModelProperty("适用对象说明") + private String applicableObject; + + @ApiModelProperty("行政相对人权利和义务") + private String xingzhenxdrxy; + + @ApiModelProperty("有无数量限制") + private String countLimit; + + @ApiModelProperty("数量限制情况说明") + private String countNote; + + @ApiModelProperty("禁止性要求") + private String banRequirement; + + @ApiModelProperty("事项审查类型") + private String shixiangsctype; + + @ApiModelProperty("事项审查类型说明") + private String shixiangsclx; + + @ApiModelProperty("申请方式") + private String applyType; + + @ApiModelProperty("联系电话") + private String applyTypeTel; + + @ApiModelProperty("邮箱") + private String applyTypeMail; + + @ApiModelProperty("传真") + private String applyTypeFax; + + @ApiModelProperty("办理方式") + private String handleType; + + @ApiModelProperty("手机端法人认证地址") + private String mbfarenadd; + + @ApiModelProperty("手机端个人认证标识") + private String mbgerenflag; + + @ApiModelProperty("时限说明") + private String destime; + + @ApiModelProperty("送达方式") + private String serviceMode; + + @ApiModelProperty("送达时限") + private String serviceDay; + + @ApiModelProperty("其他") + private String ununifydoOther; + + @ApiModelProperty("是否自有") + private String ishasownflow; + + @ApiModelProperty("分区") + private String dt; + + @ApiModelProperty("所属地市") + private String dscCity; + + @ApiModelProperty("所需区/县") + private String dscAdmRegion; + + @ApiModelProperty("数源单位代码") + private String dscSydepCode; + + @ApiModelProperty("数源单位") + private String dscSydepName; + + @ApiModelProperty("数据所属系统名称") + private String dscSydepSys; + + @ApiModelProperty("数源单位表名") + private String dscSydepTblname; + + @ApiModelProperty("唯一自增序列号") + private String dscBizRecordId; + + @ApiModelProperty("I插入U更新D删除") + private String dscBizOperation; + + @ApiModelProperty("源表数据同步时间") + private LocalDateTime dscBizTimestamp; + + @ApiModelProperty("数据来源表名(清洗库或基础库表名)") + private String dscDatasrTblname; + + @ApiModelProperty("业务主键MD5值(清洗增加)") + private String dscHashUnique; + + @ApiModelProperty("清洗时间(清洗增加)") + private String dscCleanTimestamp; + + @ApiModelProperty("地市仓数据入库时间") + private LocalDateTime dscDwRksj; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java new file mode 100644 index 0000000..357f80a --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/MatterKey.java @@ -0,0 +1,24 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import lombok.Data; + +/** + * @Classname MatterKey + * @Description + * @Date 2024/1/3 11:13 + * @Author PoffyZhang + */ +@Data +public class MatterKey { + + private String qlName; + + private String webapplyurl; + + public static MatterKey of(String qlName, String webapplyurl) { + MatterKey matterKey = new MatterKey(); + matterKey.setQlName(qlName); + matterKey.setWebapplyurl(webapplyurl); + return matterKey; + } +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java new file mode 100644 index 0000000..75e936e --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java @@ -0,0 +1,51 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Data +@TableName("nd_kq_zzsfw_matters_deduplicate") +@ApiModel(value = "NdKqZzsfwMattersDeduplicate", description = "") +public class NdKqZzsfwMattersDeduplicate implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("事项名称") + private String qlName; + + @ApiModelProperty("链接") + private String webapplyurl; + + @ApiModelProperty("重复数") + private Integer countNum = 0; + + public static NdKqZzsfwMattersDeduplicate of(String qlName, String webapplyurl) { + NdKqZzsfwMattersDeduplicate dup = new NdKqZzsfwMattersDeduplicate(); + dup.setQlName(qlName); + dup.setWebapplyurl(webapplyurl); + dup.setCountNum(1); + return dup; + } +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java new file mode 100644 index 0000000..4cff81c --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java @@ -0,0 +1,69 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Data +@TableName("nd_kq_zzsfw_menu") +@ApiModel(value = "NdKqZzsfwMenu对象") +public class NdKqZzsfwMenu implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("社区名") + private String zoneName; + + @ApiModelProperty("窗口") + private String window; + + @ApiModelProperty("部门") + private String department; + + @ApiModelProperty("事项名称") + private String itemName; + + @ApiModelProperty("事项在政务中心的rowid") + private String itemRowid; + + @ApiModelProperty("排序") + private Integer sort; + + @ApiModelProperty("链接") + private String webapplyurl; + + @ApiModelProperty("是否在政务中心查到url") + private Integer hasUrl; + + @ApiModelProperty("类型 1.政府服务 2.增值服务 3.特殊") + private Integer type; + + @ApiModelProperty("服务内容") + private String serviceContent; + + @ApiModelProperty("服务流程") + private String serviceProcess; + + @ApiModelProperty("咨询电话") + private String telephone; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java new file mode 100644 index 0000000..aaa6b7e --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java @@ -0,0 +1,64 @@ +package com.ningdatech.kqapi.zzsfw.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-11-02 + */ +@Data +@TableName("nd_kq_zzsfw_policy") +@ApiModel(value = "NdKqZzsfwPolicy对象", description = "") +public class NdKqZzsfwPolicy implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("抬头") + private String header; + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("二级标题") + private String secondTitle; + + @ApiModelProperty("适用地区") + private String regionName; + + @ApiModelProperty("责任部门") + private String department; + + @ApiModelProperty("发文日期") + private String issueDate; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("申报时间") + private String applyTime; + + @ApiModelProperty("在线咨询url") + private String onlineConsultationUrl; + + @ApiModelProperty("排序") + private Integer sort; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java new file mode 100644 index 0000000..b478a62 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MatterTopVO.java @@ -0,0 +1,31 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 事项 + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@ApiModel(value = "MatterTopVO", description = "事项top") +public class MatterTopVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("事项名称") + private String matterName; + + @ApiModelProperty("事项链接") + private String webapplyurl; + + @ApiModelProperty("数量") + private Integer count; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java new file mode 100644 index 0000000..24b4d13 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/MattersVO.java @@ -0,0 +1,49 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + *

+ * 事项 + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@ApiModel(value = "MattersVO", description = "事项") +public class MattersVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + private Long id; + + @ApiModelProperty("id") + private String rowguid; + + @ApiModelProperty("事项名称") + private String matterName; + + @ApiModelProperty("事项链接") + private String webapplyurl; + + @ApiModelProperty("排序编号") + private Integer sort; + + @ApiModelProperty("类型 1.政府服务 2.增值服务 3.特殊") + private Integer type; + + @ApiModelProperty("服务内容") + private String serviceContent; + + @ApiModelProperty("服务流程") + private String serviceProcess; + + @ApiModelProperty("咨询电话") + private String telephone; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java new file mode 100644 index 0000000..b3d996d --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java @@ -0,0 +1,59 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * + *

+ * + * @author ZPF + * @since 2023-11-02 + */ +@Data +@ApiModel(value = "NdKqZzsfwPolicy VO", description = "") +public class NdKqZzsfwPolicyVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + private Long id; + + @ApiModelProperty("数据同步时间") + private LocalDateTime createOn; + + @ApiModelProperty("抬头") + private String header; + + @ApiModelProperty("标题") + private String title; + + @ApiModelProperty("二级标题") + private String secondTitle; + + @ApiModelProperty("适用地区") + private String regionName; + + @ApiModelProperty("责任部门") + private String department; + + @ApiModelProperty("发文日期") + private String issueDate; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("申报时间") + private String applyTime; + + @ApiModelProperty("在线咨询url") + private String onlineConsultationUrl; + + @ApiModelProperty("排序") + private Integer sort; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java new file mode 100644 index 0000000..18b020f --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/TreeVO.java @@ -0,0 +1,56 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 树结构 + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@ApiModel(value = "TreeVO", description = "树结构") +public class TreeVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("rowid") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("类型") + private String type; + + @ApiModelProperty("链接") + private String url; + + @ApiModelProperty("链接") + private Integer sort; + + @ApiModelProperty("事项类型") + private Integer itemType; + + @ApiModelProperty("事项类型") + private Integer itemTypeName; + + @ApiModelProperty("服务内容") + private String serviceContent; + + @ApiModelProperty("服务流程") + private String serviceProcess; + + @ApiModelProperty("咨询电话") + private String telephone; + + @ApiModelProperty("子级") + private List chilren; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java new file mode 100644 index 0000000..f982b95 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/WindowVO.java @@ -0,0 +1,29 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 社区VO + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@ApiModel(value = "WindowVO", description = "窗口VO") +public class WindowVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("窗口") + private String windowName; + + @ApiModelProperty("事项") + private List matters; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java new file mode 100644 index 0000000..2b71c76 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZoneVO.java @@ -0,0 +1,29 @@ +package com.ningdatech.kqapi.zzsfw.model.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 社区VO + *

+ * + * @author ZPF + * @since 2023-10-25 + */ +@Data +@ApiModel(value = "ZoneVO", description = "社区VO") +public class ZoneVO implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("社区") + private String zoneName; + + @ApiModelProperty("社区") + private List windows; +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java index b12b063..3129522 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/ComponentsMatterEliminateService.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; // ComponentsMatterEliminateService.java public interface ComponentsMatterEliminateService extends IService { diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java index 6dd2eab..be4be3b 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.service; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java index f94a816..8b25f63 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; /** *

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java index af7b60a..9baaa96 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.service; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java index 981b53d..8acc426 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; /** *

diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java index 0e4871c..7042acd 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/ComponentsMatterEliminateServiceImpl.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ningdatech.kqapi.zzsfw.entity.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; import com.ningdatech.kqapi.zzsfw.mapper.ComponentsMatterEliminateMapper; import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService; import org.springframework.stereotype.Service; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java index 8c60874..8af12b7 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/DscSxAdsShareItemQltQlsxCommonIDVKqServiceImpl.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.service.impl; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; +import com.ningdatech.kqapi.zzsfw.model.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; import com.ningdatech.kqapi.zzsfw.mapper.DscSxAdsShareItemQltQlsxCommonIDVKqMapper; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java index 0f04f0f..e37217a 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwMatterDeduplicateMapper; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; import org.springframework.stereotype.Service; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java index db100d2..d8d36cf 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java @@ -1,6 +1,6 @@ package com.ningdatech.kqapi.zzsfw.service.impl; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwMenuMapper; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java index 5a565b4..6e3aa78 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java @@ -1,7 +1,7 @@ package com.ningdatech.kqapi.zzsfw.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; import com.ningdatech.kqapi.zzsfw.mapper.NdKqZzsfwPolicyMapper; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService; import org.springframework.stereotype.Service; diff --git a/kqapi/src/main/resources/application-dev.yml b/kqapi/src/main/resources/application-dev.yml index 307f02f..46f263e 100644 --- a/kqapi/src/main/resources/application-dev.yml +++ b/kqapi/src/main/resources/application-dev.yml @@ -76,6 +76,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/src/main/resources/application-prod.yml b/kqapi/src/main/resources/application-prod.yml index 16b94cf..786db38 100644 --- a/kqapi/src/main/resources/application-prod.yml +++ b/kqapi/src/main/resources/application-prod.yml @@ -77,6 +77,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java index 6b6a372..871c33f 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java @@ -3,8 +3,8 @@ package com.ningdatech.kqapi.menu; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Sets; import com.ningdatech.kqapi.AppTests; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMattersDeduplicate; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import org.apache.commons.lang3.StringUtils; diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java index 61c8abb..44d4249 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java @@ -2,10 +2,8 @@ package com.ningdatech.kqapi.menu; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.kqapi.AppTests; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum; -import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -19,7 +17,6 @@ import java.sql.DriverManager; import java.sql.Statement; import java.text.DecimalFormat; import java.time.LocalDateTime; -import java.util.Objects; /** * @Classname MenuTest diff --git a/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java b/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java index bf3300f..110f295 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java @@ -3,11 +3,7 @@ package com.ningdatech.kqapi.menu; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.kqapi.AppTests; -import com.ningdatech.kqapi.zzsfw.entity.entity.DscSxAdsShareItemQltQlsxCommonIDVKq; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.entity.entity.NdKqZzsfwPolicy; -import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; diff --git a/kqapi/target/classes/BOOT-INF/classes/application-dev.yml b/kqapi/target/classes/BOOT-INF/classes/application-dev.yml index 307f02f..46f263e 100644 --- a/kqapi/target/classes/BOOT-INF/classes/application-dev.yml +++ b/kqapi/target/classes/BOOT-INF/classes/application-dev.yml @@ -76,6 +76,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/target/classes/BOOT-INF/classes/application-prod.yml b/kqapi/target/classes/BOOT-INF/classes/application-prod.yml index 16b94cf..786db38 100644 --- a/kqapi/target/classes/BOOT-INF/classes/application-prod.yml +++ b/kqapi/target/classes/BOOT-INF/classes/application-prod.yml @@ -77,6 +77,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/target/classes/application-dev.yml b/kqapi/target/classes/application-dev.yml index 307f02f..46f263e 100644 --- a/kqapi/target/classes/application-dev.yml +++ b/kqapi/target/classes/application-dev.yml @@ -76,6 +76,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/target/classes/application-prod.yml b/kqapi/target/classes/application-prod.yml index 16b94cf..786db38 100644 --- a/kqapi/target/classes/application-prod.yml +++ b/kqapi/target/classes/application-prod.yml @@ -77,6 +77,7 @@ mybatis-plus: db-config: logic-delete-value: true logic-not-delete-value: false + logic-delete-field: deleted logging: config: classpath:logback-spring.xml #日志配置 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/App.class b/kqapi/target/classes/com/ningdatech/kqapi/App.class index cab73f19503002ecea91738467748742f24f584c..872109ea1c123ab2a3a556cda8e00b2544eb8866 100644 GIT binary patch delta 34 pcmaFI`m5i6t4PZXwqeT_Q9LfD)DlTpUZ$b7m5a%4SNmP8A(Zqa zktpxwUvT3_@gMjfoX*YZ+xeas*KwV@oNW!51N$rNr-mT)4AHZOp<4cqOK>*n6mfRnte#ORamh&wanvTffkmqCGTW~9@b=>V32jiY%nd0 zMYc$hBPXDN3|hORdy1GY2Tj$u{cA%fy<8S||>dw6(M*8*AP&*{SkBkf>SG zQ$owj!3x7C*ohOheFNWN_u2h>>DP5zre&6Ly5>_S`mbTo#soGd>12vwrtuMAoEZ#e z#hsHYh)IZ5=GkC@1dHSebIuaiEUQabU0Zv}^fqbXb=sw3CyJ9eI-B%MeTbwCZ!yX? zW29szO@tj$yPT5Yf-G0;QDC224tV5cxq~|fuo&SUKMw-? sByc4GdS-=JV!WxpzBBs=9em1D6}tJNhi_c`s6$V@*-Hy$_3!aE0C*}s^#A|> diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class b/kqapi/target/classes/com/ningdatech/kqapi/common/constant/BizConst.class index 2c9be1906575ec28793d07e924fc7df776038193..9692cadf0c68041c693a856ad2c238366252af9d 100644 GIT binary patch delta 617 zcmYk3OHUI~6vzL!Oxu}Z1Y1!Qc~zha+7<-0rf5>@RBKIJnJFThW}Gx($Yh4J)rA{k zf{%qR$oL3}i3>Nzjjx0fKtF(Az@@sNz>05RJS|4toO6HY{Li`Pp8Lc1U5I@9z4{fv z7@{Hs^oi)l0FR)E<2WIJ#~_cPx6BbZ%eQz$h$rML@>C%g zR}>z@48k=fn^mjBm^A9beV2@T z3EL`H!n4|4O~Mg$cyU_7D8?B2H<#8nzC7Qke%e}oPTy zo^EY!&NOtbV%Sz>wrpE5eMT#liNjhtEE;8wse73ErQfxcUT5?XV#h7EzpN?*d3RlyR&o| zP^tClg&`&;8a2_RMqg-ROnlMQq>WA0*M5#d{S?Ok>@IMjO_RQX`JHp_x%d9hId}j0 z?~gx;=rny2pz|SObRkFrT@2ABG6i}oL>A5amRx}H0kRndl5$Em%t1yS$wh0`iWV)m z5Y@ek;}%93wZ_WsvS+zo)+(;p0=>;B6jRk{Su&@kS%C_S_UTegRpPoiK5I^@8I4g_ zEmO(z7NX-$A#UfKl2t^ua7s=lb#rjQOvwr(Hr0%?5(SU_%_yR&s$ptULRJ+srpBe3 zkA3-ti&X&lN+(>2%}(H)Fj0)<#;U^R-Dh!B*{!@VqEgWe2cDXhM5(U z87yv_n|g4U=3s)UZXTd}_o_IKMPw zrbS&B$bmK)Ma&qJIHMdB4Jpnjn#`3;Q5WjwEziy^L@!^lmYgVzrLr3>mGgEnDlR#i zy}ShFZHN}soq}t5D-~2re7x18TuHNKCqFWVe36tmV@fk=Uz3=cQ4E~DbDdGUCh2Ka z(W{j;R3#Ir$mpqEzLaPfl4dGmN)o8V=*eAPRZG-e zE~5jxTp1n9bOWjhRNlK|wMey`ON@k_G*{~6H;_OTMvZYPE6_4N(i$utqb4*GZn1*4 z(#5P~>X}$f^6RyV`l;z1eh1S5o)G1vK=1m6@WX5P9`+f{6&=^{#*n+WFN?%6R1bnB z9oJS?O7nKbu;z=fg!J-CC1+1KKD3TIYt^AT>5m(u{ne@4Gb>?QqpM+xP&)Jj?p)jAg@xTD~T)fnKw&%Rnzb5w2T|9oY z&nJ8i^bd1%;heceh~#`A&Id=G>Iv(Ht7lFO4O}}4c`-21tHH@b`#c7yCU*$Zd3Hsy zN)R_tt`urt!IfpZqI;MzL|YZxs+l7Quv}-&@|?2!5K}E@W8OwHG%oog*R)hAW5@8l zzrNr2?c2@uFE&2=0l4|q=lAYj--8=J-T3$SpSOdzuw}H~Cr!Pw-ze=n(#x)A7i{!t zVAX$MRlKiV2;%0p9)ZDqWQ8AiIiOS-*%o>ql8ZCdUwY0`>xPlO$9rlpcY3Pj4DyZ8c7^06!bkgDBQaZvhyEQ!#Wxi9L>zEequt$ lMseI>bZ+F{#8$Rt8$0xt=)f+;o(oN2U*JICP{0v5`U3QdM_>Q| delta 358 zcmXX=%Syvg6r7u9F%jt|SR+~=U~8=LS+%J((xnw4TUTibVv$;ixb+JZA-M7b1Xq=A z-1!IogkRv^h11(E?zwa3%*;8@?uR>g(ekk3{&ke3{o7ue2>7k+H&@XEfu=--daE1X z$No*+yYesE-K29DGy);KQg&vn4ZpN^CHpa(>K^uo}Wy>Wd@AU0v4s(!aCKe6HGvtMP+ggyEvoC@W7fj$+pPVPkJGoYj weY31EI}?WN<~&hZM#dy0J)75w2{SQ9A%)&%PRU*tpa@cs0KL2Ut}K^007a65-~a#s diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/impl/MattersCacheHelperImpl.class index 2a49f44ddc5da0d8de3313eca9bd727482aebe79..09ea89357f351cf0a116a3ab8a0405efdc0d06a1 100644 GIT binary patch delta 38 qcmeyu^NDA|YsTz}Z=6_j^HWlDCYvzsW{jNtfl&{_->kwEzybh0;SP-e delta 44 scmeyw^Mz-^YsQ?3Z=Bdt^GY&HDkmE=?q-ad{GL${A)vC^jY)?E0Hpm8kN^Mx diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/HmacAuthUtil.class deleted file mode 100644 index 0bf274f308f84e4fc0d0397e5cef40dc72464f9c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6958 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 V-2Yk9d=8(-7xd_F@VEH8?*IvTcx?ax diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils$1.class deleted file mode 100644 index 33a191360fff95d771269064e6827e4ae78b568d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmb79OA5j;5Pi{VY8C7eT)315!5fHz3vp3AKukkFrb%sD59h)Icqnn)xpjt_$2{J= zVP5aY6Tk*j4$d)Qh*Hz3A06(IoY|d@KY7KfsR? z=c-7-RkFAf2u#I14|>;=BlkCo@NZ$rL5VK>?&Ba_@2Oq4Ljh$hc}-vF5>&;!T3CIeg(<9{+` nmersAhV(hTAoC2;YJ-dm)}CN2g-I0Hme|WOFV9&PIA-lHY)H}7 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class b/kqapi/target/classes/com/ningdatech/kqapi/common/util/SpringUtils.class deleted file mode 100644 index 845b6fab812458e9aa45417dea3abc8870c7e999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3067 zcmbtW>ss4J5It)Q1|tZVOK52uH$Z|R#fBs$3513a5=hOZ#i93$5DF+Uk}HXn{OnWo zHE8l9&>ww(K2*P+kpvcC(z@mQ(5^`7L>}w%_#%ZbQ}`-{uNAaK+cw>~vhI1N zm%=v+oof}>vbUc2R@qx{%A2OEkkKoZvSsML<=AtM?VEePLZRrmTX`?=e(LHw=Fg7% zJa2@b^Rs7GOeyqLbl0@~v)>e&rY+m@XA~NSbL$GpIcL*UxKOlgb9r}X!*omfMwymO z(J}P$y6#%?9vPGVw&f{|6%A)6ZoXmZB&2VSdjrE3)(ambAIgvI%FP6x!B&-FUvFSAtEU`V=N> z#EdNsWLKL+(tlZDpw2Vi3cV*4K)*-@y{Db0OQoq9vTj+kwrt(sb%{7PUAhzVi?W{i z7eqs}95EG!;{I<*WBi|^1*_xO?a`KbD^E*75iXw_ERZxSPDZ8rB84S5T0b4DNFB`qT2ljr8k-(TwF)T`lHos)ZqaaK#p*k6Olr|yTPx~0hJpY;gY6=A=#nz#pRQgxqHE%+(a5C}1int&O@8^9+d3H#$r82?tpO3q zZXhBevx#7XZ_pa6}ks9qH<;@s`Rj%+K*Y& g0bwV~>^|m#We diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/manage/SynManage.class index e18232dac839e033cf8175cbf631f4a0dbc80ad4..aa52105769a9107a9ef12d2b70a06a1c147c8848 100644 GIT binary patch delta 483 zcmZ{f+be@%9LGPu9bRp7#cC^)EpnkT!z{#{56$a*C@F_FQ4Yx@E^y%wpf}3Z$UlJP z%C#%y%AF|6jT`&}<{jF&aP!pn^L(Gr@A=)A+?1S-7^H3Q&1G3wibUsqk=T;q7>nFY#3w}qh$tg9N+mOwnZJM%wqqySKu1rZ8)!d3V?JP1k)CpZF z=KdZZU5w4e)_pyZ@bcKk%FLP?U0kh8mBN{aiMaA8(z5rSmlhQog%tR^M8ab6iv)C@ z|G!;G6@E delta 470 zcmY+9%PT~26vsbj+Yb96Pjv81 zCkeWEr<*Url1Yyg(JKKW5+o`S24spsS;UrAhGdgr*<(Zw8I?1WF}Y$~u98F(ex;Rgd zo)Zk}%>_*^lIIflxXc5t@Q|xKVVLJ!qsn#ObA!)}u+1pD+~hlB{3OL+ZgD_bJlqx^ z8S!ID2U&@elOe_>MP96v8WbqV6nA8vqS%z=8D&}Ju52;s{Au5lW7E_yqaE+ltPM^v zt9}IbqjTDPo;nsd&LUxKx_QJImgr+yyFS()Pf1fDqkVJwrpSu(JJ=>+g_|`RctHy< zY2y_kUen3Cj&E?5H~Pg}UCE}dqN)<%iiDhO*Aa5KpaP AV*mgE delta 423 zcmZ9HNl27&7>A#Cs)p!FTH@c=2F#QG{-Sbnzf`&%Y1^-d-Nw-;d|F?cMi&`(a3)iZC52F32=}{r+zM zgmq^W+r+J0_OyRQ-5CyR+8$+!OZ_xr{?kb7EX)&ZD^Gq@@etUnj1CXDvGbA;JUFNz zkxFuS#S48GQbjSZDWjTBY8a-LG3t0rJ&QE(iAJ_*;+ST>)50mOoYTeyUaon=AKLkg zPlD-?XLL#e-I7j^6woUk`lOM5@y2S<#efVkC{qkc0Ka@-R6a5$JB(Ym$yX9FNf1-o zahhmmNFksuQ-9^Y)8?~;GRITqak7Am_vEug3CnuNigsMrZmZgB4WIt$VZ-|UJV~6J zn0)35Ux?=`NoL_#M9tQtuK>z>% diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/RemoveMattersTask.class index 2013788ac586da6949f4f374759146be6034a611..49b3b21977c8f5d2141957287252dd42485ca6ef 100644 GIT binary patch delta 30 mcmX>mc2sP`Toy*}$rqVLxvQ#*)5`U8^HWlDHt%O?X9EDTqYGmI delta 31 ncmX>qc1&!;Toy*3$rqVLd8(?4)5`Tz^GY&HDmU+AX=eifzk&C}L)c zL=k0EnY>7*ktq>b5a_kdMY7FIOjgLEKm#W0D`YW70zD`CSw%Pi%u}_omB{C%t00a8o9Yg(T$NQ P4n;FCcsI)`FO>iQI8K^- diff --git a/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class b/kqapi/target/classes/com/ningdatech/kqapi/sso/utils/HmacAuthUtil.class index 2436833618366da42014ea3c42196a8265217c77..193ab60a4e939e72f8fd7592640c67ef21ff4b91 100644 GIT binary patch delta 266 zcmdn#yxnC(JFAq6PkvFlequplaz?6ta(-@ZeqOPDZemG>@#KEigHm3&r6bskwPJj- z63Y_xOG`3y^nEgmOKk8dH{5)MO@~R_Tmwy$HEvCkoN>|?8aU-QH*m@_ODf^=!R94A PuQ;UD@#vo}s>A~TJCnPFZGl0f;@D1$bX^aEij^M8%YN0F;$4ZU6uP diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/constants/ZzsfwMenuConstant.class index 1c8f72c4672fe638eb90eb8d2e261216443eb889..c81dc0360b5fac3c20fbaa1a6632f6713ebb912b 100644 GIT binary patch delta 247 zcmX@i@`*+C)W2Q(7#J8#7!DG58Kl@5q$i46M9VNT2>81Cg~o?O2DrwDd-}Qf zhjTES`3pCMZGx delta 206 zcmeywa+pQ*)W2Q(7#J8#805GZm>I;`86?;lBqxemxJxlI2>81Cg~o?O2DrwDd-}Qf zhjTDUGct%EL|t419D_oD{16TX85H%tjv*ngK^zRS6IU!}<741wWH6if!EACjqa_!E zA_Ei9Dh39Y$u}7tJs24n8Gs6aqySJ%A4oF-X;!W642&Cr3?>FaAjt+6Hq)$ diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/DscSxAdsShareItemQltQlsxCommonIDVKqController.class index 4a27fc28a6c0d8148b84ce66732c6d4ad42b0dfa..596d85da4da4d58dfc9c8b1bc070e5d592cdc3ac 100644 GIT binary patch delta 71 zcmcc2d!BbfCsVw}GmC$~H&{UEDr>=aeg|vjU(A|)uM|gC#KeC+4r1tkAMB| z&7T4E<6j-vg{q1GH8CuSVOb0>i{ZK$R>bg%7+w{_Yhrj^3~z|xO%-q9?Hu08<6RZo z@t&Ccvl!l2aVP$g!v`up#9xJ-k8=2%f~@0}6m*Yzeo3!7^Zi%#QLj|8`~d}8*$4v5 zA2VE|WGOf@TJ*}gYr7@W2(03Qer?gH*!s#!b$(ed%SHNF>5?&vMpG!iS+blOp2Zx z_@3ifzCLcAUz`>6#w@osRG+8Wjw!q38bQscrDrzqIpE$sYe$rfO?EKy!xUZZ(`qgodXp$c7WknMQOvQ1ixHLDs(7z&s7`E2`^nPo~r zK^GMowkn1nlr1-)O2<>&+bBbdZffX3sGNCAC|j0I)6F<{H4FxkJPIziL}8gaVV+xK`sXdfT!KpaSQBUT^W)*EM z&)3lvWNcHxj+hD(hov&IslQ^IuQ9}04&Dn!u&`F-7`*L)SDCh41tYgultQx8UL_Kv zT_@tvBizBNvBVub-~0Qu%?!N8(m6amu@)hXl_JZf3Ld{jNCl6zu9H`d7e_txruFxu zB5~R?uT$m@-zs}c)+xtPaL1a`jjr9MhieLkSd*7AS1Kxs-(X?=2o~MYnpWMKs-4bkB&xNveiW{S4UnhS`~T1bdz2%w{*rF!uV{3P3Y{yEEvbK4CrQq1s;S_XE1xE22kJYGy z(DaaEfrkM(lCWrI`mcx-5#NcYLVrO#wx6(FI~Y{(=;m9V()k>m;W>1o=tKb7UNNCg zc{RUi2|pF=Ytow>7UyxZ#9&KclOX$wc-t@&&RQk|`-!HCC!38)9+?d-(Ngs{(u<` zm&Dy=ypY4E8a~74-1gKO&B-!lu-3v*KW(qnW0Kqc?=Ro~?Wfh>ZruFO*Ef4K*!a5! z1OL!a5(aEAhEJvfhwbd|H<3Afq2WvXQ^Q`|#WP{OkD8dfY881r@03%vr=OdMF+048 z)s!Y$!R-=8_RJx&X#ec$cumx$UGcOHzaBU^o0wlqXU5=2Z_@zTQcCVg{#-a?6a&w{ z&f3FvEBpna;GsCXA;+jznc&Gc2hhVGBX_b_%it~{ChxjM1o66q{TpKlS=`5`V|-G0 z%^&(6$|^G7@IHh69NXpm0U`lfxCZy*0X{v*PX-U+0IyyA=3#z%FGH!~AnzEO>DbvM zcHfq;`-shmN1Nn*k_w5-Rmf3d>WH zWudJp%NXIh|A8b-Dfah^|_Ix9`3 z#re4uL(dVLMYf3_9ZB%9CVq@zJm$v)@53~@un zN?BP~yLbhUObrXzjjJ(gJ@wS=K@lbmS&~{t>%e9t=Qofn@?9Rv>6-6M%2RDg^95qs zoxAz_pFjU1q7~Z9P=?mCv_YH3JTm67 zFzBR5k#7EQrJ?YO+? z1R5S=+o}fa@uK6&y|7-9eo0hZoPbePxMkrxX5Ts-(=Qz$JsQTOsyyv0*Oflst35k; zVd(8jFWhdQBW&i-u|1(fACb2H!)tvQzVx)C&v;Yuk}qX>KfejQTL&SI>$2JW$~f)#Tkq+ZjiTiTt{e!f*(S9mr*)FxNtkc2Cv zwYSA&v^uhO&sESV9*^_6+g+FE!srh%y9zXVkOO%V%0NF+wKLO1zO1XJ+;Uw;H_t25 zEx(eM-k@ zs`tfF5LK=GGjtDzfBY_CbT1c={wUVAD}n$6qxZ=?($3&5MUG^f2tRBbs+x*0G-2M@aMh!(dqs9 zr+Y&^9EtxD!Y1#@F;BLDyZ diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/PolicyRegulationsController.class index 08c005aad926b2d5035059c34e6786b22f7012c9..3e6f93494132a72a43f11472b5ac97878dd93dd1 100644 GIT binary patch delta 105 zcmew={6Tm_5hG*z#QD0D7ck1Q=H{oQ=1e}!_>0L`WAZ{q8K}TRCSyiR6u!h{f93~_ b-jfYjbl_?v*zBws8R9ii1vj5!(Pjkzym}*9 delta 110 zcmew${8e~E5hG*9#QD0D7ck1QrRJ4nmQ+qY#Q2NJPh;{zMj4pMeI{c@D^vlA$v(^v c7=0$|vgjaGNwC>jGcqJ-powli%A(B*0IU5b2mk;8 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/DscSxAdsShareItemQltQlsxCommonIDVKqDTO.class deleted file mode 100644 index 93a29011b2e4293effabcd5d44cf2dfb482ca1e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116401 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 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/dto/NdKqZzsfwPolicyDTO.class deleted file mode 100644 index d3d71892d5eb05f87cfdd64842dbb2f5d0e27571..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6851 zcmcgwX>=3U6~52bGLlBNEZedN+}H%s8f>GcCvB2pX$VVV!dA8>bc?Vjwm?WmlA+Lz zgtWATu$4ecX+lW|Bqf0~U>cK>q-{u>?k(N_wCBVo{Oa$XCZ*qq>o zGy~Z3{tN@FQ~A`|v@s`>$rh3YtdJKpbx|st$Zt;e^ccBBvWO(+^raSOyN&d+T(-~1 z6}G^ScN4EKC_4Q3nc>G?9NN2U_=V%chX$@5IxEQ6Yb3jk98mcr>13uSv7(SmWqM%h z8{TbK%0(?I*7uIw>fS%IEtH-U2{Fd-e?< z+%bIU`0$aZurPMA(2vM{S9T5zZ+i&jWM5x;3-1-kR}Q>9ymKU|`fMhh${4)={b{*p zt8!^U)k8;4UKxCCX#dG~Pao^&8Bac&!*kR+g73@}4D6~I{qFrkgL|;%%v2^-m@TNX zb?Ryu&BYGG+aj#7q<_O&Beyb%1o0kn3Rfpl4H#RKo>Sud6q) zeq*vPmDsv9|KR2XHX~KolISjE6HB`9-MEG)mu1tbt}XLcF2$3CdW^!{k)oN{I`ukb z69D%fE2(uhb97o2P^`>VL0#cYWf&979qHroJZH)S6gAFMuk47n3P5gm%1my z&sOHn*N=L_;@+da91%CQju|i~BmlA7B-q_Rm9RYwnjmVFt2`tzYZQ?yI!ma=TG%;PZPJ{5 zAtG7MDM@lR2#e&Lsxmz}Iz_c~Dpmk7~oAxN|o{ap$%LuEm?ay@?3sPJP z4dvZxI$vmlCf(?QLRX8HTcf(VjeJ)w)yEf|AW~@=eL}_C!beroX@*L(SbUtt92Rp~ z%x7^oi%u5zvRF(@1l|6>_FR?rQ9-3H>Q*Vw+9&BgmF}lCDt(H@r&)Z4#b;T3j>Q8k zk}TG;*iYZY2AS8pqZi%PpGuqeZBu#ht#+bNF!tE`^?8|X6{}`+7Eh80xA>7IukkCjKVA$B+;#voQ{IEg~gC?e`bd1oGBE=A8 zI}%i9PT>t@h52HX+A6O{9~Ln(-GVxt4bXbou&%W7twN!U;@j=eab-&v*4ECTNqD*I zAVJenJrgKFABKJlUcD;lBlwR}!uVqthwynD{@uK65fkE1|2BK&xmqMuN`<#=%nKTU?FN6J3l$rN+0q8lw-p7^|hmx49Y{^q^&|;}BGEF;8ndM-}eH z9g_^JxVi9U!w}R%y>5Og$LmM-7eOg^Kc4aWk?ly(I(I+b@%oY7OVE0EKfdw$kF+ z)uB3GKk^z7{9YsdRNjZ0*U-t&wM~1Lyq;5SZ&3I!c`Hw~y-wl9?b8OR${a$eUeXSs zdph2tkmk8WH77{z&^!Yau^BbG7nB;^r+JyGdFK zdQ7WlQp_UNYcU6Dg5Chq1ievfU{a$+YS0>OlIIi}S|yd<(eKHG+HFjnqkh_ibk~cc zv>Eqy1;xca`aI?;X_|PHwm|dH-6BIDWm!mbL3wIecPre~IUB%2~LdT}6?NZSeWcMQ#5ODKjZrxnq`L zz|F8|J0@(I2gfikdbl3LauOQbNzu;@NR})0x~_`eZp^bBhHvDs=yP0D%PqG``QrB3YD)kAhV@+PSn%8ZEK0xiI kUmBd>X%ASfpn{$@`|~rzzY|0d%W*`6-wB?j6L~uMUuea4d;kCd diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/ComponentsMatterEliminateEntity.class deleted file mode 100644 index 97e22e4cd709707d4206d72835006f268efc8cbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3428 zcmb_d+iw(Q6#vcc%4Rza`_6aH@7&M#%^&~#{0o4+ zxRJnCT#7@-hq8Pm%Vk-v#9$@3&&!e*R6!_PmaDQX2yZb4CxKpEGH^}yC0U9FN(RaX zTmuzhEXPn)5OE3$`lhZ~*R5>PDlcTG-15Shg7mq1*>g(voKth=i}s;%+4U^XamzIY zLsO2Mt=+H|7VK))YDuz(D$cZ9u#0D^ZpE&8H)%(^ZWZgc0>df%`O|~HzW7eT=v3Y< zW#=uorhQ7f)Fw zs;Am=objrTpJk6-bV^Ry^6XjW%B%xW&Cb`Wj(0OF+?r>VDl}*~wWD^?_6XDWJ7vc^ zpkUYFlUASP49zi|BP@)9byH5+K2 z-Ej)fhLzg53ec=oA0bVvLAkaykX;Lw6o<{4X|=%phW3*A-laToN*n$+wIf3Jg6Sis zBY^E8w2ObyNQ%#91iHOkw~8$5DhH?Mui1HTZ0Mo_#a%rnp@^k(y+xasB_?edkQ-z8 z9G^`3%*L3RfuM0r`NEDV+Yn$nxIKaKX1KkfizcII#WV=F_^RH;Ls%FK67qzdV-0O)~j}{Ui1`1{itIDjSzbWIs%Cgv?kr~+@J#r5;JbS znzxTRMb7cSGv;l#JSYmXYr3<3K5|PrrQ7&6goAv!IrjzHazFl;M$khzw`$A^L-_Fv2xOcVOdHD#fYROSKF+ z{ec=rv709v@ZBjsC5|F=zm`7`i2FZBshaeT>ZKS?TqlZ;~@*2Rp!(Hq0NkFYt0DgGPEBWw-G_)|!F=93$A z!tZQ^wlryhB-egB+Xq!^CZ{naNluZsIWVJqLcJKZD}7`8)p5UV+xx~A*)*eXi6GkKd&a F{sr4Qwx|FA diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/DscSxAdsShareItemQltQlsxCommonIDVKq.class deleted file mode 100644 index 906ffb47089de8328a72ad6ccbefa1d96b160364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116731 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 z zti7ViE?0u(#1bsJ1aopM)?`uUm@CZ&#nLS5G;=a7)@spbnk(4`$CB+oNj4|nVh#5n z<(n(zhQw0tKTJ6%>tb#9pJtsa@p5B{_n#-8lY6n|`!90Om3~8G>GxlypOb;H7X0rr z(3OP4VoCVlCZUsuu}1u_^U#%wd9hUdA5ziD##lT4FWKly$l;z>11ZCHUIa_bR}m&EIEIRl+21x}T}fLMOWNN$X`Q@{HSTYox31JJ zj-~GJkh)Ix#@hGy$X-_hm&6kI_eo$Uhht6rJLRw|jYq}O_;*WVCzE5X{QG6HE15^f zlKJ;cW+$Ix4gI_3vn!>?#8UcqPH88rV{QF=XSFM_$Ho%-_fKpmw`0xy2jsRZy~oAU z`wvNPC&Obc{>NmvE6J~kCHWtfw!cQQZL`hR@pyORHgSn~fF$?xQUtONd({C5q3@v$NB zCk+8-6vX=A&l&};fiNL95dOS@;EaV>H~fiX!8IHv#)iY6Ivku45$lORcSN`b#f`B+ z@n;VTXI#WO<4+$KuAwn0HZ+cdq2Y{k4F6xU#x8XGLf(_nGNORQs#tMMX-jL#puGH#d8AGgit(~tS$e181< z&^~|iW%u|~D*01)`O_Ni^4*MoD*4leF>{x{QYC+7Va(!46=BTgMpa?V;YKxK%;iRP zVcfzEQyBBOQ9~H>xlvOX3%F5B7z?>^f-n~G8q^lXVs4x$j3t~_M;J@FQCAqtxN(v& zmUH7|VNBxzGK8^$Bc}*s21ia6#!cL)CybSxR$myaxY0lutGUro7;CuENEmCm(O4Mk zxY0xy>$%ZX7`JkxnJ_kR<1}Gxj_ajr1#;>LNx*ujlf!nm6o=L=&eH!cvyE^f3I#y#9< zBaGd=dD{wO4@cSwV=p(_3u7NQItXJwH#!RA05>ia#zAgeB#cAc=p>ALxzSk|_i^K5 zVcgG+F2Z<#8(oF*AUC=R;~{Qz7skWf=pl?pxY1J>k8-1zFdpMZZ(%&njXuJ7f*XB> z@gz6;3F9elTq2C8xpAp5p5ex2!g!V&mkZ-LZd@UZ=ef~e7%y<+N@2XnjjM$55;q12 z<7IAKEsR&VktvKP`5_>mivh4B+NrU>I_ZcG)%FWi_W zj9cE`$?0L_}bDneF{QmdP&jHM#6vn4f zC@hKiOvL3VMz9p2c16Thu`P?ZCKuO5yCK?27&oIB!jgeoa;_RE8dwwcb{KaQLc6s! zYui>xu0FKBv2r!5zLhIE&1!wCpb&d(Z&*7!wf$DJrVwa6P`ID&ckH)Jua+CzxjM6K zT8>?=JJsBiCwmVb=j^&ub@n?)(Q+KSdCT5sJ?%pPX|ot>Erb22@2V}Evv?gJrTDz9@=H6FnwP^HF_uGUn%Gfr(!obAwfLV z8KUW0yPpa7vS)_Fo=1;usN`7XM@4JL<(0eUZiZ2|>dOL8!Khe!6>l`;X@%AAtgjT8 z36FZHY45dajzYLw*PQCfZ#WHaqZFd0Mypx2uT^EJ@$Tr)%kC*${O?O+;!RANcn9yA zcu&MA#!QThn8UP*w{gxyTC^$AKEy`~<0m)$a;sX~6gG#uh|(UV3nuPjolvur$68uo z=gc^da|(&0WZrPd2%n5y-&B|#vRaf+!^|&G?)(h*lY@+`WhwI7>~Dyrv=8Vi1Njqe%VBe%}co@1JS1^MN5sspStULNCT*WMHLEbFlJT(p1>7S#f zqsWXGsDfC*V+e)3nix#Y zoR`(F9mL1{`-C-h*1kk7z&CgSdEyCjL&s5|rnxlSg!YOCjWj65)}hoZIvsrn#4rlI z61_7_~T6beJL!s H%rE`}51oGT diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMattersDeduplicate.class deleted file mode 100644 index c1e94a6c6995ef07544a3a28bc49f7029f1d703d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4504 zcmb_fYjYdr6@Fe@mzA_Owj4Vsaf#EqgRfEVElNT$c0x^j39)0E^kUZ5#@Laoa3v@Flaa!DA^hVkPl+Hpa{bMky%mKQYqM8jnbKh^Lv4KK>x&%^jd7{63# zDVhb#$jq39qLs@YA01Ip_bW6F=dwlH$l5bTrep?bzWh@P4OW^$W2cR?Mlxe$7m{PS z?81J9#IaJ=wwBBpt7y$-%%N;HXB#$E78QEOtX#5q&RAG53rVBONe<<$@m$)>94+MX zX2D*ep5R$IP(icOH{QCw{`_kSgJbi#rR1EETe8x*QgUf!j*5%}Z-Q z0`^Lt8V0r{HkzI$TBL@KPfzmP`GRTK=46&Gxn7D_^m5+FjF2(SH=^TfFI-z&eeLF@ zr`BG5W$ki#{qpMyq2o5K3=B3qtUb&_aJ7>-r`Fv)j zRLD?t{keD6o_dlu|c|MboJEf56@!`DFw(j&g z(a6%2G`*N#OrBXb@>cTv`QoW_Nt3CwS1ON*^pWM0vOjLvHtS-Vd|JD;0VDLBisGzJR1emOiZnna>9m{9e%Njks=o|mrF*5A+1q7 zId|HexA*s+y#CLJo6#Zty*={YV%x~tZc-Y_)WU9n2h# z-VGR$G5xp#;9gg_47KuD9dS_ z&~X^|>G-NpP89&H|9O!a$PP%!Z%a?U-2-NF4zNuavB^==mTD8M%A%z{z7H`Ta=SH^9%NSK? zts=cnWs^CVip5xy~569y)|24Cs?|BA<6CccZm zy$E3!K8{b2?&haL13t+gQ^ogQzIX7gk92<#0~jQ+&qNZR;x04kVPbrGn9q{I>~3Xz zfedDRE8|OKuspUh_M-(69Kb=c?xrQD32fxE^E%XtH_*4zN_B)|n}xgU3bO_42XZmCVnVq!tndJi)zcH*t{%6}m5jD}dSctvX$hEfpiEEu|-70@6JYsR}4?m98~9J?jt5 zqpr&vh4Vg6;%f{@JN}BVJHwzGf5bPq*U0XE72hNkU@u?7EU6%`tS9jhsSq-}sti(L z6kuYGl!j;7_w%G8xXdz5lZv9up=*+g;m_EOQ>1h((6%AO!`i>l9LC}Y=m^8&e@%UW z+g&p9(IgGyh3ZwsU3^MU1SO5)yF0J^zPn9R88d{^WARN{KZFEa63OaB#w2g}&;knFdl0>VfHJdP&i;Idj%L5IakaD=o3r?tz9r$P=Zw83J1 zxU9BR*kQ3WJgKn5>a3s0W3HKAA{+4pmXM_rK|F>WsRoAr5#;G$BX7G!ERzcGW*KL? zB#|e0pA|`kU}GnLl1NF*KM?(p8v&+8DW-ydO@Bxg)%OP3Xh*ODs9*xMTOKUrgH@56 zcRg^p7F@;GVR$0i7Llq{eI5lFCVt+y8OK?MO75qz>uBdi+Y#Sc#_f{$G7|A!F5N2h zZkLYp5$|;AHlaV}(k+6ygLD~tHjjLFXuEghn3u8!o-9>*&iU|2kop$w;D^Tw&hv%D KxAC1KzWX1tf5JBa diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwMenu.class deleted file mode 100644 index 20307086834e9a276c904093b5fb5beb5143eb13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6486 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 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/entity/NdKqZzsfwPolicy.class deleted file mode 100644 index 5be3334dcbae7736a842c3396e68d1cceea49d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7574 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 MzNd3IUBj7w0e}82LI3~& diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/MattersVO.class deleted file mode 100644 index 11525bef4dd8ca568c30bd5d3f21d90645b62160..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3247 zcmb7GYjYD-7=BKY&2EzI6&ta%`pvt7gG%>{w(VarYx7LDm? z(@7a?lGK5`HDXVh*^`c)HywA0_b3a}u0Tjyiq9LaYdWLGJURNGH$J@g^-s4y{^;(? zRe{8!Icenc*`=bBEer2`cJt1qZv-L*+i?XpRd_m-b4}W(3H{EcPjBD2eD{~nZ(qJH z5Z!0xEcZo$a98&PRS(f4freo#XO0%-{hP7bhg$gq*T^p^)nCl3tvcq$=9Ws17t(8}l%*Z>U=Eb6s zWiG0WoS2+7Gwwk5Id+#_-8zAYCAZxf(-DZtTz2}Ei+jA_pnHOH|JC`j^0~niSGG!{ zkEmjKpsJo}@=;a1x^dUY%#9d%ufCi+j*EbnF>*&_cqC_x!i?V{?3W>We{yVSTVUKQA~{<%0~4GyMjCo>UalB?8v_MwR8n02ELF`@CbjmlHSHQHH1g`VG(%l;5otl34XR0&`ALcvr+IA1uWJ^K^Fxq z;6_0&>d0ihx$dBq6nDX0>A4Q^z2`=XYt&;lVJB(b2jCg(;z`Jwa;;YW0imnwl-p`5 zvlnV8hu14_t*Oi&s-YZNul!g|Wj19EWo5l`M@{9uNC(PkW;P@<)YJPTLbWs2>LY@T z$!z*%6&R>}PxxW)@w-4^U+sG$4||W_Gy;Qou~uBl!`|cfn2^Kn-y_~*>_wQfD&nyphQ|rsuH9HAT_B~fb?{XAUz#V#v~{nfMUsb2^6_PufrUO z>h90`(Ufa>4F_(&p$)ds4kJROmOWF(MivXs6kkybnrtLQ0dNu?yx(@{?pEsI!NYHh1sj$^(rfyZIYV+`Z; zRAItTkqR+^7jT+Ugt48;pCA=slkdVAQVPEmw%|2VQ7_HkL3=<(glQInspUVm52(0y z4oOA}loFtXiBz)!ShNDRhFs4Lz-l#k4PQe*6~@RfG`}X8Wt{TW-v2Y|&t6AEbK@$S zWC^%6H~Vx#(wlr*m-J?z=2Wyaw~}7Pmi3Qc<%7RJ$Z-hgyxw`;`&MeC-8X2R-%4-d ItpeWu2XZq)PMzE~alnvKphGSypm| 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 D;D_w` diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/TreeVO.class deleted file mode 100644 index ccf376dbdd6939ac73644f3e4af23d955dcadeea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4317 zcmb7HU2_{(8GcsY)vn}~tthoqwV_Re3;wL2lmhD{%|}z}VkaR^Oj-(bBX6xuWJ!@$ z2}${E3-p7wDFIqarvt-K--Mx^q3%q>bl|4UaLE-jTyc?j_zx-NdH1X=S=tV<$3FX< z^FHs{^M0Q7-~apG`vC62>uKDECsMHR9T~nW!}nzPz6?K*;fE%kO!N7a3{MOHM}mGV z!%t**Muul)cuu6xoA_xOIXq$E1$n+`;Uxg~!p|-ILf|h=ykg>24cUfQ z_ucY>S8w>$%JG@|HE0iM$Q-Cv8i8907Tj{vGk9eA(KICdMGd*xQ|?)}Pam)^hj z;_oSLRO^9;tsO_4sRSNh%)QNG$uHNv3hh?%X5g0#vwkC>Fg5QlRotLi=kE7)iFeHw ztILH7EnRd2uUIOaKI7K>!i5Ws$Ilf!+8vxPoUIm))jesj2q1C55V zVQ9411aYKEd1M4pWCW2if=71Xbz`YTB8Imbl)O4KRK$@TIeh`G4>iBr07--iot{> zw^34Mz?zt$Jx7kt%pIh`#L2qXXqH*QMr2Fhh#cM+QD-$q)Y0^j@F>>E`fIJAsuG-` zov$|QMehM$>Z)HAe7cjtROCdu{BKVZRIqWOx8yw&CNH zhHc&LcYo6_FG@zF)zL@&#oac3h1XanlRLz7yF(fT8LYOj5w`^$PByfFbP_ ze1-ysIbOifQ~dexF!y#J;tSY9E#?kKhm-=J8lT4ayU^Yab*4Ec!^IqS5!;G@-Ppq! zFDC5exKa5}NW9ghoR3vzLd7Webt`X=Rc0c_DC^zIx5p|ofn$`7Zsnb^$}Ec*VP?1TXpFLo;)8tm3?7P3;Bd2q#Atlt9VFsoHmn#?%p{&FB{h5{exJS@ z-A84xhS~Ui^c&qrCA@~Y_u0Gx4M)jVb(3T(zLzU1lJi9DuIi)-oo^T<^ZLa2n=tgt6Mu#E8jQZn6Mum|~e_sCpTUKCC<@Htcw-~l#kYYQ@ydj+A2gt1;lQ;6o4pPQ3Ny<1@ z-V~A*k<7f+K^kyUBn>#}d`d{^h?L5wJ4l00KS_g*o$nWt9g&DSNLeRCQq~#BXM{8m zkuv##7D>Mx>(^J6U)J;YIu`IXdTj`6IKe)YzzF_{hq>0rzWNV5LZq|I-oe+23})3I z@hDLeWn9EJh)mS+9KK1!|3+{c-y%xk6?k}zD2-KKZZ1(j{>(;klE}ut*w%|g8T=c! zVv%Tod@%QiOzS!ZOg#P}hD|K-*U~=3%?hSA1$l1XyecEYwk)-6NGgbH5+9Rt#=2_^ zIz(Kf$;GU;Njyls6t&;XPVdrphv~CDJ6&S(SlNjcm{Y6R@|djKjxK_{9!V@oDJ9A{ zMkr!7g-TZ5Xo&`#WGG6mig)@S;Da;}t%H6E+ zpy0g1Y$LbiZdEudcsubbKGA(4c7A@Gi1HwTW>^(x!w;J*&vTBa;@8!;alU~I{{v~B BHv#|v diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/entity/vo/WindowVO.class deleted file mode 100644 index fa6bf392776c0ab27f5af316ac1fd01a00a2e0ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2613 zcmbVOU2_vv7=BK&n{3l9gg}eIsuWPuFV+w6BP~@vS}7(iG!O*8*rrRfknV=;h7SA% zFT8ZdJBJyWak$VKEhEl2dV@3m1}}9S@4Xc9IlG&-NyEs{Y0i1iInR0D=RD_qPx9-( z_kIL$2$xgH;7kt`EXbym#Mu=4bFwMRwe!+?Pg)m}xR^o;XEeMo`wujHDEp5zd@TD* zNtj723Zy-&VVkwG)$nZBIX8PkK%5fjJMKE3Z#sV2tTio_;pLwYNUhq=lDj%*u2=$@ z!WHwnY1B+-*(mu9+gY9v$SyP;-(IoGwr4NatfP+O`le6kp1^Ryb`5XUTwb;shPkm~ z9Ie|$cgd=qZn$-;;oqPi^|}l#kofbf&;I!ImOygF^nLOq=`e27w`)eh_I#pyO7^m2 z`ppJ+9P3z~EL7YT!y&yT)3+*ByhVIMr6H|1U`2F4| ze|_;ijY-?F{V9QXZn!L<94AkK?FHMh=9(*uR^zP6V@fgH3WYQ&C&$sG;#X}FHXe_` z`9NC|-~}vOemD%J-jy5fCU%Ojh&LIuFq?%rv1Rg!EV$Voi6#pMa?hkg%>b%^GEIBRRi##j5xd!xx$1ZhP)VOUyafuUZY>uDrGb zn^QdSSdYYGh|h8c0y`1M9_&It?E${0G3@4tnsWR!$Gz+a z`FX~}vs|FgY=;8izD~e?^bpBQVfz9h27AF?9k~nfO|a)hwuxXegB)!=1Yj5=90_?F zY}+?~i`ds4o3mXv^8!h(b920N^I(_F;fW;Sm+*4LAWvs8$#-P*JH)#49|#chiKA18t$w7^g5R($jS|#;A7?_QhiNfsBc^{dLXybp=*X8)l{=$9 zL-`zP{Lbi4P>N$CYfytBjl|p-o4hjq3wpE4eeAdmeLSnIA=yG`d6f_?pUA2blemw} zZS-Z;Y@!8H?sPrF$&kak7FE1~H_5OcCFFU(F{Z`|OmHsF(G(_WDR_q`IzmfDk@+-5 zD}lG@e=mBH+CSKq#M=)rki=2`YvKW(3e6sV?a2a;6p(S`U8(Zul3wf)607UCxLrj<2ETlAPD_id@Jl(TXM|8BRfY$O(lq2*IQC2hT%-HpVeI(GRr+ zXknE0DZ&_!k5P2e1;!LSY3>K4F5E?LMqfjpJTSY=w$RqrusxHey@nl~MYOqmbJ4kC XcsEeK5IhWN`Y$pHUyeD2Anw=+NKb zFYvP?U-+OiT4r#D(JwgTZ}6+*AMm4y&)MDdl7y|)f_J(=eG-{@^ zW|aJf?W~OoWS5$bZ?9Wr+p||{)}-UOzUkAoCy<}DUBlZj*Ve3tVeXt5lXZK}UA1b9 z4YzJJ{5$lc-j;y{5`TRC@b@nt2qZUbXVu-Hn{*hr>Dx79*7kgAca`il$Ml;GT1>Vb zkIh!xb;BXNRnxaBRpaI@vu+!ko8A{2hDEUc9pkoZTn*fp7e*)OFEM62wm%^d&*jSk z$`sKF9Gtb8dvkroYFsv%oTR|5kUWzVavg0de$^(-k!Op$Ogi-?4 z^q;V9HO(5y*n@Fl<%U)9NAt_9W_NF;Mn|kL*RNU)mb$#IlRIU7AlTovp$7`v<<}FQ z@2pF{S-Cl9)`RP3PqMYxCl%8MHETXgcvnR2 zz$UdIdyG}&<$UZg;8u*H|96ue~iX4skuvtG9x+KzN8-hK5Pfg(?P z^jn4WRDBHc$<09EFyc6hUi4A!=UW-W5q`)f*Uxj^&3S;I7d*Vk12W8UFi~24C=_ihM9`^f@ zObfh0?U17cxj)XG5a}68EZ7L?pNx>CX0o!!{RH zyp4B=un#4i<^9H37}F?nFV1_Oz$hgJ?=zz@N-E}9PvevlJOi`uN@{=MKoajhMt>6T z@m~{<@mwf&@#{@CZ^Xb^&hoBQnYx4*dkV$sHawM}Bs?MeJ#zCK?c}e9VtRB;84u_h zNRL)YmXYZr@y#R}7Z|=06A?hBW=l(&x)Dhj|YR F{{T-s7jggq diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/MatterManage.class index cd1142eb8cf8a8cdea88a2acf19321f90b2ca58a..e7dabf9fafa3224ea80963df27599f939a74164e 100644 GIT binary patch literal 23904 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 PZ{qI`R(FX1h!6h<1fs{j literal 11898 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 A(*OVf delta 375 zcmX?Se$RZvVJ4;upUIA#l9MO!C{F&*B+HhXSCUy$Ia!fehS6)X9kUKhAfMTiB}2o@ zYjUBW*5qrcD=w?YCTSg|#U;r8VNkDY- IGF}Zn0M{mTod5s; diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/QlManage.class index fad4bc6900b41514d4ebf8c4652fea4a72678fc3..c2d90dd01baa547f84b4dfd2a1bf79a6140d74f5 100644 GIT binary patch delta 218 zcmbQH*r&L`jFBl`WAb@MS&saa)ExbklKjaBnN%h>F*Y*#VhZ~)Su(~??qJek%>^l+ zyoV!Z delta 252 zcmeBEoTj+JjFCA(!)NkGPHFDcypqh4O8u0QeEms`%9HJwMJ7*W%w_V!D(k~!$(S&? zjY)?MqHXd&4xPyhm|6HagEQ0f5=%;pQW+UG;4;||N!R8D%!Q1MU`r69+M8opuP{MG z(H&OBk;t3`F&V01^FNL~ETS3=Tnw5F3Jh8dW(?X49t;``ehj*k&-3OpDs8sso5{$i PF!?5b45Q*?Gl2*II2cd{ diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/ComponentsMatterEliminateMapper.class index 48c7229492c052684e55157e1f77e057ab03d8ae..7da3e1894a69b96192a0ed33580d336b160dd727 100644 GIT binary patch delta 31 ncmeBU?q!~!$k;bgDV{esKP5FsKQ*r;v!qgg;z7xYE1m%WsAvoq delta 32 icmeBW?qi;y$k;zoDV{GiuOzdiQXfi9JRmu7`7;2vXAGkN diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/DscSxAdsShareItemQltQlsxCommonIDVKqMapper.class index 538cc7a45fd99ebf0f68e1083ae9ae9a30d4ec81..45d22e680a62438ad9c5a0da2b8b875ba051fbd1 100644 GIT binary patch delta 21 ccmZ3+yp(x@BIBfqO7X0@`6;P68{6d>0ZwKI761SM delta 22 dcmZ3=yo`B*BID$VO7U!|c_o=8l^fgS839)b2crN0 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class index c3265d5d9ec4404d526b744ed5416fdb4e4a74f9..e9db81039da6bafee2972a25c001985897e68dad 100644 GIT binary patch delta 21 ccmeBS?q;5#$k;VeDV{YqKP5G1V>>G&07(o diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/IDscSxAdsShareItemQltQlsxCommonIDVKqService.class index b5ed5a20ab4c15dab3b68295b869bb16c908bdcc..d94d02339ece713417de7a01227683c86911c329 100644 GIT binary patch delta 21 ccmdnYyoq^&BIC4)O3AFb`6;P68@n|a0Z{M7y((e2hsol diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class index 2447d38f6581ca931748574a939bcb64e811e108..9661a06f83948f054973f5393f0eb2c9930f2000 100644 GIT binary patch delta 21 ccmbQqJcD_HB4gh~rDWFJ{FKz3joo~V08Bgv?*IS* delta 22 dcmbQiJd=5XB4htVrDV3$ypqh4%8gxoi~v-{2Ydhk diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class index 7ca3dfdd8ed9b4a74bf9f72ec2a7af981451b5c2..a6253853fd80f5d8ae9ccd90156a8f09d682b836 100644 GIT binary patch delta 20 bcmey!^nq!DB4fiurDWFJ{FKz3iQUftQTqr+ delta 21 ccmeys^pRex7~8Q6^2F$+wxTCo?f-@#f~Iq~_?S=9OfYRO(M+QrxuO delta 29 lcmX@let~_$Q6?>)$+wuSCo?f-v8CpfWR_HJE@X^j0sy2;3QYh2 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class index cb8d8d4ebd5d313f3c8d91c9833e8b79cf582f01..5ae5a2ebf05128d9762143ca8b2f71cb3b9662dc 100644 GIT binary patch delta 22 ecmbQlK9POG9!CC&d*`y|=BK3QY))V_VgdkPu?N=x delta 23 fcmbQpK8bz89!7zQd*`yH=9OfYRBn!EG-3h(X|f1p diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class index 07baed620011845d5062e888f3e97452430748db..09ffda531ee7b9748027370865aa7d3baec39b73 100644 GIT binary patch delta 22 ecmdnSwv}zdddBAyH%ws7%}+_q+3d#nfe`?43JGxl delta 23 fcmdnWwvBDVdd3$MH%wql%`3?)sod$}t7B80JcIo)qw{1zCTX}c WlqVnHSj1?GB({M?bn{G3K_LK3l{gIm delta 192 zcmZ2zzRG;V7bZrx$%%|IY^ixAnI)BzH?pd1wqg!qWVApQUB}YO=ry^4RR^YQ9g7&N zoi!sv1hU{p)}>5Q8p!&9rcIv9X3yk_Av%GbWwJWEFk{4IYj(J)AmtO-pD?;i7G#o! WS+$W>dGZd9MT}-hf}5*3)r0`9t3EdX diff --git a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/MenuTest.class index d54bc374f0ad3cda30a3f57e09089a42e4ebba17..72557f0f6bfed91a74469e8480c562449f3133de 100644 GIT binary patch literal 6961 zcmb7J3wRXQb^edE(yT@!B$nqI9E6dDz>)@mcz6ZILIPVs5(M!Gl!T0SM`+RR&ayj; zB$7Bz?7W;fNz>R4iDTEa4zAN0+qH!-Zk#^irf%cDQm1X2xNQotn@8Iuj@#HZ{qO8k zAVkWiy>sW@bI(2Zoc}!T@WNZqd=)^u^y=uty&CTGJ_L$J3Zl)Mu(OiLxdBdZ$xiE6&C zHh$iZKh^LJKmJU|N}N#53u?zdSNr^hAKz3PyjX?5#9!%b{#y0^#*e>M48EnBzf;Xi zRrogkUT5h&M}_>Ld{-cB$B#AqM8kgws^fMdGhnBVMZ>lr)Ejo8l^dgpsC$#3ylKT=fv?MnP}17o zXu|H##0TxvZi~AK0=-VyitV*hQT3i1^tr=PZr?EdxzyQBb%@<|+T~V0mrp@mA``b$ z(Qua?BfnV2V}8UsW|=W7aoFs3GTeaV{-|rm`*|3(d2xQgRi{+!6o0|`={L_RHO|w- zOq+^x$IU53wo@c3Cy`+3j0|@A~)3)NI@GD~uI?jlo zaYlywa&%l%GvHd`kv=Qw8OlTBeH#8#!+&Y`sfM2k^sQrIJL%y^!_R3IkM)rZ!C>a> zrAOmQC*^iqt|gcivBS~072D>d;+DI*AhK(Zxn_6ioD%uCL-=^6tC_NnR!fs5w;zor zBF<=*MvvG@E9KIjoSBt#gf55LEFIXHa>90+%Bphhn4KKv7ThUJ6zv{QvOBYK6xtMB zhlbY}Ej0XsTe%9$ory@76U)RClq&2b5_VW=MKCXGll0M;Nm+8kJX}?perIQeom-@# z#B-2rLg@ya zOe$q1PeSjxg14;=C05|Pm+T>ouQ%e1H*K+gWYy|#C4Jf+uB;& z+AlnK`ocpGw~ocqV~X4Bf|V+$l(@rKIz3e45bqoq*p`Q!TJhf+{>Q*C@dklr;7$B5 zp=RJMTr_xkA?OS#lX3(7*dbUuLnOSi(`w=~q(Uk+(G2lR74d9{F4dYChSbQcyaqfC zX9LBSOf(j;Qv&Uk#~#0M&*LFOYNgJQ*-EZj2^ca*=4vv}kokDskOi_(lb|8j$Xr7f z$zn~eRbs!*kR@umUNuYcx+d2dvP>Ebxn3F#S+0hgWQ8FsRda(h3p!@f`1z9$oWK3q z3-{lB{;r28)P=hrTfJ&^`>OU;Ydizw&vChPQI*RKX^~bXm8pb&LjXfoNgE+;$ZFhS z$Qo%jq#bt1*l;w+87?TQp`AZYHK3w zL>Q?zW!#|+jaDq?jP7J)kA}C~AR+vKJ)b|Zm5Fwnbc$cm+jY+uT8R2=B{ z^5k~=NVIMBnx!glL=KG{J>#415=E_^z^&mUtxEjX?o^b*X>yYxo8@LrIt|$( zU7Bd=GJpKu6(|J`T5U2^2+IxKlt3! zublqUa!qbA<)r!!#{w1zUV*f?$WcIBmWipi`H1q|7) zrmmaTE!1HPiBxdyv_zfBq>9@NH4T^e?UXc@_gKM_naG%&n7?MC@baNxcJVN|^p`&% z!%)wT!U1W&B4yS!uOewaVl!?wl_c3*{#V7y!rZvpsU&5psX8TkHk);(30MNEhB1|$ ze#h;nH7?=0WAF&$eurABAGTfZaGhM#*wnLP#-y7s3l?zI&f)QNlvPr;aN03MCDI%$ ztO$=v&U;F2xEjZ7U7*oBGWL!k!F;u#sJmj3(W-DTXgTp{#L1ZP@j;e@>0~UEHp5QJ zHeJVwjWC<=0RZPs@ zBE#G^OlKRW#b>r4Q?Y}!@bp!#Dz5CfbBsY?ZPTwVN`B`R2WVuf`GB2rZndL_hiN}5 zpQEMF8&5M$bHd4RI+u|Npq;ELi#1oJQdxrOx204`dFYi`V@i_Y+5O~_D{7}K&EspP zrLL3ri@8mu7SC;4;#VcYGO?+$-;J?i(Rg^}HG=D}1~NrPaqDOD@GPqUnPw$W@42(h z;UH0dNf}RNcTZ7vww70})?Ip_LWy6Uw%wjWm9O3o6bi>GzU}jh#6mV?#xcEX2uo61 z0X(|a1srYtz1=$WNX>rb?(~v6fuOV@FNja+VeZVVO=a)hu?}ciK zlJr(9y+;*szO<#_J0)V}ZBHOp4teGCWg01%czNk2xzSS9<@e>Oa>mXUzfIJ@)okgN zzm#EM_pYA)TiCIWW|(q`oBln0TX*$zF`BE>W?hsuZ?^s}87q|F2I+PetMD~5csz3# zapK)nO=W8(#a8d?RMFYpy_JAjJJSvBO3P_i5ANP|bza{7Ug1~NkuqLZKefdG>V-P4 zrYW-5kL$0Z^K5KnAoh5u`#`qH=(7?QuY1{`Q@kPw`lexcnd5g{K9V!^WjBs&!7z20 zcl7Kfqj2v~nWBV4VVs%@6eKT%|!|2#@S$ ziDzReKLPde^O5j_5sP|0ck->0&v)?Y7isqX{b*OUXQ!oNGlbCfDwPn~>u}+((&8s*m^Mk&5T9&ZoEb0U& zPY^z}T!1R8_7Qp^OFE6oJ;vuL7P?$qSeTdyhum3s!d4NKU+ z4my@$4jQlkjWkyidn?d_8?cV;Mp}0}+DN||hp-02XvYX=K9BWy6dUj?Zp4cS;bnB- z$E1D@H}P7ySt@Wd?=PLaJ#7&aU2-$Jr4N0w7rSH-Z8A)b3K&Tm|7F~P1Nb%g$svP- zco(Y3BZ7BxM;-lg4c-F_8XBY5p3&tKRQhL$`zP$K-1+A zqBugp&Ed`?h!L7`?%D?5MZ(&zA)&$1kkoKgLy8w!MocVz1HZUP-sOd9E^+x&u+J16 z;TT5*qj@Cz$dqb?yy+o%#dJvi{#B7&fbQgU(3SiDU(hYZQpm3`M}!b_EB6QJU(JMh zRRLYZ=>%FP(Hhbfp*{h#6kwrhHA+MU3&^H3gbX!msL@h**Qn7NHR>+`{VX*)OO4j$ zokOvxRl~I$4y+2*wbbSLv~g;7aQ2f}J%KeRaBXo$Evi$C>bU3>)+(ZQk7%WLw6*GJ zfncDxB73&tqP*9UNQt?G4=Sdf4<2wSA3RY59~5>S9~5pqAKY$3Fz_U9oIq#-9l=1( z5d%tDjh=JeQgp5t=rACxbpm@1LA`)*UPK@_5VkD@@jAkGBLTaOkljg;?k7wS5}+R^ zK<`5W55l2?CHaN?D87LdUP2n*BMN^+1pXYyqzt2?V@wueT|RQ8K*xcllZtihr8r?d_um7Ps+D&w|obm zk_-5>`~;to*Kk<9_;w)#yjTbU&lN(z*9#%w%|ZzHX(0r>S`q^8K;=bjzG4WtC;z|E8B z+;>AW{dG&IBFIF*`Yu!%=niSY${<~6E5kiqB%kHBsVwJX6S##KwWU+Fl#Y~vT2Lv_9_Tu1jc^SI(sLAzl^F)KYnJZ*T!Bh0fNtLTWZnl%yD(&?bf!)ILy_p;v5?U7=p|i3hCV~T$7I@z8E`S{2st+zbTH(xiD6gWvN^&Qo^$ZL#|v!rm_)mSyn`1V zyyWpR+uZ0C2d}z1)tba>4qkUFzhQXOus!IIgEOb6a(-`XPp-8mJKT`z?aic{;%&|S zNq=A{)#(dMf<7s)h-W*K!}VR+WcQi@zv=%NdqS6FzH&;7{B$mr+dTe9s6giGaw`lw z3_A_G3~vcu<8Y_nmrG^RS;KDOj>VaQ_0bK3=~OPd%+Ka(f@9$s1yxiB*TT&jM}pF# z=$tCvHtewkyrXiKcX>|*EqmE#d7u3%Z8^XPmiw43#DadAR&&!x^j1i8HTSRFl3ll{ z#ZM0!KD2zq$A(WVpYoX+w0zD%!xxrA91eahD)$-Xh~=nTVw5i}$2e~I%JMZMmTwp{ zoUn{@+;WmrhSSc$8OyhB`a1__88Lis`GIqm^IWj}=+Zy&v*n_LOI!|im;5$<*t=So zXQtki3cY0^eY6dPO8qL*c>hE;%AEh?1l=ml&ee*jM$s6qID?E$Q06H*0l13?6z$Cd zVmzo{!h9tcICALF_~_&z$veVUW+>i+M;TKnXDYLprryfbU8VYpsh?W)(yZj=O777A zqFd!Rs^~tIJjz4b@&c|=!|z)8ClB)%k8+(l2~#h3vQTExAW`B{N29cmkT#OCmg>B8 z(>CF>kBE}Dsni0BRbo)ZYAI2XE|q&k%_Zb+6|KWiCUNRnNFkL{LxbkR)XHq)G-~%T zspc^r*FKTdtop$-$GSdcKf)NYeuvWca%^43(IxVrT_o{ diff --git a/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class b/kqapi/target/test-classes/com/ningdatech/kqapi/menu/PolicyTest.class index e5d4b6c7b4d27093323d61891e419996eae000c3..02d943b6c77bf9e559626cd3bfe7972dbf607db5 100644 GIT binary patch delta 216 zcmYMoJxfAi0EXfFc_{@68bTeyL5(Dp$O`-}vaIw(1kuz`gF&E@e;{-Ynhv-HXK<00 z=uB;GI++cPMMKc))LdKFczuRH!VlL*S$nL2J@R^{n^(1qhU=IgDQ&;X|DU#Fg6_+d zlEK_C$ixelUa`v~EtWzh=4H^1m8It3hygU>X zrzndJHQ3ZGTk2BM9oy=$qkGDFWLHn@>6v{EsAxo0Zvia5bD%E{HQ~sFNSP?d?)hv- Ezp8vOd;kCd delta 222 zcmY+(J4ixd0EXfB`-y}Q8X}z{B(N~VNKLVOVYg!@qBsOK6-wcv5D8Ip&~%_JbZC*5 z=uB;Gwj??<77c-GQ?sqD&-3Z~@;zP{CG3to?pm#Kd=@$?S4-7%r*3|wxZTz0Key|~ z>%0v#TpD-E?tOFVXNXBgn8M36eu4xD5oU%3W=RskB1)b)4vA4D&I$8e|80{+URk2Y zvIbdEfK^$n>6CTdkkl<3x?@xKZ0Uh*J+Y%_EWMCYi(R!z>)peiKFH{stbWLuF`{OI Jf^#r@r9O1iH9`OY diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java new file mode 100644 index 0000000..9217cd5 --- /dev/null +++ b/ningda-generator/src/main/java/com/ningdatech/generator/config/CodeGen.java @@ -0,0 +1,64 @@ +package com.ningdatech.generator.config; + +import com.baomidou.mybatisplus.generator.FastAutoGenerator; +import com.baomidou.mybatisplus.generator.config.OutputFile; +import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; + +import java.util.Collections; + +/** + * @description: 自动生成code代码 + * @author: zpf + * @date: 2023/01/03 09:20 + */ +public class CodeGen { + + private static final String PATH_LXX = "/Users/liuxinxin/IdeaProjects/project-management/pmapi/src/main/java"; + private static final String PATH_YYD = "/Users/wendy/coding/java/kq-value-added-project/kqapi/src/main/java"; + private static final String PATH_LS = ""; + private static final String PATH_ZPF = "D:\\ningda\\kq-value-added-project\\kqapi\\src\\main\\java"; + private static final String PATH_CMM = "D:\\work\\project-management\\project-management\\pmapi\\src\\main\\java"; + + private static final String URL = "jdbc:mysql://47.98.125.47:3306/kqzzsfw?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false"; + private static final String USER_NAME = "root"; + private static final String PASSWORD = "NingdaKeji123!"; + + private static void generate(String author, String packageName, String path, String... tableNames) { + FastAutoGenerator.create(URL, USER_NAME, PASSWORD) + .globalConfig(builder -> { + // 设置作者 + builder.author(author) + // 开启 swagger 模式 + .enableSwagger() + // 覆盖已生成文件 + .fileOverride() + // 指定输出目录 + .outputDir(path); + }) + .packageConfig(builder -> { + // 设置父包名 + builder.parent("com.ningdatech") + // 设置父包模块名 + .moduleName("kqapi." + packageName) + // 设置mapperXml生成路径 + .pathInfo(Collections.singletonMap(OutputFile.mapperXml, + //设置自己的生成路径 + path + "/com/ningdatech/kqapi/" + packageName + "/mapper")); + }) + .strategyConfig(builder -> { + builder.addTablePrefix("nd"); + // 设置需要生成的表名 + builder.addInclude(tableNames); + }) + // 使用Freemarker引擎模板,默认的是Velocity引擎模板 + .templateEngine(new FreemarkerTemplateEngine()) + .execute(); + } + + public static void main(String[] args) { + // generate("Liuxinxin", "expert", PATH_LXX, "expert_gov_business_strip"); + // generate("ZPF", "zzsfw", PATH_ZPF, "nd_kq_zzsfw_menu"); + generate("WendyYang", "admin", PATH_YYD, "nd_window","nd_zone"); + } + +} diff --git a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java b/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java deleted file mode 100644 index 3d64278..0000000 --- a/ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ningdatech.generator.config; - -import com.baomidou.mybatisplus.generator.FastAutoGenerator; -import com.baomidou.mybatisplus.generator.config.OutputFile; -import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; - -import java.util.Collections; - -/** - * @description: 自动生成code代码 - * @author: zpf - * @date: 2023/01/03 09:20 - */ -public class GeneratorCodeKingbaseConfig { - - private static final String PATH_LXX = "/Users/liuxinxin/IdeaProjects/project-management/pmapi/src/main/java"; - private static final String PATH_YYD = "/Users/wendy/code project/java/project-management/pmapi/src/main/java"; - private static final String PATH_LS = ""; - private static final String PATH_ZPF = "D:\\ningda\\kq-value-added-project\\kqapi\\src\\main\\java"; - private static final String PATH_CMM = "D:\\work\\project-management\\project-management\\pmapi\\src\\main\\java"; - - private static final String URL = "jdbc:mysql://47.98.125.47:3306/kqzzsfw?serverTimezone=Asia/Shanghai&characterEncoding=utf8&allowPublicKeyRetrieval=true&useSSL=false"; - private static final String USER_NAME = "root"; - private static final String PASSWORD = "NingdaKeji123!"; - - private static void generate(String author, String packageName, String path, String... tableNames) { - FastAutoGenerator.create(URL, USER_NAME, PASSWORD) - .globalConfig(builder -> { - // 设置作者 - builder.author(author) - // 开启 swagger 模式 - .enableSwagger() - // 覆盖已生成文件 - .fileOverride() - // 指定输出目录 - .outputDir(path); - }) - .packageConfig(builder -> { - // 设置父包名 - builder.parent("com.ningdatech") - // 设置父包模块名 - .moduleName("kqapi." + packageName) - // 设置mapperXml生成路径 - .pathInfo(Collections.singletonMap(OutputFile.mapperXml, - //设置自己的生成路径 - path + "/com/ningdatech/kqapi/" + packageName + "/mapper")); - }) - .strategyConfig(builder -> { - builder.addTablePrefix(""); - // 设置需要生成的表名 - builder.addInclude(tableNames); - }) - // 使用Freemarker引擎模板,默认的是Velocity引擎模板 - .templateEngine(new FreemarkerTemplateEngine()) - .execute(); - } - - public static void main(String[] args) { - //generate("Liuxinxin", "expert", PATH_LXX, "expert_gov_business_strip"); - generate("ZPF", "zzsfw", PATH_ZPF, "nd_kq_zzsfw_menu"); - } - -}