From 64112f2096f1ba82b8a19d140808734abedd4cb8 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Sat, 20 Apr 2024 17:22:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=9C=89=E6=8E=A5=E5=8F=A3=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E6=94=BE=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kqapi/admin/manage/AdminMatterManage.java | 26 ++--- .../kqapi/admin/manage/WindowManage.java | 7 +- .../kqapi/common/helper/MatterCacheHelper.java | 6 +- .../helper/basic/AbstractMatterCacheHelper.java | 40 +++---- .../common/helper/impl/MattersCacheHelperImpl.java | 6 +- .../kqapi/scheduler/manage/SynManage.java | 42 +++---- .../kqapi/scheduler/task/CheckMattersUrlTask.java | 22 ++-- .../ningdatech/kqapi/scheduler/task/SynTask.java | 81 +++++++------- .../zzsfw/controller/KqZzsfwMenuController.java | 118 ++++++++++++++++++++ .../zzsfw/controller/NdKqZzsfwMenuController.java | 118 -------------------- .../controller/PolicyRegulationsController.java | 10 +- .../kqapi/zzsfw/manage/MatterManage.java | 92 ++++++++-------- .../kqapi/zzsfw/manage/PolicyManage.java | 32 +++--- .../mapper/KqZzsfwMatterDeduplicateMapper.java | 16 +++ .../kqapi/zzsfw/mapper/KqZzsfwMenuMapper.java | 23 ++++ .../kqapi/zzsfw/mapper/KqZzsfwMenuMapper.xml | 15 +++ .../kqapi/zzsfw/mapper/KqZzsfwPolicyMapper.java | 16 +++ .../mapper/NdKqZzsfwMatterDeduplicateMapper.java | 16 --- .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java | 23 ---- .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml | 15 --- .../kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java | 16 --- .../model/dto/KqZzsfwMattersDeduplicateDTO.java | 35 ++++++ .../kqapi/zzsfw/model/dto/KqZzsfwMenuDTO.java | 50 +++++++++ .../kqapi/zzsfw/model/dto/KqZzsfwPolicyDTO.java | 56 ++++++++++ .../model/dto/NdKqZzsfwMattersDeduplicateDTO.java | 35 ------ .../kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java | 50 --------- .../kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java | 56 ---------- .../model/entity/KqZzsfwMattersDeduplicate.java | 51 +++++++++ .../kqapi/zzsfw/model/entity/KqZzsfwMenu.java | 121 +++++++++++++++++++++ .../kqapi/zzsfw/model/entity/KqZzsfwPolicy.java | 64 +++++++++++ .../model/entity/NdKqZzsfwMattersDeduplicate.java | 51 --------- .../kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java | 121 --------------------- .../kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java | 64 ----------- .../kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java | 59 ---------- .../kqapi/zzsfw/model/vo/ZzsfwPolicyVO.java | 59 ++++++++++ .../service/IKqZzsfwMatterDeduplicateService.java | 16 +++ .../kqapi/zzsfw/service/IKqZzsfwMenuService.java | 21 ++++ .../kqapi/zzsfw/service/IKqZzsfwPolicyService.java | 16 +++ .../INdKqZzsfwMatterDeduplicateService.java | 16 --- .../kqapi/zzsfw/service/INdKqZzsfwMenuService.java | 21 ---- .../zzsfw/service/INdKqZzsfwPolicyService.java | 16 --- .../impl/KqZzsfwMatterDeduplicateServiceImpl.java | 21 ++++ .../zzsfw/service/impl/KqZzsfwMenuServiceImpl.java | 38 +++++++ .../service/impl/KqZzsfwPolicyServiceImpl.java | 21 ++++ .../NdKqZzsfwMatterDeduplicateServiceImpl.java | 21 ---- .../service/impl/NdKqZzsfwMenuServiceImpl.java | 38 ------- .../service/impl/NdKqZzsfwPolicyServiceImpl.java | 21 ---- kqapi/src/main/resources/security/auth-dev.yml | 4 + .../com/ningdatech/kqapi/menu/DuplicationTest.java | 22 ++-- .../java/com/ningdatech/kqapi/menu/MenuTest.java | 12 +- .../java/com/ningdatech/kqapi/menu/PolicyTest.java | 10 +- .../kqapi/common/helper/MatterCacheHelper.class | Bin 530 -> 526 bytes .../helper/basic/AbstractMatterCacheHelper.class | Bin 13543 -> 13525 bytes .../helper/impl/MattersCacheHelperImpl.class | Bin 1650 -> 1646 bytes .../kqapi/scheduler/manage/SynManage.class | Bin 5454 -> 5406 bytes .../kqapi/scheduler/task/CheckMattersUrlTask.class | Bin 12576 -> 12564 bytes .../ningdatech/kqapi/scheduler/task/SynTask.class | Bin 15298 -> 15268 bytes .../zzsfw/controller/NdKqZzsfwMenuController.class | Bin 5107 -> 0 bytes .../controller/PolicyRegulationsController.class | Bin 2544 -> 2532 bytes .../kqapi/zzsfw/manage/MatterManage.class | Bin 23904 -> 23838 bytes .../kqapi/zzsfw/manage/PolicyManage.class | Bin 7118 -> 7072 bytes .../mapper/NdKqZzsfwMatterDeduplicateMapper.class | Bin 395 -> 0 bytes .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class | Bin 355 -> 0 bytes .../kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml | 5 - .../kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class | Bin 361 -> 0 bytes .../INdKqZzsfwMatterDeduplicateService.class | Bin 408 -> 0 bytes .../zzsfw/service/INdKqZzsfwMenuService.class | Bin 368 -> 0 bytes .../zzsfw/service/INdKqZzsfwPolicyService.class | Bin 374 -> 0 bytes .../NdKqZzsfwMatterDeduplicateServiceImpl.class | Bin 913 -> 0 bytes .../service/impl/NdKqZzsfwMenuServiceImpl.class | Bin 821 -> 0 bytes .../service/impl/NdKqZzsfwPolicyServiceImpl.class | Bin 835 -> 0 bytes 71 files changed, 962 insertions(+), 969 deletions(-) create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMatterDeduplicateMapper.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.xml create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwPolicyMapper.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMattersDeduplicateDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMenuDTO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwPolicyDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java delete 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/KqZzsfwMattersDeduplicate.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMenu.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwPolicy.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java delete 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/ZzsfwPolicyVO.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMatterDeduplicateService.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMenuService.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwPolicyService.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMatterDeduplicateServiceImpl.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMenuServiceImpl.java create mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwPolicyServiceImpl.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java delete mode 100644 kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.class delete mode 100644 kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.class diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java index 5c30dce..973c0f7 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/AdminMatterManage.java @@ -10,8 +10,8 @@ import com.ningdatech.basic.util.CollUtils; import com.ningdatech.kqapi.admin.model.req.MatterListReq; import com.ningdatech.kqapi.admin.model.vo.MatterDetailDTO; import com.ningdatech.kqapi.admin.model.vo.MatterListVO; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -29,17 +29,17 @@ import java.util.List; @RequiredArgsConstructor public class AdminMatterManage { - private final INdKqZzsfwMenuService zzsfwMenuService; + private final IKqZzsfwMenuService zzsfwMenuService; public PageVo pageMatter(MatterListReq req) { - Wrapper query = Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .like(StrUtil.isNotBlank(req.getMatterName()), NdKqZzsfwMenu::getItemName, req.getMatterName()) - .eq(req.getZoneId() != null, NdKqZzsfwMenu::getZoneId, req.getZoneId()) - .eq(req.getWindowId() != null, NdKqZzsfwMenu::getWindowId, req.getWindowId()) - .eq(req.getMatterType() != null, NdKqZzsfwMenu::getType, req.getMatterType()) - .eq(req.getDepartment() != null, NdKqZzsfwMenu::getDepartment, req.getDepartment()) - .orderByDesc(NdKqZzsfwMenu::getCreateOn); - Page page = zzsfwMenuService.page(req.page(), query); + Wrapper query = Wrappers.lambdaQuery(KqZzsfwMenu.class) + .like(StrUtil.isNotBlank(req.getMatterName()), KqZzsfwMenu::getItemName, req.getMatterName()) + .eq(req.getZoneId() != null, KqZzsfwMenu::getZoneId, req.getZoneId()) + .eq(req.getWindowId() != null, KqZzsfwMenu::getWindowId, req.getWindowId()) + .eq(req.getMatterType() != null, KqZzsfwMenu::getType, req.getMatterType()) + .eq(req.getDepartment() != null, KqZzsfwMenu::getDepartment, req.getDepartment()) + .orderByDesc(KqZzsfwMenu::getCreateOn); + Page page = zzsfwMenuService.page(req.page(), query); if (page.getTotal() == 0) { return PageVo.empty(); } @@ -59,7 +59,7 @@ public class AdminMatterManage { } public MatterDetailDTO detail(Long id) { - NdKqZzsfwMenu matter = zzsfwMenuService.getById(id); + KqZzsfwMenu matter = zzsfwMenuService.getById(id); if (matter == null) { return null; } @@ -91,7 +91,7 @@ public class AdminMatterManage { } public void saveOrUpdate(MatterDetailDTO req) { - NdKqZzsfwMenu matter = new NdKqZzsfwMenu(); + KqZzsfwMenu matter = new KqZzsfwMenu(); matter.setId(req.getId()); matter.setFree(req.getFree()); matter.setOnlinePay(req.getOnlinePay()); 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 index 685a933..6cb9508 100644 --- a/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java +++ b/kqapi/src/main/java/com/ningdatech/kqapi/admin/manage/WindowManage.java @@ -3,20 +3,17 @@ 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 com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; @@ -36,7 +33,7 @@ import java.util.stream.Collectors; public class WindowManage { private final IWindowService windowService; - private final INdKqZzsfwMenuService zzsfwMenuService; + private final IKqZzsfwMenuService zzsfwMenuService; public void windowSaveOrUpdate(WindowSaveReq req) { Window win = BeanUtil.copyProperties(req, Window.class); 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 257f74a..2510de0 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,7 +1,7 @@ package com.ningdatech.kqapi.common.helper; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; import java.util.List; @@ -15,11 +15,11 @@ import java.util.List; */ public interface MatterCacheHelper { - NdKqZzsfwMattersDeduplicate getMatter(String qlName,String webapplyurl); + KqZzsfwMattersDeduplicate getMatter(String qlName, String webapplyurl); String getUrl(String qlName); - List all(); + List all(); Boolean refreshAll(); } 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 ac7ed37..fc73643 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 @@ -9,9 +9,9 @@ import com.ningdatech.kqapi.zzsfw.model.entity.ComponentsMatterEliminateEntity; import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService; 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.KqZzsfwMattersDeduplicate; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.InitializingBean; @@ -37,9 +37,9 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { private IDscSxAdsShareItemQltQlsxCommonIDVKqService kqService; @Autowired - private INdKqZzsfwMatterDeduplicateService deduplicateService; + private IKqZzsfwMatterDeduplicateService deduplicateService; - protected LoadingCache mattersDupCache; + protected LoadingCache mattersDupCache; protected LoadingCache mattersUrlCache; @@ -87,17 +87,17 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { } } if(mattersDupCache.asMap().containsKey(key)){ - NdKqZzsfwMattersDeduplicate dup = mattersDupCache.get(key); + KqZzsfwMattersDeduplicate dup = mattersDupCache.get(key); dup.setCountNum(dup.getCountNum() + 1); mattersDupCache.put(key,dup); }else{ - mattersDupCache.put(key,NdKqZzsfwMattersDeduplicate.of(m.getQlName(),kq_url)); + mattersDupCache.put(key, KqZzsfwMattersDeduplicate.of(m.getQlName(),kq_url)); } }); return Boolean.TRUE; } - protected NdKqZzsfwMattersDeduplicate get(String qlName,String url) { + protected KqZzsfwMattersDeduplicate get(String qlName, String url) { MatterKey key = MatterKey.of(qlName, url); return mattersDupCache.get(key); } @@ -106,7 +106,7 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { return mattersUrlCache.get(qlName); } - protected List all() { + protected List all() { return Lists.newArrayList(mattersDupCache.asMap().values()); } @@ -116,10 +116,10 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { .refreshAfterWrite(7, TimeUnit.DAYS) .maximumSize(1024 * 100) .build(key -> { - NdKqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class) - .eq(NdKqZzsfwMattersDeduplicate::getQlName, key) + KqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class) + .eq(KqZzsfwMattersDeduplicate::getQlName, key) .last(BizConst.LIMIT_1) - .isNotNull(NdKqZzsfwMattersDeduplicate::getWebapplyurl)); + .isNotNull(KqZzsfwMattersDeduplicate::getWebapplyurl)); if (Objects.isNull(dup)) { //查不到直接返回null return null; @@ -130,10 +130,10 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { .refreshAfterWrite(7, TimeUnit.DAYS) .maximumSize(1024 * 100) .build(key -> { - NdKqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class) - .eq(NdKqZzsfwMattersDeduplicate::getQlName, key) + KqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class) + .eq(KqZzsfwMattersDeduplicate::getQlName, key) .last(BizConst.LIMIT_1) - .isNotNull(NdKqZzsfwMattersDeduplicate::getWebapplyurl)); + .isNotNull(KqZzsfwMattersDeduplicate::getWebapplyurl)); if (Objects.isNull(dup)) { //查不到直接返回null return null; @@ -157,10 +157,10 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { // .orderByDesc(DscSxAdsShareItemQltQlsxCommonIDVKq::getUpdateDate) // .last(BizConst.LIMIT_1) // ); - NdKqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class) - .eq(NdKqZzsfwMattersDeduplicate::getQlName, key) + KqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class) + .eq(KqZzsfwMattersDeduplicate::getQlName, key) .last(BizConst.LIMIT_1) - .isNotNull(NdKqZzsfwMattersDeduplicate::getWebapplyurl)); + .isNotNull(KqZzsfwMattersDeduplicate::getWebapplyurl)); if (Objects.isNull(dup)) { //查不到直接返回null return null; @@ -172,10 +172,10 @@ public abstract class AbstractMatterCacheHelper implements InitializingBean { .refreshAfterWrite(7, TimeUnit.DAYS) .maximumSize(1024 * 100) .build(key -> { - NdKqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class) - .eq(NdKqZzsfwMattersDeduplicate::getQlName, key) + KqZzsfwMattersDeduplicate dup = deduplicateService.getOne(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class) + .eq(KqZzsfwMattersDeduplicate::getQlName, key) .last(BizConst.LIMIT_1) - .isNotNull(NdKqZzsfwMattersDeduplicate::getWebapplyurl)); + .isNotNull(KqZzsfwMattersDeduplicate::getWebapplyurl)); if (Objects.isNull(dup)) { //查不到直接返回null return null; 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 309eee9..066b5f5 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.model.entity.NdKqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -19,7 +19,7 @@ public class MattersCacheHelperImpl extends AbstractMatterCacheHelper implements @Override - public NdKqZzsfwMattersDeduplicate getMatter(String qlName,String webapplyurl) { + public KqZzsfwMattersDeduplicate getMatter(String qlName, String webapplyurl) { if (StringUtils.isBlank(qlName) || StringUtils.isBlank(webapplyurl)) { return null; } @@ -35,7 +35,7 @@ public class MattersCacheHelperImpl extends AbstractMatterCacheHelper implements } @Override - public List all() { + public List all() { return super.all(); } 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 b6f6f94..b92267c 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 @@ -2,15 +2,15 @@ package com.ningdatech.kqapi.scheduler.manage; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; -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; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMenuDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwPolicyService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; @@ -33,20 +33,20 @@ import java.util.List; @RequiredArgsConstructor public class SynManage { - private final INdKqZzsfwMatterDeduplicateService deduplicateService; + private final IKqZzsfwMatterDeduplicateService deduplicateService; - private final INdKqZzsfwMenuService menuService; + private final IKqZzsfwMenuService menuService; - private final INdKqZzsfwPolicyService policyService; + private final IKqZzsfwPolicyService policyService; private final RestTemplate restTemplate; public void synData() { log.info("同步数据开始"); //1.去重数据 - List dups = deduplicateService.list(); - for(NdKqZzsfwMattersDeduplicate dup : dups){ - NdKqZzsfwMattersDeduplicateDTO dto = BeanUtil.copyProperties(dup,NdKqZzsfwMattersDeduplicateDTO.class); + List dups = deduplicateService.list(); + for(KqZzsfwMattersDeduplicate dup : dups){ + KqZzsfwMattersDeduplicateDTO dto = BeanUtil.copyProperties(dup, KqZzsfwMattersDeduplicateDTO.class); HttpHeaders headers = new HttpHeaders(); MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8"); headers.setContentType(type); @@ -58,9 +58,9 @@ public class SynManage { } //2.菜单数据 - List menus = menuService.list(); - for(NdKqZzsfwMenu menu : menus){ - NdKqZzsfwMenuDTO dto = BeanUtil.copyProperties(menu,NdKqZzsfwMenuDTO.class); + List menus = menuService.list(); + for(KqZzsfwMenu menu : menus){ + KqZzsfwMenuDTO dto = BeanUtil.copyProperties(menu, KqZzsfwMenuDTO.class); HttpHeaders headers = new HttpHeaders(); MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8"); headers.setContentType(type); @@ -72,9 +72,9 @@ public class SynManage { } //3.其它数据 - List policies = policyService.list(); - for(NdKqZzsfwPolicy policy : policies){ - NdKqZzsfwPolicyDTO dto = BeanUtil.copyProperties(policy,NdKqZzsfwPolicyDTO.class); + List policies = policyService.list(); + for(KqZzsfwPolicy policy : policies){ + KqZzsfwPolicyDTO dto = BeanUtil.copyProperties(policy, KqZzsfwPolicyDTO.class); HttpHeaders headers = new HttpHeaders(); MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8"); headers.setContentType(type); 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 27d5963..9f5820e 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,8 @@ 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.zzsfw.model.entity.NdKqZzsfwMenu; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.http.conn.ssl.NoopHostnameVerifier; @@ -51,7 +51,7 @@ public class CheckMattersUrlTask { public String active; @Autowired - private INdKqZzsfwMenuService menuService; + private IKqZzsfwMenuService menuService; /** * 每天9点 开始校检 链接 是不是可行 @@ -69,13 +69,13 @@ public class CheckMattersUrlTask { log.info("==========开始校检事项表里的链接 会不会404 如果404就隐藏"); - List menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getHasUrl, 1) - .isNotNull(NdKqZzsfwMenu::getWebapplyurl)); + List menus = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getHasUrl, 1) + .isNotNull(KqZzsfwMenu::getWebapplyurl)); Integer errNum = 0; List errUrls = Lists.newArrayList(); - for (NdKqZzsfwMenu menu : menus) { + for (KqZzsfwMenu menu : menus) { RestTemplate restTemplate = new RestTemplate(generateHttpRequestFactory()); String url = "https://www.zjzwfw.gov.cn/jpaas-zjservice-server/open-api/item/getItemDetail"; MultiValueMap map = new LinkedMultiValueMap<>(); @@ -97,10 +97,10 @@ public class CheckMattersUrlTask { //如果是空的 if(Objects.isNull(itemData.getItem())){ //隐藏 - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getHasUrl,0) - .set(NdKqZzsfwMenu::getWebapplyurl,null)); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getHasUrl,0) + .set(KqZzsfwMenu::getWebapplyurl,null)); errNum += 1; errUrls.add(webapplyurl); } 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 51e07e9..2dbc4f6 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,16 +7,13 @@ 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.model.entity.ComponentsMatterEliminateEntity; +import com.ningdatech.kqapi.zzsfw.model.entity.*; import com.ningdatech.kqapi.zzsfw.service.ComponentsMatterEliminateService; -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.model.entity.KqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.manage.MatterManage; import com.ningdatech.kqapi.zzsfw.service.IDscSxAdsShareItemQltQlsxCommonIDVKqService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMatterDeduplicateService; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -53,10 +50,10 @@ public class SynTask { private MatterManage matterManage; @Autowired - private INdKqZzsfwMatterDeduplicateService matterDeduplicateService; + private IKqZzsfwMatterDeduplicateService matterDeduplicateService; @Autowired - private INdKqZzsfwMenuService menuService; + private IKqZzsfwMenuService menuService; @Autowired private IDscSxAdsShareItemQltQlsxCommonIDVKqService kqService; @@ -64,7 +61,7 @@ public class SynTask { @Autowired private ComponentsMatterEliminateService componentsMatterEliminateService; - protected LoadingCache mattersDupCache; + protected LoadingCache mattersDupCache; private final String KQ_ZZS_BASE_URL = "https://www.zjzwfw.gov.cn/zjservice-fe/#/workguide?localInnerCode=&siteCode=330000000000"; @@ -90,23 +87,23 @@ public class SynTask { //1.处理 去重数据 if(matterCacheHelper.refreshAll()){ matterManage.removeAllDup(); - List allDup = matterCacheHelper.all(); + List allDup = matterCacheHelper.all(); matterDeduplicateService.saveBatch(allDup); //2. 事项 - List menus = menuService.list(); - for(NdKqZzsfwMenu menu : menus){ + List menus = menuService.list(); + for(KqZzsfwMenu menu : menus){ String url = matterCacheHelper.getUrl(menu.getItemName()); if(StringUtils.isBlank(url)){ - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getWebapplyurl,null) - .set(NdKqZzsfwMenu::getHasUrl, CommonEnum.NO.getCode())); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getWebapplyurl,null) + .set(KqZzsfwMenu::getHasUrl, CommonEnum.NO.getCode())); }else{ - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getWebapplyurl,url) - .set(NdKqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getWebapplyurl,url) + .set(KqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); } } } @@ -117,20 +114,20 @@ public class SynTask { public void synMenu() { //2. 事项 - List menus = menuService.list(); - for(NdKqZzsfwMenu menu : menus){ + List menus = menuService.list(); + for(KqZzsfwMenu menu : menus){ String url = matterCacheHelper.getUrl(menu.getItemName()); log.info("当前缓存的数据 : {},{}",menu.getItemName(),url); if(StringUtils.isBlank(url)){ - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getWebapplyurl,null) - .set(NdKqZzsfwMenu::getHasUrl, CommonEnum.NO.getCode())); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getWebapplyurl,null) + .set(KqZzsfwMenu::getHasUrl, CommonEnum.NO.getCode())); }else{ - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getWebapplyurl,url) - .set(NdKqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getWebapplyurl,url) + .set(KqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); } } } @@ -159,12 +156,12 @@ public class SynTask { componentsMatterEliminateService.saveBatch(entityList); // 删除menu表 - menuService.remove(new LambdaQueryWrapper() - .in(NdKqZzsfwMenu::getItemName, keys)); + menuService.remove(new LambdaQueryWrapper() + .in(KqZzsfwMenu::getItemName, keys)); // 删除deduplicate表 - matterDeduplicateService.remove(new LambdaQueryWrapper() - .in(NdKqZzsfwMattersDeduplicate::getQlName, keys)); + matterDeduplicateService.remove(new LambdaQueryWrapper() + .in(KqZzsfwMattersDeduplicate::getQlName, keys)); return "剔除成功"; } @@ -191,18 +188,18 @@ public class SynTask { public String synSingle(String key){ DscSxAdsShareItemQltQlsxCommonIDVKq matter = getSynUrl(key); String url = KQ_ZZS_BASE_URL.replace("localInnerCode=", "localInnerCode=" + matter.getQlInnerCode()); - List menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getItemName, key)); + List menus = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getItemName, key)); menus.forEach(menu->{ - menuService.update(Wrappers.lambdaUpdate(NdKqZzsfwMenu.class) - .eq(NdKqZzsfwMenu::getId,menu.getId()) - .set(NdKqZzsfwMenu::getWebapplyurl,url) - .set(NdKqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); + menuService.update(Wrappers.lambdaUpdate(KqZzsfwMenu.class) + .eq(KqZzsfwMenu::getId,menu.getId()) + .set(KqZzsfwMenu::getWebapplyurl,url) + .set(KqZzsfwMenu::getHasUrl,CommonEnum.YES.getCode())); }); // 更新缓存 MatterKey matterKey = MatterKey.of(matter.getQlName(),url); mattersDupCache.invalidate(matterKey); - mattersDupCache.put(matterKey,NdKqZzsfwMattersDeduplicate.of(matter.getQlName(),url)); + mattersDupCache.put(matterKey, KqZzsfwMattersDeduplicate.of(matter.getQlName(),url)); return "更新成功,rul:" + url; } } diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java new file mode 100644 index 0000000..99fa367 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/KqZzsfwMenuController.java @@ -0,0 +1,118 @@ +package com.ningdatech.kqapi.zzsfw.controller; + +import com.ningdatech.kqapi.common.exception.BizException; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMenuDTO; +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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.List; +import java.util.Objects; + +/** + *

+ * 前端控制器 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Slf4j +@Validated +@RestController +@RequestMapping("/api/v1/zzsfw/") +@RequiredArgsConstructor +public class KqZzsfwMenuController { + private final MatterManage matterManage; + + @GetMapping("/matters") + public List getMatters() { + return matterManage.getMatters(); + } + + @GetMapping("/zones") + public List getZones() { + return matterManage.getZones(); + } + + @GetMapping("/windows") + public List getWindows(@RequestParam(required = false) String zoneName) { + return matterManage.getWindows(zoneName); + } + + @GetMapping("/departments") + public List getDepartments(@RequestParam(required = false) String windowName, + @RequestParam(required = false) String zoneName) { + return matterManage.getDepartments(zoneName,windowName); + } + + @GetMapping("/matter-list") + public List matterList(@RequestParam(required = false) String windowName, + @RequestParam(required = false) String zoneName, + @RequestParam(required = false) String department, + @RequestParam(required = false) Integer type) { + return matterManage.matterList(zoneName,windowName,department,type); + } + + @GetMapping("/matter/{id}") + public MattersVO matter(@PathVariable Long id) { + return matterManage.matter(id); + } + + @GetMapping("/top10") + public List topTen() { + return matterManage.topTen(); + } + + @PostMapping("/save") + public String save(@RequestBody KqZzsfwMenuDTO dto) { + return matterManage.save(dto); + } + + @GetMapping("/remove-all") + public String removeAll() { + return matterManage.removeAll(); + } + + @PostMapping("/save-dup") + public String saveDup(@RequestBody KqZzsfwMattersDeduplicateDTO dto) { + return matterManage.saveDup(dto); + } + + @GetMapping("/remove-all-dup") + public String removeAllDup() { + return matterManage.removeAllDup(); + } + + + @PostMapping("/ddl") + public String ddl(@RequestParam("sql") String sql) { + return matterManage.ddl(sql); + } + + @PostMapping("/upload-menu") + public String uploadMenu(@RequestParam("file") MultipartFile[] file) throws IOException { + if (Objects.isNull(file) || file.length == 0) { + throw new BizException("文件为空!"); + } + return matterManage.uploadMenu(file[0]); + } + + /** + * 4-10 改动的几个问题 到时候 线上直接改了 + * @return + */ + @GetMapping("/update-4-10") + public String update4_10() { + return matterManage.update4_10(); + } +} + 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 deleted file mode 100644 index d353d3d..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.controller; - -import com.ningdatech.kqapi.common.exception.BizException; -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; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.List; -import java.util.Objects; - -/** - *

- * 前端控制器 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Slf4j -@Validated -@RestController -@RequestMapping("/api/v1/zzsfw/") -@RequiredArgsConstructor -public class NdKqZzsfwMenuController { - private final MatterManage matterManage; - - @GetMapping("/matters") - public List getMatters() { - return matterManage.getMatters(); - } - - @GetMapping("/zones") - public List getZones() { - return matterManage.getZones(); - } - - @GetMapping("/windows") - public List getWindows(@RequestParam(required = false) String zoneName) { - return matterManage.getWindows(zoneName); - } - - @GetMapping("/departments") - public List getDepartments(@RequestParam(required = false) String windowName, - @RequestParam(required = false) String zoneName) { - return matterManage.getDepartments(zoneName,windowName); - } - - @GetMapping("/matter-list") - public List matterList(@RequestParam(required = false) String windowName, - @RequestParam(required = false) String zoneName, - @RequestParam(required = false) String department, - @RequestParam(required = false) Integer type) { - return matterManage.matterList(zoneName,windowName,department,type); - } - - @GetMapping("/matter/{id}") - public MattersVO matter(@PathVariable Long id) { - return matterManage.matter(id); - } - - @GetMapping("/top10") - public List topTen() { - return matterManage.topTen(); - } - - @PostMapping("/save") - public String save(@RequestBody NdKqZzsfwMenuDTO dto) { - return matterManage.save(dto); - } - - @GetMapping("/remove-all") - public String removeAll() { - return matterManage.removeAll(); - } - - @PostMapping("/save-dup") - public String saveDup(@RequestBody NdKqZzsfwMattersDeduplicateDTO dto) { - return matterManage.saveDup(dto); - } - - @GetMapping("/remove-all-dup") - public String removeAllDup() { - return matterManage.removeAllDup(); - } - - - @PostMapping("/ddl") - public String ddl(@RequestParam("sql") String sql) throws IOException { - return matterManage.ddl(sql); - } - - @PostMapping("/upload-menu") - public String uploadMenu(@RequestParam("file") MultipartFile[] file) throws IOException { - if (Objects.isNull(file) || file.length == 0) { - throw new BizException("文件为空!"); - } - return matterManage.uploadMenu(file[0]); - } - - /** - * 4-10 改动的几个问题 到时候 线上直接改了 - * @return - */ - @GetMapping("/update-4-10") - public String update4_10() { - return matterManage.update4_10(); - } -} - 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 e79c46e..111b214 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.model.dto.NdKqZzsfwPolicyDTO; -import com.ningdatech.kqapi.zzsfw.model.vo.NdKqZzsfwPolicyVO; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.vo.ZzsfwPolicyVO; import com.ningdatech.kqapi.zzsfw.manage.PolicyManage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,17 +26,17 @@ public class PolicyRegulationsController { private final PolicyManage policyManage; @GetMapping("/list") - public PageVo list(@RequestParam(defaultValue = "1") long pageNumber, @RequestParam(defaultValue = "10") long pageSize) { + public PageVo list(@RequestParam(defaultValue = "1") long pageNumber, @RequestParam(defaultValue = "10") long pageSize) { return policyManage.list(pageNumber,pageSize); } @PostMapping("/save") - public String save(@RequestBody NdKqZzsfwPolicyDTO dto) { + public String save(@RequestBody KqZzsfwPolicyDTO dto) { return policyManage.save(dto); } @PostMapping("/save-batch") - public String saveBatch(@RequestBody List dtos) { + public String saveBatch(@RequestBody List dtos) { return policyManage.saveBatch(dtos); } 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 8976ef1..6bd4a8d 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 @@ -5,16 +5,16 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.kqapi.zzsfw.constants.ZzsfwMenuConstant; -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.dto.KqZzsfwMattersDeduplicateDTO; +import com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwMenuDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; 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; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -57,19 +57,19 @@ public class MatterManage { @Value("${spring.datasource.password}") public String password; - private final INdKqZzsfwMenuService menuService; + private final IKqZzsfwMenuService menuService; - private final INdKqZzsfwMatterDeduplicateService matterDeduplicateService; + private final IKqZzsfwMatterDeduplicateService matterDeduplicateService; public List getMatters() { - List matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .orderByAsc(NdKqZzsfwMenu::getSort)); + List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .orderByAsc(KqZzsfwMenu::getSort)); if(CollUtil.isEmpty(matters)){ return Collections.emptyList(); } //如果是政府类型的 就隐藏 没有链接的 - List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && + List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set zoneSet = new HashSet<>(); @@ -88,14 +88,14 @@ public class MatterManage { * @return */ public List getZones() { - List matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .orderByAsc(NdKqZzsfwMenu::getSort)); + List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .orderByAsc(KqZzsfwMenu::getSort)); if(CollUtil.isEmpty(matters)){ return Collections.emptyList(); } //如果是政府类型的 就隐藏 没有链接的 - List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && + List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); Set zoneSet = new HashSet<>(); @@ -108,15 +108,15 @@ public class MatterManage { } public List getWindows(String zoneName) { - List matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .eq(StringUtils.isNotBlank(zoneName),NdKqZzsfwMenu::getZoneName,zoneName) - .orderByAsc(NdKqZzsfwMenu::getSort)); + List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .eq(StringUtils.isNotBlank(zoneName), KqZzsfwMenu::getZoneName,zoneName) + .orderByAsc(KqZzsfwMenu::getSort)); if(CollUtil.isEmpty(matters)){ return Collections.emptyList(); } //如果是政府类型的 就隐藏 没有链接的 - List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && + List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); @@ -131,15 +131,15 @@ public class MatterManage { } public List getDepartments(String zoneName,String windowName) { - List matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .eq(StringUtils.isNotBlank(windowName),NdKqZzsfwMenu::getWindow,windowName) - .eq(StringUtils.isNotBlank(zoneName),NdKqZzsfwMenu::getZoneName,zoneName) - .orderByAsc(NdKqZzsfwMenu::getSort)); + List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .eq(StringUtils.isNotBlank(windowName), KqZzsfwMenu::getWindow,windowName) + .eq(StringUtils.isNotBlank(zoneName), KqZzsfwMenu::getZoneName,zoneName) + .orderByAsc(KqZzsfwMenu::getSort)); if(CollUtil.isEmpty(matters)){ return Collections.emptyList(); } - List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && + List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); @@ -154,18 +154,18 @@ public class MatterManage { } public List matterList(String zoneName, String windowName, String department, Integer type) { - List matters = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class) - .eq(StringUtils.isNotBlank(windowName),NdKqZzsfwMenu::getWindow,windowName) - .eq(StringUtils.isNotBlank(zoneName),NdKqZzsfwMenu::getZoneName,zoneName) - .eq(StringUtils.isNotBlank(department),NdKqZzsfwMenu::getDepartment,department) - .eq(Objects.nonNull(type),NdKqZzsfwMenu::getType,type) - .orderByAsc(NdKqZzsfwMenu::getSort)); + List matters = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class) + .eq(StringUtils.isNotBlank(windowName), KqZzsfwMenu::getWindow,windowName) + .eq(StringUtils.isNotBlank(zoneName), KqZzsfwMenu::getZoneName,zoneName) + .eq(StringUtils.isNotBlank(department), KqZzsfwMenu::getDepartment,department) + .eq(Objects.nonNull(type), KqZzsfwMenu::getType,type) + .orderByAsc(KqZzsfwMenu::getSort)); if(CollUtil.isEmpty(matters)){ return Collections.emptyList(); } //如果是政府类型的 就隐藏 没有链接的 - List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && + List finalMatters = matters.stream().filter(m -> Objects.nonNull(m.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getWebapplyurl()))) .collect(Collectors.toList()); @@ -180,7 +180,7 @@ public class MatterManage { } public MattersVO matter(Long id) { - NdKqZzsfwMenu matter = menuService.getById(id); + KqZzsfwMenu matter = menuService.getById(id); if(Objects.isNull(matter)){ return null; } @@ -190,7 +190,7 @@ public class MatterManage { return mattersVO; } - private List generateWindows(NdKqZzsfwMenu menu, List matters) { + private List generateWindows(KqZzsfwMenu menu, List matters) { Set windowSet = new HashSet<>(); return matters.stream().filter(m -> StringUtils.isNotBlank(m.getZoneName()) && m.getZoneName().equals(menu.getZoneName()) && windowSet.add(m.getWindow())) @@ -203,7 +203,7 @@ public class MatterManage { }).collect(Collectors.toList()); } - private List generateDepartment(NdKqZzsfwMenu menu, List matters) { + private List generateDepartment(KqZzsfwMenu menu, List matters) { Set departmentSet = new HashSet<>(); return matters.stream().filter( m -> StringUtils.isNotBlank(m.getWindow()) && m.getWindow().equals(menu.getWindow()) && m.getZoneName().equals(menu.getZoneName()) && departmentSet.add(m.getDepartment())) @@ -216,7 +216,7 @@ public class MatterManage { }).collect(Collectors.toList()); } - private List generateItemType(NdKqZzsfwMenu menu, List matters) { + private List generateItemType(KqZzsfwMenu menu, List matters) { Set typeSet = new HashSet<>(); return matters.stream().filter(m -> StringUtils.isNotBlank(m.getWindow()) && m.getWindow().equals(menu.getWindow()) && m.getZoneName().equals(menu.getZoneName()) && Objects.nonNull(m.getType()) && typeSet.add(m.getType())) @@ -235,7 +235,7 @@ public class MatterManage { .collect(Collectors.toList()); } - private List generateMatters(NdKqZzsfwMenu menu, List matters) { + private List generateMatters(KqZzsfwMenu menu, List matters) { return matters.stream().filter(m -> Objects.nonNull(m.getType()) && m.getType().equals(menu.getType()) && (!m.getType().equals(ItemTypeEnum.GOV.getCode()) || Objects.nonNull(m.getHasUrl()) && m.getHasUrl() == 1) && StringUtils.isNotBlank(m.getDepartment()) && @@ -256,8 +256,8 @@ public class MatterManage { } public List topTen() { - List topTen = matterDeduplicateService.list(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class) - .orderByDesc(NdKqZzsfwMattersDeduplicate::getCountNum) + List topTen = matterDeduplicateService.list(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class) + .orderByDesc(KqZzsfwMattersDeduplicate::getCountNum) .last("limit 10")); return topTen.stream().map(m -> { MatterTopVO vo = new MatterTopVO(); @@ -268,12 +268,12 @@ public class MatterManage { }).collect(Collectors.toList()); } - public String save(NdKqZzsfwMenuDTO dto) { + public String save(KqZzsfwMenuDTO dto) { if(Objects.isNull(dto)){ return "保存失败 传入为空"; } - NdKqZzsfwMenu entity = BeanUtil.copyProperties(dto,NdKqZzsfwMenu.class); + KqZzsfwMenu entity = BeanUtil.copyProperties(dto, KqZzsfwMenu.class); if(menuService.save(entity)){ return "保存成功 :" + entity; }else{ @@ -281,12 +281,12 @@ public class MatterManage { } } - public String saveDup(NdKqZzsfwMattersDeduplicateDTO dto) { + public String saveDup(KqZzsfwMattersDeduplicateDTO dto) { if(Objects.isNull(dto)){ return "保存失败 传入为空"; } - NdKqZzsfwMattersDeduplicate entity = BeanUtil.copyProperties(dto,NdKqZzsfwMattersDeduplicate.class); + KqZzsfwMattersDeduplicate entity = BeanUtil.copyProperties(dto, KqZzsfwMattersDeduplicate.class); if(matterDeduplicateService.save(entity)){ return "保存成功 :" + entity; }else{ @@ -295,12 +295,12 @@ public class MatterManage { } public String removeAll() { - menuService.remove(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)); + menuService.remove(Wrappers.lambdaQuery(KqZzsfwMenu.class)); return "删除成功"; } public String removeAllDup() { - matterDeduplicateService.remove(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class)); + matterDeduplicateService.remove(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class)); return "删除成功"; } @@ -346,7 +346,7 @@ public class MatterManage { telephone = decimalFormat2.format(row.getCell(7).getNumericCellValue()); System.out.println(telephone); } - NdKqZzsfwMenu menu = new NdKqZzsfwMenu(); + KqZzsfwMenu menu = new KqZzsfwMenu(); menu.setItemName(itemName); menu.setZoneName(zoneName); menu.setWindow(windowName); @@ -393,8 +393,8 @@ public class MatterManage { */ public String update4_10() { //1.窗口后缀不是服务的 都加个服务 - List list = menuService.list(); - for (NdKqZzsfwMenu menu : list) { + List list = menuService.list(); + for (KqZzsfwMenu menu : list) { if(StringUtils.isNotBlank(menu.getWindow()) && !menu.getWindow().endsWith("服务")){ menu.setWindow(menu.getWindow() + "服务"); menuService.updateById(menu); 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 66f5804..4917416 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,10 +5,10 @@ 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.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 com.ningdatech.kqapi.zzsfw.model.dto.KqZzsfwPolicyDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.model.vo.ZzsfwPolicyVO; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwPolicyService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -28,29 +28,29 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class PolicyManage { - private final INdKqZzsfwPolicyService policyService; + private final IKqZzsfwPolicyService policyService; - public PageVo list(long pageNumber, long pageSize) { - Page page = Page.of(pageNumber,pageSize); - Page pageRes = policyService.page(page, Wrappers.lambdaQuery(NdKqZzsfwPolicy.class) - .orderByAsc(NdKqZzsfwPolicy::getSort)); + public PageVo list(long pageNumber, long pageSize) { + Page page = Page.of(pageNumber,pageSize); + Page pageRes = policyService.page(page, Wrappers.lambdaQuery(KqZzsfwPolicy.class) + .orderByAsc(KqZzsfwPolicy::getSort)); if(CollUtil.isEmpty(pageRes.getRecords())){ return PageVo.empty(); } - List res = pageRes.getRecords().stream() - .map(p -> BeanUtil.copyProperties(p,NdKqZzsfwPolicyVO.class)) + List res = pageRes.getRecords().stream() + .map(p -> BeanUtil.copyProperties(p, ZzsfwPolicyVO.class)) .collect(Collectors.toList()); return PageVo.of(res,pageRes.getTotal()); } - public String save(NdKqZzsfwPolicyDTO dto) { + public String save(KqZzsfwPolicyDTO dto) { if(Objects.isNull(dto)){ return "保存失败 传入为空"; } - NdKqZzsfwPolicy entity = BeanUtil.copyProperties(dto,NdKqZzsfwPolicy.class); + KqZzsfwPolicy entity = BeanUtil.copyProperties(dto, KqZzsfwPolicy.class); if(policyService.save(entity)){ return "保存成功 :" + entity; }else{ @@ -59,7 +59,7 @@ public class PolicyManage { } public String removeAll() { - policyService.remove(Wrappers.lambdaQuery(NdKqZzsfwPolicy.class)); + policyService.remove(Wrappers.lambdaQuery(KqZzsfwPolicy.class)); return "删除成功"; } @@ -68,12 +68,12 @@ public class PolicyManage { * @param dtos * @return */ - public String saveBatch(List dtos) { + public String saveBatch(List dtos) { if(CollUtil.isEmpty(dtos)){ return "保存失败 传入为空"; } - List entitys = dtos.stream().map(d -> BeanUtil.copyProperties(d,NdKqZzsfwPolicy.class)) + List entitys = dtos.stream().map(d -> BeanUtil.copyProperties(d, KqZzsfwPolicy.class)) .collect(Collectors.toList()); if(policyService.saveBatch(entitys)){ return "保存成功"; diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMatterDeduplicateMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMatterDeduplicateMapper.java new file mode 100644 index 0000000..05d3005 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMatterDeduplicateMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.zzsfw.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; + +/** + *

+ * Mapper 接口 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface KqZzsfwMatterDeduplicateMapper extends BaseMapper { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.java new file mode 100644 index 0000000..08ae623 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.java @@ -0,0 +1,23 @@ +package com.ningdatech.kqapi.zzsfw.mapper; + +import com.ningdatech.kqapi.admin.model.dto.MatterCountByWindowIdDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Collection; +import java.util.List; + +/** + *

+ * Mapper 接口 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface KqZzsfwMenuMapper extends BaseMapper { + + List selectMatterCountByWindowIds(@Param("windowIds") Collection windowIds); + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.xml new file mode 100644 index 0000000..2df43e3 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwMenuMapper.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwPolicyMapper.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwPolicyMapper.java new file mode 100644 index 0000000..76a6c19 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/KqZzsfwPolicyMapper.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.zzsfw.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; + +/** + *

+ * Mapper 接口 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface KqZzsfwPolicyMapper extends 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 deleted file mode 100644 index 63b3e1a..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMatterDeduplicateMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; - -/** - *

- * Mapper 接口 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface NdKqZzsfwMatterDeduplicateMapper extends BaseMapper { - -} 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 deleted file mode 100644 index badd1f2..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.mapper; - -import com.ningdatech.kqapi.admin.model.dto.MatterCountByWindowIdDTO; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; - -import java.util.Collection; -import java.util.List; - -/** - *

- * Mapper 接口 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface NdKqZzsfwMenuMapper extends BaseMapper { - - List selectMatterCountByWindowIds(@Param("windowIds") Collection windowIds); - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml deleted file mode 100644 index 4a736ae..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - 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 deleted file mode 100644 index 6258a3b..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; - -/** - *

- * Mapper 接口 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface NdKqZzsfwPolicyMapper extends BaseMapper { - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMattersDeduplicateDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMattersDeduplicateDTO.java new file mode 100644 index 0000000..4ae81d0 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMattersDeduplicateDTO.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") +public class KqZzsfwMattersDeduplicateDTO 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/KqZzsfwMenuDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMenuDTO.java new file mode 100644 index 0000000..3987394 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwMenuDTO.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对象") +public class KqZzsfwMenuDTO 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/KqZzsfwPolicyDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwPolicyDTO.java new file mode 100644 index 0000000..ee30ddf --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/KqZzsfwPolicyDTO.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 KqZzsfwPolicyDTO 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/dto/NdKqZzsfwMattersDeduplicateDTO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java deleted file mode 100644 index 7930245..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMattersDeduplicateDTO.java +++ /dev/null @@ -1,35 +0,0 @@ -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 deleted file mode 100644 index a51c19b..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwMenuDTO.java +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index 08a5f2a..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/dto/NdKqZzsfwPolicyDTO.java +++ /dev/null @@ -1,56 +0,0 @@ -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/KqZzsfwMattersDeduplicate.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMattersDeduplicate.java new file mode 100644 index 0000000..55075af --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMattersDeduplicate.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") +public class KqZzsfwMattersDeduplicate 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 KqZzsfwMattersDeduplicate of(String qlName, String webapplyurl) { + KqZzsfwMattersDeduplicate dup = new KqZzsfwMattersDeduplicate(); + dup.setQlName(qlName); + dup.setWebapplyurl(webapplyurl); + dup.setCountNum(1); + return dup; + } +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMenu.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMenu.java new file mode 100644 index 0000000..363ff1d --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwMenu.java @@ -0,0 +1,121 @@ +package com.ningdatech.kqapi.zzsfw.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 ZPF + * @since 2023-10-27 + */ +@Data +@TableName("nd_kq_zzsfw_menu") +@ApiModel(value = "NdKqZzsfwMenu对象") +public class KqZzsfwMenu implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("数据同步时间") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createOn; + + @ApiModelProperty("数据更新时间") + @TableField(fill = FieldFill.INSERT_UPDATE) + private LocalDateTime updateOn; + + @ApiModelProperty("创建人") + @TableField(fill = FieldFill.INSERT) + private Long createBy; + + @ApiModelProperty("更新人") + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateBy; + + @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; + + @ApiModelProperty("专区id") + private Integer zoneId; + + @ApiModelProperty("窗口id") + private Integer windowId; + + @ApiModelProperty("是否删除") + private Boolean deleted; + + @ApiModelProperty("服务对象") + private String serviceObject; + + @ApiModelProperty("是否免费") + private Boolean free; + + @ApiModelProperty("是否网上缴费") + private Boolean onlinePay; + + @ApiModelProperty("办理渠道") + private Integer handleChannel; + + @ApiModelProperty("办理地点") + private String handleAddress; + + @ApiModelProperty("办理时间") + private String handleTime; + + @ApiModelProperty("行使层级") + private String exerciseLevel; + + @ApiModelProperty("实施主体性质") + private Integer implSubjectNature; + + @ApiModelProperty("特色场景描述") + private String sceneDesc; + + @ApiModelProperty("宣传资料") + private String publicityMaterials; + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwPolicy.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwPolicy.java new file mode 100644 index 0000000..f75a34b --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/KqZzsfwPolicy.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 KqZzsfwPolicy 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/entity/NdKqZzsfwMattersDeduplicate.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java deleted file mode 100644 index 75e936e..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMattersDeduplicate.java +++ /dev/null @@ -1,51 +0,0 @@ -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 deleted file mode 100644 index bcca6be..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwMenu.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.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 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("数据同步时间") - @TableField(fill = FieldFill.INSERT) - private LocalDateTime createOn; - - @ApiModelProperty("数据更新时间") - @TableField(fill = FieldFill.INSERT_UPDATE) - private LocalDateTime updateOn; - - @ApiModelProperty("创建人") - @TableField(fill = FieldFill.INSERT) - private Long createBy; - - @ApiModelProperty("更新人") - @TableField(fill = FieldFill.INSERT_UPDATE) - private Long updateBy; - - @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; - - @ApiModelProperty("专区id") - private Integer zoneId; - - @ApiModelProperty("窗口id") - private Integer windowId; - - @ApiModelProperty("是否删除") - private Boolean deleted; - - @ApiModelProperty("服务对象") - private String serviceObject; - - @ApiModelProperty("是否免费") - private Boolean free; - - @ApiModelProperty("是否网上缴费") - private Boolean onlinePay; - - @ApiModelProperty("办理渠道") - private Integer handleChannel; - - @ApiModelProperty("办理地点") - private String handleAddress; - - @ApiModelProperty("办理时间") - private String handleTime; - - @ApiModelProperty("行使层级") - private String exerciseLevel; - - @ApiModelProperty("实施主体性质") - private Integer implSubjectNature; - - @ApiModelProperty("特色场景描述") - private String sceneDesc; - - @ApiModelProperty("宣传资料") - private String publicityMaterials; - -} 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 deleted file mode 100644 index aaa6b7e..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/entity/NdKqZzsfwPolicy.java +++ /dev/null @@ -1,64 +0,0 @@ -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/NdKqZzsfwPolicyVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java deleted file mode 100644 index b3d996d..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/NdKqZzsfwPolicyVO.java +++ /dev/null @@ -1,59 +0,0 @@ -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/ZzsfwPolicyVO.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZzsfwPolicyVO.java new file mode 100644 index 0000000..628b9e0 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/model/vo/ZzsfwPolicyVO.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") +public class ZzsfwPolicyVO 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/service/IKqZzsfwMatterDeduplicateService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMatterDeduplicateService.java new file mode 100644 index 0000000..c631f97 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMatterDeduplicateService.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.zzsfw.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; + +/** + *

+ * 服务类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface IKqZzsfwMatterDeduplicateService extends IService { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMenuService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMenuService.java new file mode 100644 index 0000000..67a20c5 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwMenuService.java @@ -0,0 +1,21 @@ +package com.ningdatech.kqapi.zzsfw.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; + +import java.util.Collection; +import java.util.Map; + +/** + *

+ * 服务类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface IKqZzsfwMenuService extends IService { + + Map matterCountByWindowIds(Collection windowIds); + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwPolicyService.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwPolicyService.java new file mode 100644 index 0000000..ee81ca9 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/IKqZzsfwPolicyService.java @@ -0,0 +1,16 @@ +package com.ningdatech.kqapi.zzsfw.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; + +/** + *

+ * 服务类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +public interface IKqZzsfwPolicyService extends 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 deleted file mode 100644 index 8b25f63..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMattersDeduplicate; - -/** - *

- * 服务类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface INdKqZzsfwMatterDeduplicateService extends IService { - -} 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 deleted file mode 100644 index abe3528..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; - -import java.util.Collection; -import java.util.Map; - -/** - *

- * 服务类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface INdKqZzsfwMenuService extends IService { - - Map matterCountByWindowIds(Collection windowIds); - -} 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 deleted file mode 100644 index 8acc426..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwPolicyService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwPolicy; - -/** - *

- * 服务类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -public interface INdKqZzsfwPolicyService extends IService { - -} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMatterDeduplicateServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMatterDeduplicateServiceImpl.java new file mode 100644 index 0000000..7bca6b0 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMatterDeduplicateServiceImpl.java @@ -0,0 +1,21 @@ +package com.ningdatech.kqapi.zzsfw.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.mapper.KqZzsfwMatterDeduplicateMapper; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Service +public class KqZzsfwMatterDeduplicateServiceImpl extends ServiceImpl + implements IKqZzsfwMatterDeduplicateService { + +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMenuServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMenuServiceImpl.java new file mode 100644 index 0000000..def79e7 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwMenuServiceImpl.java @@ -0,0 +1,38 @@ +package com.ningdatech.kqapi.zzsfw.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.ningdatech.basic.util.CollUtils; +import com.ningdatech.kqapi.admin.model.dto.MatterCountByWindowIdDTO; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.mapper.KqZzsfwMenuMapper; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +/** + *

+ * 服务实现类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Service +public class KqZzsfwMenuServiceImpl extends ServiceImpl implements IKqZzsfwMenuService { + + @Override + public Map matterCountByWindowIds(Collection windowIds) { + if (CollUtil.isEmpty(windowIds)) { + return Collections.emptyMap(); + } + List matterCountByWindowIds = baseMapper.selectMatterCountByWindowIds(windowIds); + return CollUtils.listToMap(matterCountByWindowIds, + MatterCountByWindowIdDTO::getWindowId, + MatterCountByWindowIdDTO::getMatterCount); + } +} diff --git a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwPolicyServiceImpl.java b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwPolicyServiceImpl.java new file mode 100644 index 0000000..230cdb1 --- /dev/null +++ b/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/KqZzsfwPolicyServiceImpl.java @@ -0,0 +1,21 @@ +package com.ningdatech.kqapi.zzsfw.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.mapper.KqZzsfwPolicyMapper; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwPolicyService; +import org.springframework.stereotype.Service; + +/** + *

+ * 服务实现类 + *

+ * + * @author ZPF + * @since 2023-10-27 + */ +@Service +public class KqZzsfwPolicyServiceImpl extends ServiceImpl + implements IKqZzsfwPolicyService { + +} 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 deleted file mode 100644 index e37217a..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMatterDeduplicateServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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; - -/** - *

- * 服务实现类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Service -public class NdKqZzsfwMatterDeduplicateServiceImpl extends ServiceImpl - implements INdKqZzsfwMatterDeduplicateService { - -} 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 deleted file mode 100644 index 604c75f..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwMenuServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.ningdatech.basic.util.CollUtils; -import com.ningdatech.kqapi.admin.model.dto.MatterCountByWindowIdDTO; -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; -import org.springframework.stereotype.Service; - -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - *

- * 服务实现类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Service -public class NdKqZzsfwMenuServiceImpl extends ServiceImpl implements INdKqZzsfwMenuService { - - @Override - public Map matterCountByWindowIds(Collection windowIds) { - if (CollUtil.isEmpty(windowIds)) { - return Collections.emptyMap(); - } - List matterCountByWindowIds = baseMapper.selectMatterCountByWindowIds(windowIds); - return CollUtils.listToMap(matterCountByWindowIds, - MatterCountByWindowIdDTO::getWindowId, - MatterCountByWindowIdDTO::getMatterCount); - } -} 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 deleted file mode 100644 index 6e3aa78..0000000 --- a/kqapi/src/main/java/com/ningdatech/kqapi/zzsfw/service/impl/NdKqZzsfwPolicyServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ningdatech.kqapi.zzsfw.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -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; - -/** - *

- * 服务实现类 - *

- * - * @author ZPF - * @since 2023-10-27 - */ -@Service -public class NdKqZzsfwPolicyServiceImpl extends ServiceImpl - implements INdKqZzsfwPolicyService { - -} diff --git a/kqapi/src/main/resources/security/auth-dev.yml b/kqapi/src/main/resources/security/auth-dev.yml index d71feff..b0fd8b5 100644 --- a/kqapi/src/main/resources/security/auth-dev.yml +++ b/kqapi/src/main/resources/security/auth-dev.yml @@ -5,6 +5,8 @@ security: password-login-url: /api/v1/user/auth/login/password logout-url: /api/v1/user/auth/logout ignore-auth-urls: + - /api/v1/poclicy/** + - /api/v1/zzsfw/** - /v2/api-docs - /swagger-ui.html - /webjars/** @@ -20,6 +22,8 @@ security: - /open/api/** - /api/v1/wechat/** ignore-csrf-urls: + - /api/v1/poclicy/** + - /api/v1/zzsfw/** - /api/v1/user/auth/** - /v2/api-docs - /swagger-ui.html 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 871c33f..70a46fe 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/DuplicationTest.java @@ -3,10 +3,10 @@ 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.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 com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMattersDeduplicate; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMatterDeduplicateService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -33,10 +33,10 @@ import java.util.stream.Collectors; public class DuplicationTest extends AppTests { @Autowired - private INdKqZzsfwMatterDeduplicateService matterDeduplicateService; + private IKqZzsfwMatterDeduplicateService matterDeduplicateService; @Autowired - private INdKqZzsfwMenuService menuService; + private IKqZzsfwMenuService menuService; @Test public void test() throws IOException { @@ -53,7 +53,7 @@ public class DuplicationTest extends AppTests { //获取最大列数 Integer num = 1; - matterDeduplicateService.remove(Wrappers.lambdaQuery(NdKqZzsfwMattersDeduplicate.class)); + matterDeduplicateService.remove(Wrappers.lambdaQuery(KqZzsfwMattersDeduplicate.class)); for (int i = 2; i < rownum; i++) { row = sheet.getRow(i); @@ -65,7 +65,7 @@ public class DuplicationTest extends AppTests { System.out.println(row.getCell(1).getStringCellValue()); Double numericCellValue = row.getCell(2).getNumericCellValue(); - NdKqZzsfwMattersDeduplicate menu = new NdKqZzsfwMattersDeduplicate(); + KqZzsfwMattersDeduplicate menu = new KqZzsfwMattersDeduplicate(); menu.setWebapplyurl(row.getCell(1).getStringCellValue()); menu.setQlName(row.getCell(0).getStringCellValue()); menu.setCreateOn(LocalDateTime.now()); @@ -78,16 +78,16 @@ public class DuplicationTest extends AppTests { @Test public void syncUrl(){ - List menus = menuService.list(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)); + List menus = menuService.list(Wrappers.lambdaQuery(KqZzsfwMenu.class)); - List list = matterDeduplicateService.list(); + List list = matterDeduplicateService.list(); Set qlSet = Sets.newTreeSet(); Map map = list.stream().filter(q -> qlSet.add(q.getQlName())) .filter(q -> StringUtils.isNotBlank(q.getWebapplyurl()) && StringUtils.isNotBlank(q.getQlName())) .collect(Collectors.toMap(q -> q.getQlName(), q -> q.getWebapplyurl())); - for(NdKqZzsfwMenu menu : menus){ + for(KqZzsfwMenu menu : menus){ String itemName = menu.getItemName(); if(map.containsKey(itemName)){ String url = map.get(itemName); 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 44d4249..89ec354 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/MenuTest.java @@ -2,9 +2,9 @@ package com.ningdatech.kqapi.menu; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ningdatech.kqapi.AppTests; -import com.ningdatech.kqapi.zzsfw.model.entity.NdKqZzsfwMenu; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwMenu; import com.ningdatech.kqapi.zzsfw.enumeration.ItemTypeEnum; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwMenuService; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwMenuService; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.Assert; @@ -27,7 +27,7 @@ import java.time.LocalDateTime; public class MenuTest extends AppTests{ // @Autowired - private INdKqZzsfwMenuService menuService; + private IKqZzsfwMenuService menuService; @Test public void test() throws IOException { @@ -44,7 +44,7 @@ public class MenuTest extends AppTests{ // //获取最大列数 Integer num = 1; - menuService.remove(Wrappers.lambdaQuery(NdKqZzsfwMenu.class)); + menuService.remove(Wrappers.lambdaQuery(KqZzsfwMenu.class)); for (int i = 2; i < rownum; i++) { row = sheet.getRow(i); @@ -59,7 +59,7 @@ public class MenuTest extends AppTests{ // String itemName = row.getCell(4).getStringCellValue(); System.out.println(itemName); - NdKqZzsfwMenu menu = new NdKqZzsfwMenu(); + KqZzsfwMenu menu = new KqZzsfwMenu(); menu.setItemName(itemName); menu.setZoneName(row.getCell(0).getStringCellValue()); menu.setWindow(row.getCell(1).getStringCellValue()); @@ -131,7 +131,7 @@ public class MenuTest extends AppTests{ // telephone = decimalFormat2.format(row.getCell(7).getNumericCellValue()); System.out.println(telephone); } - NdKqZzsfwMenu menu = new NdKqZzsfwMenu(); + KqZzsfwMenu menu = new KqZzsfwMenu(); menu.setItemName(itemName); menu.setZoneName(zoneName); menu.setWindow(windowName); 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 110f295..cb128b6 100644 --- a/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java +++ b/kqapi/src/test/java/com/ningdatech/kqapi/menu/PolicyTest.java @@ -3,8 +3,8 @@ 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.model.entity.NdKqZzsfwPolicy; -import com.ningdatech.kqapi.zzsfw.service.INdKqZzsfwPolicyService; +import com.ningdatech.kqapi.zzsfw.model.entity.KqZzsfwPolicy; +import com.ningdatech.kqapi.zzsfw.service.IKqZzsfwPolicyService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -27,7 +27,7 @@ import java.util.Objects; public class PolicyTest extends AppTests { @Autowired - private INdKqZzsfwPolicyService policyService; + private IKqZzsfwPolicyService policyService; @Test public void test() throws IOException { @@ -36,7 +36,7 @@ public class PolicyTest extends AppTests { Assert.assertNotNull(workbook); Row row; - policyService.remove(Wrappers.lambdaQuery(NdKqZzsfwPolicy.class)); + policyService.remove(Wrappers.lambdaQuery(KqZzsfwPolicy.class)); if (workbook != null) { //获取最大行数 @@ -62,7 +62,7 @@ public class PolicyTest extends AppTests { String applyTime = Objects.nonNull(row.getCell(8)) ? row.getCell(8).getStringCellValue() : null; String url = Objects.nonNull(row.getCell(9)) ? row.getCell(9).getStringCellValue() : null; - NdKqZzsfwPolicy policy = new NdKqZzsfwPolicy(); + KqZzsfwPolicy policy = new KqZzsfwPolicy(); policy.setHeader(header); policy.setTitle(title); policy.setSecondTitle(secondTitle); diff --git a/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class b/kqapi/target/classes/com/ningdatech/kqapi/common/helper/MatterCacheHelper.class index a36ed25b22e34bda52aeae9bb1bb428ecc13f3ad..a2d1d5e87650953af9c03f9a0500d1721768847c 100644 GIT binary patch delta 26 icmbQl(#JAEjxlqhy#K_4QpWI!&#WgFNKLk7yb1t!$O(Y} delta 33 kcmeBUnZz8Gg delta 176 zcmcbb`8;z2H#4LA!UW&OjNp z$@NVCz$~T73z*q~JV_R7Mg~)`)H`MgMi2`u#qV7hRaKl;?wgud3RGbZR*}gf!w6!5 zRczkK!pq1QI(a{_w%c7Ru<4^1purQ BaP0s9 delta 430 zcmbQIbxv!-dq(%k6B$*R{8A=AU{jcE$|x{-0;3v;o6V@oXakem#yE@7b#fpRSY|%6 z ztYc(=%7Haxa=9^@BdHaFs}0D{$xNB)MMoSQ8rpNj(k D_`M+_ delta 108 zcmbP|v><5%Co`kfWI+iT?&8#A80!kSD#-gj0jCPvT6MjVzP tUN(m^8>8vu^Q;;m-gdqSPDby^0uow4-efC@bBq>1DQOhbbS0mQ0|2|nAVdHF diff --git a/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class b/kqapi/target/classes/com/ningdatech/kqapi/scheduler/task/SynTask.class index 1d20c899503fa197c0ed4766a60ef374c470b867..33554fc3d1e84943b5f50e77df6f7de38100ef7c 100644 GIT binary patch delta 607 zcmXAlT};h!7{@=)>6}iiX{?UO(peolQsyitoy^P0%#N2BA~h01M%ZxVJ;PxtXMRa& z%UR9xvMGNrxghc~bk#+h85fzkaKSA%<~h0geV^z1JkR(0{SAb>!aZKQEH({xk6C4( zB}H*$b=!R+x6LOG?BzT;x{AC=_bqBBV}gD8Ho2~NgP?*lOhSS)VSTL=Bv|d zeaA(fhHe!6m{&;%XX60#OdtP)$u8`rP~ z(@!MW){kOcn`}j=tWK~M{pV7$#*5Ud*2+<;(H%>yUc*?{GJ!H&l;dFo`BX56N=n$o za;n(HW{yzJX|`~gt;E>IeQM~_`XxIUVkaZi@=GUwYyFqqBJ33h`^3e5tJ&Ks!GkJu zh#bNcaF|8ZvrLaxa8wtMY4RX0N<{|<@V#m_zF)2m_+Scj!49#N;K>v^IQeMEF7%2U&x zH|%+)8_(5Zzgm1jK;MO$uT;g$d9S%YXn;Y}nt#qQ4Lc>4d*+`pl4CN8zNZb4!YeX) zO`iJoGr(Nl8du=6uSuC^b=;)vCH>wgg&1|*!bYxW_NyG=y5?_FOV>Eh4U=8`P(0>i G@sEF|HlpwV delta 693 zcmYk2SxD4T6vlsd78|pL7DqD~M^YM1qajQkNh%QuZSWzqMlCG0MYBw6%+mI>hideK zN-LVQ5Sj3|C<{u<7Fs~a9-X|saGZythiT?HEjlOhbNp#+oFSY`IO)dCWdZGGIaly< zm9=vFxNhVxQY!f-A@q_Wq?z5r#N^(wlyU5Gnm$(=I$S?ahT^Pdx>^R#eLTRr{Cr3XA;{{qr=x}5+3 diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/controller/NdKqZzsfwMenuController.class deleted file mode 100644 index 40b8f6ddc964711fe1d527b59999548b7a8f8da5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5107 zcmcInYj@jJ7TvPb*bz!vQrc1|(C{c}gR8cL@<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 z7x7nLjdmPS#~H k6ZbBRswz$^56I8SOs;eZ@wc|KW@L!f0Lg9M!eYY;0F7!Lu>b%7 delta 103 zcmaDN{6Tm_5hG*z#QD0D7ci=^_@#IkPCmx?iOE-E@wv>{5eZQ2+514cqEs+I` wnLjdmPgZ3ylK|<6swz$^56I8SOs;eZ@wc|KW@Lz;T*zY1xa z&CF;z*^pav@;R==$&a+OC-3K$o?Ol?&A4Z>0k;;A=Q^2<=Q3j`Ov~gtVX4Xbyupl~ zKzU`Bl#+b?$!mDEz=kM6xc_-ofF`LxICa93lhgPl8J&TaK;?l#>@Fex){G1wK~0c} zn|b-QnVA|ippLefJX>fRV;R^5b;8RTlfkSx;zpAlIM^q5i}*6;f<$<{3!|!v)5?8Q z^GdD3M%jq!G8RwH61AEPQ+!{voUsP1eLuJONd+?d=o zCijb3Y+fJ{$~f6jS!VJEZr;rbQcg^aj*|=76+yuTbgAU#WioN>V9#q!HdM)BGy_UX zPo5yex%r4nDl20O+^SryQedco3^!B}o?M|N!&ox;ftK#%Jnh`cNis4ZEkIw&Z&uW? GHv|C7iiZUN delta 478 zcmbQYi}ArO#tlDM7_BBhS-S{N%~3Ul=_n@8`Azs@Qyx z?KU%``Q(q9njrPZxDpv7Cx6h?0&#-4%@_~BIGed$L1I6+FEfTi^-i9^CplS;H-yo9 zvH+htNOl&l7SJp~J~a^MHLnWLEU3%`KH143e4>o5Fxd%w@<0yMTA)FjKk?}>Gqq?S zJJwam0%Q=#&2xmNGgiRd0HO; z-YHtj*Z@-`r6oPtRRZkixnj#0GhpHdB1V%Jh${m_5gG{Z#NB{_WhwyBPk74CR3WV{?H_96K;Hpjt0#2~XxxiDa~xtSF=c($J-n$~xIuTpQ#f fDXpH#%-Ue)MJ*#lpo9G8t{nml8>prO+Hr;eAkUUV diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/manage/PolicyManage.class index 18ddc6dd537e7c2895fa53e94623888e0e38923c..ae92ea15189a81d33b24d732f71309b586f7763c 100644 GIT binary patch delta 371 zcmX?SzQBBg8zZCDU(a^V+>_vD)pJ{$SFB_0*~V4|4drK z-i1+B#cAaM`8k=%mDYCFj0~=m?U+p`mopo(Bx`tiO)eDFntY8}Z4!$lleY%cP#%_) zl6?Ki&MZ2N=BPq5SY+Tr!jm7cR86*JHWmS?MzP2x#DB5{vxQu0UP)$2C8`|I5$p^L z7#U(UfDSQ&*ksIR$Ycw%9mz|Rd)YQH6~H8*&Pr#up1g!zg((LnEZOr_G={H; F7XSefcPan? delta 382 zcmZ2re$IS@8zZC5Z4E6BIlF)DoTHMerqKFU;2^8t*yfbE*FrUqQK*9)06GcLZ z!XH`h+0XCm`{NS;F5$F-lM2QaOazPwysuH%4Hiaa0MtAXIOYZWDy&-k*UPUB`1pWe`V#Rl0Woz{4-?pBZe zcupyCh&QZqXS6J|`nnb{S@;|z-)d8oo$sM{z}veQy>bE5UhZ$#w_5+&B;ah{1p(#T Yf7vh+AmE_HVKE#^cQoW<7!9@h0Spd;8~^|S diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.class deleted file mode 100644 index 7c719c8777ce4331c90c89c6e6eeb22aac34cc4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmb7AyHdkI4BX=plh9D|6{sPV843y-5-8Hq$!En}@ZCA~9ZWKO83iA}M=_k8Dhw19 zl6It7X;+_L?;ijzahl;I!#Kl4VZ1Pv;}Ba>c$=;Gg{fv&(L=Ek9rBs>mJ0UPls=N( z6dX*~)UhM&TOrF$BQ4!s(>7@Uhi$YwD!sd~d#6e$mTQnD(0fIV!Z diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml deleted file mode 100644 index ad43de2..0000000 --- a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwMenuMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/mapper/NdKqZzsfwPolicyMapper.class deleted file mode 100644 index 5907de0a2735dcad4ebf7eb5867d01ed3bf480f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmb7AyH3ME5S-%?lh9D}5p07*VMIYeLwHE(=+@`OT)2m0pFvK+hf(kWd=%pBbP*{i zc6YSe(ah}k&*v9_a~x+l$}r6^QX_W7M$D8-WaXkt(IT{vvgzt diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMatterDeduplicateService.class deleted file mode 100644 index 9661a06f83948f054973f5393f0eb2c9930f2000..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmbVIyG{c!5M1-fkvc diff --git a/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class b/kqapi/target/classes/com/ningdatech/kqapi/zzsfw/service/INdKqZzsfwMenuService.class deleted file mode 100644 index a6253853fd80f5d8ae9ccd90156a8f09d682b836..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmbVIJx{|x41LE(L(9UaFAe_V5Bh2q_jH3h83QtbG_13X z8>-q|M+pnt1mc&-E{Jy&xL%22nr0htF)TT8WuYURM|xW7h0uB(9-gW41zTblCAM@^ zTrcnY_MNw4+VnD2m}I`G4PS}v6dg~uM!qRddZ7yEy}Cb$epLN_LE&iItitI(+>R6! ScDmT@ev1z64S64jdG|j+!i6B0upLMrKZZEH)nSUQ+Dme_5$Hw^@PNs zKcGLV>g<+Ew1=cZ$kKSH$!p618To9_U&@T!Xz`W-y);6(>76;`&{a@T zEWdXdDf9+x>8L6uOyp4JRnT-9$p&`z@4wvP+Md^1Vak&HoTi3NK{A&^^vX5a$Z_^BQ@HcKWM?kT zAC(RlDkSQ3N3QZI9dK>T=E57brtiL*bEEM3Qze}iH0Ho!Hv7naVy6Oqmo4tppve)&`fM4yACR6|b 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 deleted file mode 100644 index 09ffda531ee7b9748027370865aa7d3baec39b73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmbtS&2AGh5dPdWO&dxB;YaGB2X1W-_|gN?RuvQpsUq!xR5|qKY^LeZU3+VL8BGYH1_cs?6d`hj2QB3q*AS_hi@ pU!Xn0NKw_G9Jo0f6QvgY^HzvSx7t0z-=uHC~*K3Cd!ZXh$0N^Js#>BI22J2&(v2fL5=&%L+$ zws48wp_1$M$K6Vr-hWf4O5pX^g6qiifIRUyJ{n^K6J!lfW20x?So+-YJdT{o^qF-N z>4SFKhH0+ljH!494J-<5{r~U;;xfrUj!WRfUzG3%?(haRUTNN3-fzK&dtw