From 9010f2fc213eef8b5b462d90f242ef4d9d863d72 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 14 Mar 2022 22:12:28 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=EF=BC=9AMemo=E5=A4=87?= =?UTF-8?q?=E5=BF=98=E7=9B=B8=E5=85=B3dto=20dao...=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9ANacos=E5=8A=A8=E6=80=81=E4=B8=8A=E4=B8=8B=E7=BA=BF?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../java/com/epmet/dto/MemoAttachmentDTO.java | 104 ++++++++++++++++++ .../main/java/com/epmet/dto/MemoAttrDTO.java | 79 +++++++++++++ .../java/com/epmet/dto/MemoConcernDTO.java | 99 +++++++++++++++++ .../java/com/epmet/dto/MemoDifficultyDTO.java | 79 +++++++++++++ .../java/com/epmet/dto/MemoWorkDiaryDTO.java | 69 ++++++++++++ .../NacosServiceListListenerRegisterer.java | 4 +- .../controller/MemoAttachmentController.java | 72 ++++++++++++ .../epmet/controller/MemoAttrController.java | 72 ++++++++++++ .../controller/MemoConcernController.java | 72 ++++++++++++ .../controller/MemoDifficultyController.java | 72 ++++++++++++ .../controller/MemoWorkDiaryController.java | 72 ++++++++++++ .../java/com/epmet/dao/MemoAttachmentDao.java | 16 +++ .../main/java/com/epmet/dao/MemoAttrDao.java | 16 +++ .../java/com/epmet/dao/MemoConcernDao.java | 16 +++ .../java/com/epmet/dao/MemoDifficultyDao.java | 16 +++ .../java/com/epmet/dao/MemoWorkDiaryDao.java | 16 +++ .../epmet/entity/MemoAttachmentEntity.java | 74 +++++++++++++ .../java/com/epmet/entity/MemoAttrEntity.java | 49 +++++++++ .../com/epmet/entity/MemoConcernEntity.java | 69 ++++++++++++ .../epmet/entity/MemoDifficultyEntity.java | 49 +++++++++ .../com/epmet/entity/MemoWorkDiaryEntity.java | 39 +++++++ .../com/epmet/redis/MemoAttachmentRedis.java | 30 +++++ .../java/com/epmet/redis/MemoAttrRedis.java | 30 +++++ .../com/epmet/redis/MemoConcernRedis.java | 30 +++++ .../com/epmet/redis/MemoDifficultyRedis.java | 30 +++++ .../com/epmet/redis/MemoWorkDiaryRedis.java | 30 +++++ .../epmet/service/MemoAttachmentService.java | 78 +++++++++++++ .../com/epmet/service/MemoAttrService.java | 78 +++++++++++++ .../com/epmet/service/MemoConcernService.java | 78 +++++++++++++ .../epmet/service/MemoDifficultyService.java | 78 +++++++++++++ .../epmet/service/MemoWorkDiaryService.java | 78 +++++++++++++ .../impl/MemoAttachmentServiceImpl.java | 87 +++++++++++++++ .../service/impl/MemoAttrServiceImpl.java | 87 +++++++++++++++ .../service/impl/MemoConcernServiceImpl.java | 87 +++++++++++++++ .../impl/MemoDifficultyServiceImpl.java | 87 +++++++++++++++ .../impl/MemoWorkDiaryServiceImpl.java | 87 +++++++++++++++ .../resources/mapper/MemoAttachmentDao.xml | 27 +++++ .../src/main/resources/mapper/MemoAttrDao.xml | 22 ++++ .../main/resources/mapper/MemoConcernDao.xml | 26 +++++ .../resources/mapper/MemoDifficultyDao.xml | 22 ++++ .../resources/mapper/MemoWorkDiaryDao.xml | 20 ++++ .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- .../NacosServiceListListenerRegisterer.java | 4 +- 75 files changed, 2312 insertions(+), 70 deletions(-) create mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java create mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java create mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java create mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java create mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java create mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml create mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml create mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml create mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml create mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java index c776cfbe47..800f23a357 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java index 869279e230..915724e664 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..c14a7efa4d 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + //// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java new file mode 100755 index 0000000000..cf63017009 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java @@ -0,0 +1,104 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +public class MemoAttachmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * REMIND_MSG.ID + */ + private String remindMsgId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件大小，单位b + */ + private Integer attachmentSize; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java new file mode 100755 index 0000000000..477c948619 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +public class MemoAttrDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 提醒时间 + */ + private Date remindTime; + + /** + * 阅读标记1 已读；0未读 + */ + private Integer readFlag; + + /** + * 业务类型 人员关怀：concern；难点堵点：difficulty；工作日志：work_diary + */ + private String type; + + /** + * 接收人ID + */ + private String receiver; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java new file mode 100755 index 0000000000..23bdc67b96 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java @@ -0,0 +1,99 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +public class MemoConcernDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 关怀类型 + */ + private String concernType; + + /** + * 关怀对象 + */ + private String resiName; + + /** + * 关怀对象电话 + */ + private String phnoe; + + /** + * 关怀对象地址 + */ + private String address; + + /** + * 关怀事项 + */ + private String content; + + /** + * 计划执行时间 + */ + private Date scheduledTime; + + /** + * 实际执行时间 + */ + private Date actualTime; + + /** + * 状态 0未完成 1已完成 + */ + private Integer status; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 操作人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java new file mode 100755 index 0000000000..6ed31a8d0c --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +public class MemoDifficultyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 内容 + */ + private String content; + + /** + * 解决方式 + */ + private String resolveWay; + + /** + * 备注 + */ + private String remark; + + /** + * 计划执行时间 + */ + private Date scheduledTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java new file mode 100755 index 0000000000..8009134c31 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +public class MemoWorkDiaryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 唯一标识 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作事项 + */ + private String workType; + + /** + * 内容 + */ + private String content; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java new file mode 100755 index 0000000000..fd86ab8bad --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MemoAttachmentDTO; +import com.epmet.service.MemoAttachmentService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@RestController +@RequestMapping("memoAttachment") +public class MemoAttachmentController { + + @Autowired + private MemoAttachmentService memoAttachmentService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = memoAttachmentService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + MemoAttachmentDTO data = memoAttachmentService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody MemoAttachmentDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + memoAttachmentService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody MemoAttachmentDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + memoAttachmentService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + memoAttachmentService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java new file mode 100755 index 0000000000..9bb69d635c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MemoAttrDTO; +import com.epmet.service.MemoAttrService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@RestController +@RequestMapping("memoAttr") +public class MemoAttrController { + + @Autowired + private MemoAttrService memoAttrService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = memoAttrService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + MemoAttrDTO data = memoAttrService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody MemoAttrDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + memoAttrService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody MemoAttrDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + memoAttrService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + memoAttrService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java new file mode 100755 index 0000000000..2fe13a9ee9 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MemoConcernDTO; +import com.epmet.service.MemoConcernService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@RestController +@RequestMapping("memoConcern") +public class MemoConcernController { + + @Autowired + private MemoConcernService memoConcernService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = memoConcernService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + MemoConcernDTO data = memoConcernService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody MemoConcernDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + memoConcernService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody MemoConcernDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + memoConcernService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + memoConcernService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java new file mode 100755 index 0000000000..6f30010371 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MemoDifficultyDTO; +import com.epmet.service.MemoDifficultyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@RestController +@RequestMapping("memoDifficulty") +public class MemoDifficultyController { + + @Autowired + private MemoDifficultyService memoDifficultyService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = memoDifficultyService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + MemoDifficultyDTO data = memoDifficultyService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody MemoDifficultyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + memoDifficultyService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody MemoDifficultyDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + memoDifficultyService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + memoDifficultyService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java new file mode 100755 index 0000000000..18de8f371a --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java @@ -0,0 +1,72 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.dto.MemoWorkDiaryDTO; +import com.epmet.service.MemoWorkDiaryService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@RestController +@RequestMapping("memoWorkDiary") +public class MemoWorkDiaryController { + + @Autowired + private MemoWorkDiaryService memoWorkDiaryService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = memoWorkDiaryService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + MemoWorkDiaryDTO data = memoWorkDiaryService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody MemoWorkDiaryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + memoWorkDiaryService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody MemoWorkDiaryDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + memoWorkDiaryService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + memoWorkDiaryService.delete(ids); + return new Result(); + } + + + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java new file mode 100755 index 0000000000..52d7c6944e --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.MemoAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Mapper +public interface MemoAttachmentDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java new file mode 100755 index 0000000000..5ae7405a48 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.MemoAttrEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Mapper +public interface MemoAttrDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java new file mode 100755 index 0000000000..7b829e2e62 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.MemoConcernEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Mapper +public interface MemoConcernDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java new file mode 100755 index 0000000000..f0961195ad --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.MemoDifficultyEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Mapper +public interface MemoDifficultyDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java new file mode 100755 index 0000000000..95f2a8cb6f --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.MemoWorkDiaryEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Mapper +public interface MemoWorkDiaryDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java new file mode 100755 index 0000000000..4044930f37 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java @@ -0,0 +1,74 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("memo_attachment") +public class MemoAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * REMIND_MSG.ID + */ + private String remindMsgId; + + /** + * 文件名 + */ + private String fileName; + + /** + * 附件名（uuid随机生成） + */ + private String attachmentName; + + /** + * 文件大小，单位b + */ + private Integer attachmentSize; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String attachmentFormat; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String attachmentType; + + /** + * 附件地址 + */ + private String attachmentUrl; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + + /** + * 排序字段 + */ + private Integer sort; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java new file mode 100755 index 0000000000..8c847f0234 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("memo_attr") +public class MemoAttrEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 提醒时间 + */ + private Date remindTime; + + /** + * 阅读标记1 已读；0未读 + */ + private Integer readFlag; + + /** + * 业务类型 人员关怀：concern；难点堵点：difficulty；工作日志：work_diary + */ + private String type; + + /** + * 接收人ID + */ + private String receiver; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java new file mode 100755 index 0000000000..70267c0faa --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java @@ -0,0 +1,69 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("memo_concern") +public class MemoConcernEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 关怀类型 + */ + private String concernType; + + /** + * 关怀对象 + */ + private String resiName; + + /** + * 关怀对象电话 + */ + private String phnoe; + + /** + * 关怀对象地址 + */ + private String address; + + /** + * 关怀事项 + */ + private String content; + + /** + * 计划执行时间 + */ + private Date scheduledTime; + + /** + * 实际执行时间 + */ + private Date actualTime; + + /** + * 状态 0未完成 1已完成 + */ + private Integer status; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java new file mode 100755 index 0000000000..29eb588f37 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java @@ -0,0 +1,49 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("memo_difficulty") +public class MemoDifficultyEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 内容 + */ + private String content; + + /** + * 解决方式 + */ + private String resolveWay; + + /** + * 备注 + */ + private String remark; + + /** + * 计划执行时间 + */ + private Date scheduledTime; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java new file mode 100755 index 0000000000..5542558072 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java @@ -0,0 +1,39 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("memo_work_diary") +public class MemoWorkDiaryEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作事项 + */ + private String workType; + + /** + * 内容 + */ + private String content; + +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java new file mode 100755 index 0000000000..526221fe17 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Component +public class MemoAttachmentRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java new file mode 100755 index 0000000000..7260fb81ad --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Component +public class MemoAttrRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java new file mode 100755 index 0000000000..01ffe5dd0a --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Component +public class MemoConcernRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java new file mode 100755 index 0000000000..819af138dc --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Component +public class MemoDifficultyRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java new file mode 100755 index 0000000000..2957e7f53b --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Component +public class MemoWorkDiaryRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java new file mode 100755 index 0000000000..f1754031eb --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.MemoAttachmentDTO; +import com.epmet.entity.MemoAttachmentEntity; + +import java.util.List; +import java.util.Map; + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +public interface MemoAttachmentService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-03-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-03-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return MemoAttachmentDTO + * @author generator + * @date 2022-03-14 + */ + MemoAttachmentDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void save(MemoAttachmentDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void update(MemoAttachmentDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-03-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java new file mode 100755 index 0000000000..bbcd55100f --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.MemoAttrDTO; +import com.epmet.entity.MemoAttrEntity; + +import java.util.List; +import java.util.Map; + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +public interface MemoAttrService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-03-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-03-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return MemoAttrDTO + * @author generator + * @date 2022-03-14 + */ + MemoAttrDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void save(MemoAttrDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void update(MemoAttrDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-03-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java new file mode 100755 index 0000000000..f74dd1b555 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.MemoConcernDTO; +import com.epmet.entity.MemoConcernEntity; + +import java.util.List; +import java.util.Map; + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +public interface MemoConcernService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-03-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-03-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return MemoConcernDTO + * @author generator + * @date 2022-03-14 + */ + MemoConcernDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void save(MemoConcernDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void update(MemoConcernDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-03-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java new file mode 100755 index 0000000000..bf5f91cc01 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.MemoDifficultyDTO; +import com.epmet.entity.MemoDifficultyEntity; + +import java.util.List; +import java.util.Map; + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +public interface MemoDifficultyService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-03-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-03-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return MemoDifficultyDTO + * @author generator + * @date 2022-03-14 + */ + MemoDifficultyDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void save(MemoDifficultyDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void update(MemoDifficultyDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-03-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java new file mode 100755 index 0000000000..47d16dc6e7 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.MemoWorkDiaryDTO; +import com.epmet.entity.MemoWorkDiaryEntity; + +import java.util.List; +import java.util.Map; + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +public interface MemoWorkDiaryService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-03-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-03-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return MemoWorkDiaryDTO + * @author generator + * @date 2022-03-14 + */ + MemoWorkDiaryDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void save(MemoWorkDiaryDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-03-14 + */ + void update(MemoWorkDiaryDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-03-14 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java new file mode 100755 index 0000000000..49483be635 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.MemoAttachmentDao; +import com.epmet.dto.MemoAttachmentDTO; +import com.epmet.entity.MemoAttachmentEntity; +import com.epmet.redis.MemoAttachmentRedis; +import com.epmet.service.MemoAttachmentService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 备忘录-附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Service +public class MemoAttachmentServiceImpl extends BaseServiceImpl implements MemoAttachmentService { + + @Autowired + private MemoAttachmentRedis memoAttachmentRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, MemoAttachmentDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, MemoAttachmentDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public MemoAttachmentDTO get(String id) { + MemoAttachmentEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, MemoAttachmentDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(MemoAttachmentDTO dto) { + MemoAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttachmentEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MemoAttachmentDTO dto) { + MemoAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttachmentEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java new file mode 100755 index 0000000000..1fc2bd4be2 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.MemoAttrDao; +import com.epmet.dto.MemoAttrDTO; +import com.epmet.entity.MemoAttrEntity; +import com.epmet.redis.MemoAttrRedis; +import com.epmet.service.MemoAttrService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 备忘录-属性表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Service +public class MemoAttrServiceImpl extends BaseServiceImpl implements MemoAttrService { + + @Autowired + private MemoAttrRedis memoAttrRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, MemoAttrDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, MemoAttrDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public MemoAttrDTO get(String id) { + MemoAttrEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, MemoAttrDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(MemoAttrDTO dto) { + MemoAttrEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttrEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MemoAttrDTO dto) { + MemoAttrEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttrEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java new file mode 100755 index 0000000000..6f9f691d7d --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.MemoConcernDao; +import com.epmet.dto.MemoConcernDTO; +import com.epmet.entity.MemoConcernEntity; +import com.epmet.redis.MemoConcernRedis; +import com.epmet.service.MemoConcernService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 备忘录-人文关怀 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Service +public class MemoConcernServiceImpl extends BaseServiceImpl implements MemoConcernService { + + @Autowired + private MemoConcernRedis memoConcernRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, MemoConcernDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, MemoConcernDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public MemoConcernDTO get(String id) { + MemoConcernEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, MemoConcernDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(MemoConcernDTO dto) { + MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MemoConcernDTO dto) { + MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java new file mode 100755 index 0000000000..19ad10900c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.MemoDifficultyDao; +import com.epmet.dto.MemoDifficultyDTO; +import com.epmet.entity.MemoDifficultyEntity; +import com.epmet.redis.MemoDifficultyRedis; +import com.epmet.service.MemoDifficultyService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 备忘录-难点读点 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Service +public class MemoDifficultyServiceImpl extends BaseServiceImpl implements MemoDifficultyService { + + @Autowired + private MemoDifficultyRedis memoDifficultyRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, MemoDifficultyDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, MemoDifficultyDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public MemoDifficultyDTO get(String id) { + MemoDifficultyEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, MemoDifficultyDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(MemoDifficultyDTO dto) { + MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MemoDifficultyDTO dto) { + MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java new file mode 100755 index 0000000000..b6b69faa77 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.MemoWorkDiaryDao; +import com.epmet.dto.MemoWorkDiaryDTO; +import com.epmet.entity.MemoWorkDiaryEntity; +import com.epmet.redis.MemoWorkDiaryRedis; +import com.epmet.service.MemoWorkDiaryService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 备忘录-工作日志 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-03-14 + */ +@Service +public class MemoWorkDiaryServiceImpl extends BaseServiceImpl implements MemoWorkDiaryService { + + @Autowired + private MemoWorkDiaryRedis memoWorkDiaryRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, MemoWorkDiaryDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, MemoWorkDiaryDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public MemoWorkDiaryDTO get(String id) { + MemoWorkDiaryEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, MemoWorkDiaryDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(MemoWorkDiaryDTO dto) { + MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MemoWorkDiaryDTO dto) { + MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml new file mode 100755 index 0000000000..dd70ae5873 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml new file mode 100755 index 0000000000..c7e20bc994 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml new file mode 100755 index 0000000000..15605c8421 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml new file mode 100755 index 0000000000..634e73aa95 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml new file mode 100755 index 0000000000..13b6b48f69 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java index a25220cbfb..33aa03c9ab 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.info("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.info("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-home/resi-home-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-module/resi-voice/resi-voice-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java index 105501553f..a2de9963fa 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java +++ b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java index 5a43aa5038..2c5aee3369 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java @@ -86,11 +86,11 @@ public class NacosServiceListListenerRegisterer { serviceListView = namingService.getServicesOfServer(1, 100); //启动监听 if (serviceListView == null || serviceListView.getCount() == 0) { - log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); + // log.debug("【Nacos服务列表定时刷新】当前无任何可添加监听的服务"); return; } List serviceList = serviceListView.getData(); - log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); + // log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList); for (String service : serviceList) { try { From b53bc345e5fb99b29f669cdbef1aff7da6861825 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 15 Mar 2022 10:38:27 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/MemoAttachmentDTO.java | 104 ------------------ .../main/java/com/epmet/dto/MemoAttrDTO.java | 79 ------------- .../java/com/epmet/dto/MemoConcernDTO.java | 99 ----------------- .../java/com/epmet/dto/MemoDifficultyDTO.java | 79 ------------- .../java/com/epmet/dto/MemoWorkDiaryDTO.java | 69 ------------ .../controller/MemoAttachmentController.java | 72 ------------ .../epmet/controller/MemoAttrController.java | 72 ------------ .../controller/MemoConcernController.java | 72 ------------ .../controller/MemoDifficultyController.java | 72 ------------ .../controller/MemoWorkDiaryController.java | 72 ------------ .../java/com/epmet/dao/MemoAttachmentDao.java | 16 --- .../main/java/com/epmet/dao/MemoAttrDao.java | 16 --- .../java/com/epmet/dao/MemoConcernDao.java | 16 --- .../java/com/epmet/dao/MemoDifficultyDao.java | 16 --- .../java/com/epmet/dao/MemoWorkDiaryDao.java | 16 --- .../epmet/entity/MemoAttachmentEntity.java | 74 ------------- .../java/com/epmet/entity/MemoAttrEntity.java | 49 --------- .../com/epmet/entity/MemoConcernEntity.java | 69 ------------ .../epmet/entity/MemoDifficultyEntity.java | 49 --------- .../com/epmet/entity/MemoWorkDiaryEntity.java | 39 ------- .../com/epmet/redis/MemoAttachmentRedis.java | 30 ----- .../java/com/epmet/redis/MemoAttrRedis.java | 30 ----- .../com/epmet/redis/MemoConcernRedis.java | 30 ----- .../com/epmet/redis/MemoDifficultyRedis.java | 30 ----- .../com/epmet/redis/MemoWorkDiaryRedis.java | 30 ----- .../epmet/service/MemoAttachmentService.java | 78 ------------- .../com/epmet/service/MemoAttrService.java | 78 ------------- .../com/epmet/service/MemoConcernService.java | 78 ------------- .../epmet/service/MemoDifficultyService.java | 78 ------------- .../epmet/service/MemoWorkDiaryService.java | 78 ------------- .../impl/MemoAttachmentServiceImpl.java | 87 --------------- .../service/impl/MemoAttrServiceImpl.java | 87 --------------- .../service/impl/MemoConcernServiceImpl.java | 87 --------------- .../impl/MemoDifficultyServiceImpl.java | 87 --------------- .../impl/MemoWorkDiaryServiceImpl.java | 87 --------------- .../resources/mapper/MemoAttachmentDao.xml | 27 ----- .../src/main/resources/mapper/MemoAttrDao.xml | 22 ---- .../main/resources/mapper/MemoConcernDao.xml | 26 ----- .../resources/mapper/MemoDifficultyDao.xml | 22 ---- .../resources/mapper/MemoWorkDiaryDao.xml | 20 ---- 40 files changed, 2242 deletions(-) delete mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java delete mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java delete mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java delete mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java delete mode 100755 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml delete mode 100755 epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java deleted file mode 100755 index cf63017009..0000000000 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -public class MemoAttachmentDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * REMIND_MSG.ID - */ - private String remindMsgId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 附件名（uuid随机生成） - */ - private String attachmentName; - - /** - * 文件大小，单位b - */ - private Integer attachmentSize; - - /** - * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） - */ - private String attachmentFormat; - - /** - * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） - */ - private String attachmentType; - - /** - * 附件地址 - */ - private String attachmentUrl; - - /** - * 语音或视频时长,秒 - */ - private Integer duration; - - /** - * 排序字段 - */ - private Integer sort; - - /** - * 删除标记 0：未删除，1：已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java deleted file mode 100755 index 477c948619..0000000000 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttrDTO.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -public class MemoAttrDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 提醒时间 - */ - private Date remindTime; - - /** - * 阅读标记1 已读；0未读 - */ - private Integer readFlag; - - /** - * 业务类型 人员关怀：concern；难点堵点：difficulty；工作日志：work_diary - */ - private String type; - - /** - * 接收人ID - */ - private String receiver; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java deleted file mode 100755 index 23bdc67b96..0000000000 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -public class MemoConcernDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 关怀类型 - */ - private String concernType; - - /** - * 关怀对象 - */ - private String resiName; - - /** - * 关怀对象电话 - */ - private String phnoe; - - /** - * 关怀对象地址 - */ - private String address; - - /** - * 关怀事项 - */ - private String content; - - /** - * 计划执行时间 - */ - private Date scheduledTime; - - /** - * 实际执行时间 - */ - private Date actualTime; - - /** - * 状态 0未完成 1已完成 - */ - private Integer status; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 操作人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java deleted file mode 100755 index 6ed31a8d0c..0000000000 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -public class MemoDifficultyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 内容 - */ - private String content; - - /** - * 解决方式 - */ - private String resolveWay; - - /** - * 备注 - */ - private String remark; - - /** - * 计划执行时间 - */ - private Date scheduledTime; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java deleted file mode 100755 index 8009134c31..0000000000 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.epmet.dto; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -public class MemoWorkDiaryDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户ID - */ - private String customerId; - - /** - * 工作事项 - */ - private String workType; - - /** - * 内容 - */ - private String content; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private String delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java deleted file mode 100755 index fd86ab8bad..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttachmentController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.MemoAttachmentDTO; -import com.epmet.service.MemoAttachmentService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@RestController -@RequestMapping("memoAttachment") -public class MemoAttachmentController { - - @Autowired - private MemoAttachmentService memoAttachmentService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = memoAttachmentService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - MemoAttachmentDTO data = memoAttachmentService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody MemoAttachmentDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - memoAttachmentService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody MemoAttachmentDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - memoAttachmentService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - memoAttachmentService.delete(ids); - return new Result(); - } - - - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java deleted file mode 100755 index 9bb69d635c..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.MemoAttrDTO; -import com.epmet.service.MemoAttrService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@RestController -@RequestMapping("memoAttr") -public class MemoAttrController { - - @Autowired - private MemoAttrService memoAttrService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = memoAttrService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - MemoAttrDTO data = memoAttrService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody MemoAttrDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - memoAttrService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody MemoAttrDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - memoAttrService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - memoAttrService.delete(ids); - return new Result(); - } - - - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java deleted file mode 100755 index 2fe13a9ee9..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.MemoConcernDTO; -import com.epmet.service.MemoConcernService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@RestController -@RequestMapping("memoConcern") -public class MemoConcernController { - - @Autowired - private MemoConcernService memoConcernService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = memoConcernService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - MemoConcernDTO data = memoConcernService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody MemoConcernDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - memoConcernService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody MemoConcernDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - memoConcernService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - memoConcernService.delete(ids); - return new Result(); - } - - - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java deleted file mode 100755 index 6f30010371..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.MemoDifficultyDTO; -import com.epmet.service.MemoDifficultyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@RestController -@RequestMapping("memoDifficulty") -public class MemoDifficultyController { - - @Autowired - private MemoDifficultyService memoDifficultyService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = memoDifficultyService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - MemoDifficultyDTO data = memoDifficultyService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody MemoDifficultyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - memoDifficultyService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody MemoDifficultyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - memoDifficultyService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - memoDifficultyService.delete(ids); - return new Result(); - } - - - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java deleted file mode 100755 index 18de8f371a..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.MemoWorkDiaryDTO; -import com.epmet.service.MemoWorkDiaryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@RestController -@RequestMapping("memoWorkDiary") -public class MemoWorkDiaryController { - - @Autowired - private MemoWorkDiaryService memoWorkDiaryService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = memoWorkDiaryService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - MemoWorkDiaryDTO data = memoWorkDiaryService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody MemoWorkDiaryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - memoWorkDiaryService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody MemoWorkDiaryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - memoWorkDiaryService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - memoWorkDiaryService.delete(ids); - return new Result(); - } - - - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java deleted file mode 100755 index 52d7c6944e..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttachmentDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.MemoAttachmentEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Mapper -public interface MemoAttachmentDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java deleted file mode 100755 index 5ae7405a48..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.MemoAttrEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Mapper -public interface MemoAttrDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java deleted file mode 100755 index 7b829e2e62..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.MemoConcernEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Mapper -public interface MemoConcernDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java deleted file mode 100755 index f0961195ad..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.MemoDifficultyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Mapper -public interface MemoDifficultyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java deleted file mode 100755 index 95f2a8cb6f..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dao; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.MemoWorkDiaryEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Mapper -public interface MemoWorkDiaryDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java deleted file mode 100755 index 4044930f37..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("memo_attachment") -public class MemoAttachmentEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * REMIND_MSG.ID - */ - private String remindMsgId; - - /** - * 文件名 - */ - private String fileName; - - /** - * 附件名（uuid随机生成） - */ - private String attachmentName; - - /** - * 文件大小，单位b - */ - private Integer attachmentSize; - - /** - * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） - */ - private String attachmentFormat; - - /** - * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） - */ - private String attachmentType; - - /** - * 附件地址 - */ - private String attachmentUrl; - - /** - * 语音或视频时长,秒 - */ - private Integer duration; - - /** - * 排序字段 - */ - private Integer sort; - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java deleted file mode 100755 index 8c847f0234..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttrEntity.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("memo_attr") -public class MemoAttrEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 提醒时间 - */ - private Date remindTime; - - /** - * 阅读标记1 已读；0未读 - */ - private Integer readFlag; - - /** - * 业务类型 人员关怀：concern；难点堵点：difficulty；工作日志：work_diary - */ - private String type; - - /** - * 接收人ID - */ - private String receiver; - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java deleted file mode 100755 index 70267c0faa..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("memo_concern") -public class MemoConcernEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 关怀类型 - */ - private String concernType; - - /** - * 关怀对象 - */ - private String resiName; - - /** - * 关怀对象电话 - */ - private String phnoe; - - /** - * 关怀对象地址 - */ - private String address; - - /** - * 关怀事项 - */ - private String content; - - /** - * 计划执行时间 - */ - private Date scheduledTime; - - /** - * 实际执行时间 - */ - private Date actualTime; - - /** - * 状态 0未完成 1已完成 - */ - private Integer status; - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java deleted file mode 100755 index 29eb588f37..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("memo_difficulty") -public class MemoDifficultyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 内容 - */ - private String content; - - /** - * 解决方式 - */ - private String resolveWay; - - /** - * 备注 - */ - private String remark; - - /** - * 计划执行时间 - */ - private Date scheduledTime; - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java deleted file mode 100755 index 5542558072..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.epmet.entity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("memo_work_diary") -public class MemoWorkDiaryEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID - */ - private String customerId; - - /** - * 工作事项 - */ - private String workType; - - /** - * 内容 - */ - private String content; - -} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java deleted file mode 100755 index 526221fe17..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttachmentRedis.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Component -public class MemoAttachmentRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java deleted file mode 100755 index 7260fb81ad..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoAttrRedis.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Component -public class MemoAttrRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java deleted file mode 100755 index 01ffe5dd0a..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoConcernRedis.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Component -public class MemoConcernRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java deleted file mode 100755 index 819af138dc..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoDifficultyRedis.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Component -public class MemoDifficultyRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java deleted file mode 100755 index 2957e7f53b..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/redis/MemoWorkDiaryRedis.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.epmet.redis; - -import com.epmet.commons.tools.redis.RedisUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Component -public class MemoWorkDiaryRedis { - @Autowired - private RedisUtils redisUtils; - - public void delete(Object[] ids) { - - } - - public void set(){ - - } - - public String get(String id){ - return null; - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java deleted file mode 100755 index f1754031eb..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.MemoAttachmentDTO; -import com.epmet.entity.MemoAttachmentEntity; - -import java.util.List; -import java.util.Map; - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -public interface MemoAttachmentService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-03-14 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-03-14 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return MemoAttachmentDTO - * @author generator - * @date 2022-03-14 - */ - MemoAttachmentDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void save(MemoAttachmentDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void update(MemoAttachmentDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-03-14 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java deleted file mode 100755 index bbcd55100f..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.MemoAttrDTO; -import com.epmet.entity.MemoAttrEntity; - -import java.util.List; -import java.util.Map; - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -public interface MemoAttrService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-03-14 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-03-14 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return MemoAttrDTO - * @author generator - * @date 2022-03-14 - */ - MemoAttrDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void save(MemoAttrDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void update(MemoAttrDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-03-14 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java deleted file mode 100755 index f74dd1b555..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.MemoConcernDTO; -import com.epmet.entity.MemoConcernEntity; - -import java.util.List; -import java.util.Map; - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -public interface MemoConcernService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-03-14 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-03-14 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return MemoConcernDTO - * @author generator - * @date 2022-03-14 - */ - MemoConcernDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void save(MemoConcernDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void update(MemoConcernDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-03-14 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java deleted file mode 100755 index bf5f91cc01..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.MemoDifficultyDTO; -import com.epmet.entity.MemoDifficultyEntity; - -import java.util.List; -import java.util.Map; - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -public interface MemoDifficultyService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-03-14 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-03-14 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return MemoDifficultyDTO - * @author generator - * @date 2022-03-14 - */ - MemoDifficultyDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void save(MemoDifficultyDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void update(MemoDifficultyDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-03-14 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java deleted file mode 100755 index 47d16dc6e7..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.MemoWorkDiaryDTO; -import com.epmet.entity.MemoWorkDiaryEntity; - -import java.util.List; -import java.util.Map; - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -public interface MemoWorkDiaryService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-03-14 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-03-14 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return MemoWorkDiaryDTO - * @author generator - * @date 2022-03-14 - */ - MemoWorkDiaryDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void save(MemoWorkDiaryDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-03-14 - */ - void update(MemoWorkDiaryDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-03-14 - */ - void delete(String[] ids); -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java deleted file mode 100755 index 49483be635..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.MemoAttachmentDao; -import com.epmet.dto.MemoAttachmentDTO; -import com.epmet.entity.MemoAttachmentEntity; -import com.epmet.redis.MemoAttachmentRedis; -import com.epmet.service.MemoAttachmentService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 备忘录-附件表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Service -public class MemoAttachmentServiceImpl extends BaseServiceImpl implements MemoAttachmentService { - - @Autowired - private MemoAttachmentRedis memoAttachmentRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, MemoAttachmentDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, MemoAttachmentDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public MemoAttachmentDTO get(String id) { - MemoAttachmentEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, MemoAttachmentDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(MemoAttachmentDTO dto) { - MemoAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttachmentEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MemoAttachmentDTO dto) { - MemoAttachmentEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttachmentEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java deleted file mode 100755 index 1fc2bd4be2..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.MemoAttrDao; -import com.epmet.dto.MemoAttrDTO; -import com.epmet.entity.MemoAttrEntity; -import com.epmet.redis.MemoAttrRedis; -import com.epmet.service.MemoAttrService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 备忘录-属性表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Service -public class MemoAttrServiceImpl extends BaseServiceImpl implements MemoAttrService { - - @Autowired - private MemoAttrRedis memoAttrRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, MemoAttrDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, MemoAttrDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public MemoAttrDTO get(String id) { - MemoAttrEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, MemoAttrDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(MemoAttrDTO dto) { - MemoAttrEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttrEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MemoAttrDTO dto) { - MemoAttrEntity entity = ConvertUtils.sourceToTarget(dto, MemoAttrEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java deleted file mode 100755 index 6f9f691d7d..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoConcernServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.MemoConcernDao; -import com.epmet.dto.MemoConcernDTO; -import com.epmet.entity.MemoConcernEntity; -import com.epmet.redis.MemoConcernRedis; -import com.epmet.service.MemoConcernService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 备忘录-人文关怀 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Service -public class MemoConcernServiceImpl extends BaseServiceImpl implements MemoConcernService { - - @Autowired - private MemoConcernRedis memoConcernRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, MemoConcernDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, MemoConcernDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public MemoConcernDTO get(String id) { - MemoConcernEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, MemoConcernDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(MemoConcernDTO dto) { - MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MemoConcernDTO dto) { - MemoConcernEntity entity = ConvertUtils.sourceToTarget(dto, MemoConcernEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java deleted file mode 100755 index 19ad10900c..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoDifficultyServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.MemoDifficultyDao; -import com.epmet.dto.MemoDifficultyDTO; -import com.epmet.entity.MemoDifficultyEntity; -import com.epmet.redis.MemoDifficultyRedis; -import com.epmet.service.MemoDifficultyService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 备忘录-难点读点 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Service -public class MemoDifficultyServiceImpl extends BaseServiceImpl implements MemoDifficultyService { - - @Autowired - private MemoDifficultyRedis memoDifficultyRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, MemoDifficultyDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, MemoDifficultyDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public MemoDifficultyDTO get(String id) { - MemoDifficultyEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, MemoDifficultyDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(MemoDifficultyDTO dto) { - MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MemoDifficultyDTO dto) { - MemoDifficultyEntity entity = ConvertUtils.sourceToTarget(dto, MemoDifficultyEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java deleted file mode 100755 index b6b69faa77..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoWorkDiaryServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.epmet.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.dao.MemoWorkDiaryDao; -import com.epmet.dto.MemoWorkDiaryDTO; -import com.epmet.entity.MemoWorkDiaryEntity; -import com.epmet.redis.MemoWorkDiaryRedis; -import com.epmet.service.MemoWorkDiaryService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 备忘录-工作日志 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-03-14 - */ -@Service -public class MemoWorkDiaryServiceImpl extends BaseServiceImpl implements MemoWorkDiaryService { - - @Autowired - private MemoWorkDiaryRedis memoWorkDiaryRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, MemoWorkDiaryDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, MemoWorkDiaryDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public MemoWorkDiaryDTO get(String id) { - MemoWorkDiaryEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, MemoWorkDiaryDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(MemoWorkDiaryDTO dto) { - MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(MemoWorkDiaryDTO dto) { - MemoWorkDiaryEntity entity = ConvertUtils.sourceToTarget(dto, MemoWorkDiaryEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml deleted file mode 100755 index dd70ae5873..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttachmentDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml deleted file mode 100755 index c7e20bc994..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoAttrDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml deleted file mode 100755 index 15605c8421..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoConcernDao.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml deleted file mode 100755 index 634e73aa95..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoDifficultyDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml deleted file mode 100755 index 13b6b48f69..0000000000 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/MemoWorkDiaryDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 804d752ced2ec91c863d3293761d463a500542ed Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 11:04:54 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8B=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 6 ++++++ .../src/main/resources/bootstrap.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index b159668ec9..238a67cf6a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -97,6 +97,12 @@ mybatis-plus: feign: hystrix: enabled: true + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 800 client: config: default: diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 284526ad4d..40a7b5d659 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -103,7 +103,7 @@ feign: coreSize: 20 maximumSize: 50 maxQueueSize: 500 - queueSizeRejectionThreshold: 8000 + queueSizeRejectionThreshold: 800 client: config: default: From 523951d470bef714d3dcf098c0481b26d183f554 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 14:41:24 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9hystrix=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 6 ------ .../src/main/resources/bootstrap.yml | 7 ++++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index 238a67cf6a..b159668ec9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -97,12 +97,6 @@ mybatis-plus: feign: hystrix: enabled: true - threadpool: - default: - coreSize: 20 - maximumSize: 50 - maxQueueSize: 500 - queueSizeRejectionThreshold: 800 client: config: default: diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 40a7b5d659..6118195219 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -108,7 +108,6 @@ feign: config: default: loggerLevel: BASIC - okhttp: enabled: true hystrix: @@ -118,6 +117,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 800 ribbon: ReadTimeout: 300000 From 0012cbbb930e71d23a8ebd309b82c5c59a4a993f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 16:08:47 +0800 Subject: [PATCH 05/24] =?UTF-8?q?customer=5Fgrid=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0abandon=5Fflag=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.13__abandon_grid.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql new file mode 100644 index 0000000000..1822215609 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql @@ -0,0 +1,3 @@ +alter table customer_grid +add column ABANDON_FLAG TINYINT(1) default '0' +comment '弃用：1；正常使用：0' after SYNC_FLAG; \ No newline at end of file From a24c07fe4cca9d72360c3fd2a33967304c10822e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 16:16:32 +0800 Subject: [PATCH 06/24] =?UTF-8?q?/resi/mine/mygrid/allgridsg=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=AB=AF=E7=94=A8=E6=88=B7=E8=AE=BF=E9=97=AE=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E7=BD=91=E6=A0=BC=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 357c8cebdc..535fa0d3f0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -338,6 +338,7 @@ WHERE cg.del_flag = '0' AND ca.del_flag = '0' AND cg.SYNC_FLAG='1' + and cg.ABANDON_FLAG='0' AND cg.id IN #{id} From 27110a1bb24b319453bd40435723f19ae1dd7223 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 16:29:33 +0800 Subject: [PATCH 07/24] =?UTF-8?q?/resi/guide/stranger/marketcontactinfo?= =?UTF-8?q?=E5=8E=BB=E5=85=B6=E4=BB=96=E7=BD=91=E6=A0=BC=E7=9C=8B=E7=9C=8B?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0ABANDON=5FFLAG=3D'0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 535fa0d3f0..d5fed50249 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -458,6 +458,7 @@ WHERE grid.del_flag = 0 and grid.SYNC_FLAG='1' + and grid.ABANDON_FLAG='0' AND grid.area_code LIKE CONCAT(#{areaCode},'%') @@ -498,6 +499,7 @@ WHERE a.del_flag = 0 and a.SYNC_FLAG='1' + and a.ABANDON_FLAG='0' AND a.customer_id = #{customerId} ) AS c ORDER BY CONVERT ( gridName USING gbk ) ASC From b1bb631860c31e147e564cc1cc7d5322350348fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 16:37:06 +0800 Subject: [PATCH 08/24] =?UTF-8?q?resi/guide/stranger/publiclocationgridlis?= =?UTF-8?q?t=E9=99=8C=E7=94=9F=E4=BA=BA=E9=80=89=E6=8B=A9=E7=BD=91?= =?UTF-8?q?=E6=A0=BC+=E5=8E=BB=E5=85=B6=E4=BB=96=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E7=9C=8B=E7=9C=8B=EF=BC=8C=E6=B7=BB=E5=8A=A0ABANDON=5FFLAG=3D'?= =?UTF-8?q?0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/StrangerResiGuideController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java index d2e021b4d0..1ffeff276d 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java +++ b/epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java @@ -131,7 +131,7 @@ public class StrangerResiGuideController { /** * @param * @Author sun - * @Description 单客户-陌生访客根据自动定位获取附近网格数据 + * @Description 单客户-陌生访客根据自动定位获取附近网格数据 陌生人选网格+去其他网格看看 **/ @PostMapping("publiclocationgridlist") Result> publicLocationGridList(@RequestBody PublicCustomerGridListFormDTO formDTO){ From 2e7e9dc04a4b1d54f78b2fdf4fcd03e479c1cd20 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Mar 2022 17:00:48 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=85=9A=E5=91=98?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=EF=BC=8C=E5=AD=98=E5=9C=A8=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E8=A1=A8=E5=86=B3=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovIssueOpenFeignClient.java | 9 +++++++ .../GovIssueOpenFeignClientFallBack.java | 5 ++++ .../com/epmet/controller/IssueController.java | 11 +++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 16 +++++++++++++ .../java/com/epmet/service/IssueService.java | 8 +++++++ .../epmet/service/impl/IssueServiceImpl.java | 21 ++++++++++++++++ .../src/main/resources/mapper/IssueDao.xml | 19 +++++++++++++++ .../feign/ResiPartyMemberOpenFeignClient.java | 9 +++++++ ...esiPartyMemberOpenFeignClientFallback.java | 5 ++++ .../PartymemberConfirmManualController.java | 11 +++++++++ .../dao/PartymemberConfirmManualDao.java | 11 ++++++++- .../PartymemberConfirmManualService.java | 8 +++++++ .../PartymemberConfirmManualServiceImpl.java | 16 +++++++++++++ .../PartymemberConfirmManualDao.xml | 24 +++++++------------ 14 files changed, 157 insertions(+), 16 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java index 5ebed6c49e..da23d0701f 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java @@ -376,4 +376,13 @@ public interface GovIssueOpenFeignClient { */ @PostMapping("/gov/issue/issueprojectcategorydict/categoryMap/{customerId}") Result> getCategoryMap(@PathVariable("customerId") String customerId); + + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @PostMapping("audit-reset") + Result issueAuditReset(@RequestParam("gridId")String gridId); } diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java index ae87c2cd6b..20b827a9ad 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java @@ -319,4 +319,9 @@ public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient public Result> getCategoryMap(String customerId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId); } + + @Override + public Result issueAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java index 55f1348b44..ec49c3bb81 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java @@ -322,5 +322,16 @@ public class IssueController { return new Result>().ok(issueService.getProjectCountByGrid(formDTO)); } + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @PostMapping("audit-reset") + public Result issueAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(issueService.issueAuditReset(gridId)); + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index 0a82cb5530..1c5ae213ee 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -292,4 +292,20 @@ public interface IssueDao extends BaseDao { List selectCategoryNameByIssueList(List issueIds,@Param("customerId")String customerId); + /** + * Desc: 查询网格中表决中的议题个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:44 下午 + */ + Integer selectVotingIssue(@Param("gridId")String gridId); + + /** + * Desc: 查询网格中审核中的议题个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:44 下午 + */ + Integer selectAuditIssue(@Param("gridId")String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java index 01e16471da..1c8bd6c376 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java @@ -378,4 +378,12 @@ public interface IssueService extends BaseService { */ List getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO); + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + Boolean issueAuditReset(String gridId); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 70e8528491..fd4f54a866 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1744,5 +1744,26 @@ public class IssueServiceImpl extends BaseServiceImpl imp return result; } + /** + * Desc: 查询网格下是否存在审核中的，表决中的议题 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:40 下午 + */ + @Override + public Boolean issueAuditReset(String gridId) { + // 表决中的议题个数 + Integer votingCount = baseDao.selectVotingIssue(gridId); + if (votingCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + // 审核中的议题个数 + Integer auditCount = baseDao.selectAuditIssue(gridId); + if (auditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + return false; + } + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index 3273fb243e..361e368d9f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -750,4 +750,23 @@ LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = #{customerId}) + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 0f320cf9be..a0321d2ffc 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -105,4 +105,13 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping(value = "/resi/partymember/partymemberinfo/getpartymemberinfobycustomerid") Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId); + /** + * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:19 下午 + */ + @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset") + Result partyMemberAuditReset(@RequestParam("gridId")String gridId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 953d5ca326..f26daa7faf 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -69,4 +69,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> getPartyMemberInfoByCustomerId(String customerId) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyMemberInfoByCustomerId", customerId); } + + @Override + public Result partyMemberAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java index e776590957..e429743d52 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java @@ -91,4 +91,15 @@ public class PartymemberConfirmManualController { ExcelUtils.exportExcelToTarget(response, null, list, PartymemberConfirmManualExcel.class); } + /** + * Desc: 查询网格下是否存在党员审核 true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 4:19 下午 + */ + @PostMapping("audit-reset") + public Result partyMemberAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId)); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java index 4834e28601..badef14208 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java @@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据 @@ -29,5 +30,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PartymemberConfirmManualDao extends BaseDao { - + + /** + * Desc: 查询网格下存在党员审核个数 + * @param gridId + * @author zxc + * @date 2022/3/15 4:24 下午 + */ + Integer partyMemberAuditReset(@Param("gridId")String gridId); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java index d3e02c1df2..76e4e612c0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmManualService.java @@ -100,4 +100,12 @@ public interface PartymemberConfirmManualService extends BaseService - - - - - - - - - - - - - - - + + \ No newline at end of file From 60eb478f57668e1e7b8c4430a3d7d1103ca8a86e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 17:11:16 +0800 Subject: [PATCH 10/24] =?UTF-8?q?/gov/voice/article/agencygridlist=20?= =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3=E5=8F=AF=E9=80=89=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 2 ++ .../src/main/resources/mapper/CustomerGridDao.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index db8174b51d..209d684745 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -728,6 +728,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); returnDTO.setGridList(gridList); //递归查询当前组织的下级组织以及每个下级组织对应的网格列表 @@ -762,6 +763,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = baseDao.selectAllSubAgency(subAgencyPids); if (subAgencyList.size() > NumConstant.ZERO) { for (ArticleGridResultDTO sub : subAgencyList) { + //未隐藏的网格 List gridList = customerGridDao.selectAgencyGridList(sub.getAgencyId()); sub.setGridList(gridList); List subAgency = getGridList(sub.getPids() + ":" + sub.getAgencyId()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index d5fed50249..1bd13058c8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -408,6 +408,7 @@ grid_name AS "gridName" FROM customer_grid WHERE del_flag = '0' + and ABANDON_FLAG='0' AND pid = #{agencyId} @@ -429,6 +430,7 @@ WHERE cg.del_flag = '0' AND ca.del_flag = '0' + and cg.ABANDON_FLAG='0' AND cg.pid = #{agencyId} From c6c4a896fb5b7721d647bbd5216dce8f063c3100 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 17:18:21 +0800 Subject: [PATCH 11/24] =?UTF-8?q?/article/publishagencylist=20=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E5=A3=B0=E9=9F=B3=E5=8F=AF=E9=80=89=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 209d684745..31bb56ca18 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -828,11 +828,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId()); returnDTO.setAgencyDeptList(agencyDeptList); //当前机关下网格列表 + // 未隐藏的网格 List agencyGridList = customerGridDao.selectAgencyGridMsgList(agencyEntity.getId()); returnDTO.setAgencyGridList(agencyGridList); } else if (gridParty) { //4.2:查询人员在当前机关下参与的网格列表 //查询当前组织下的网格列表 + //未隐藏的网格 List gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); //查询该工作人员在该客户下参与的网格列表 CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO(); From 334230fa31080caf471a035e7cbb5ee7e0a0a4bc Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 17:18:25 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=20=E6=B7=BB=E5=8A=A0=E5=BC=83=E7=94=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/common/bean/GridInfoCache.java | 5 +++ .../service/impl/ResiMineGridServiceImpl.java | 38 ++++++++++++++++--- .../epmet/dto/form/LatestGridInfoFormDTO.java | 5 +++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 +- .../EpmetUserOpenFeignClientFallback.java | 2 +- .../controller/GridLatestController.java | 4 +- .../java/com/epmet/dao/GridLatestDao.java | 2 +- .../com/epmet/service/GridLatestService.java | 2 +- .../service/impl/GridLatestServiceImpl.java | 3 +- .../main/resources/mapper/GridLatestDao.xml | 2 +- 10 files changed, 50 insertions(+), 16 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java index cf90afee5b..63114e5794 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java @@ -113,4 +113,9 @@ public class GridInfoCache implements Serializable { * 坐标区域 */ private String coordinates; + + /** + * 弃用标记 + */ + private Integer abandonFlag; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index de5e28a457..f77f59e033 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; @@ -116,26 +118,50 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { JSONObject toResult = JSON.parseObject(data); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); if (null != toResult.get("code")) { - mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + mapToResult.setCode((Integer) toResult.get("code")); } if (!mapToResult.success()) { logger.error(String.format("根据appId查询客户信息失败，对应appId->" + formDTO.getAppId())); throw new RenException(mapToResult.getMsg()); } - Object PublicCustomerResultDTO = mapToResult.getData(); - JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); - Map map = (Map) json.get("customer"); + Object publicCustomerResultDTO = mapToResult.getData(); + JSONObject json = JSON.parseObject(publicCustomerResultDTO.toString()); + Map map = (Map) json.get("customer"); PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); //2.调用epmet-user服务，根据客户Id和用户Id查询最后一次访问记录 + LatestGridInfoResultDTO result = null; formDTO.setCustomerId(customer.getId()); - Result userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO); + Result> userResult = epmetUserOpenFeignClient.latestGridList(formDTO); if (!userResult.success()) { logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult))); + return result; } - return userResult.getData(); + for (LatestGridInfoResultDTO girdInfo : userResult.getData()) { + try { + GridInfoCache grid = CustomerOrgRedis.getGridInfo(girdInfo.getGridId()); + if (grid == null) { + logger.warn("latestGridInfo get gridInfo return null,gridId:{}", girdInfo.getGridId()); + continue; + } else { + Integer abandonFlag = grid.getAbandonFlag(); + if (NumConstant.ONE == abandonFlag) { + logger.warn("latestGridInfo gridId:{} has abandoned", girdInfo.getGridId()); + continue; + } else { + result = girdInfo; + //匹配到了未弃用的网格 跳出 + break; + } + } + } catch (Exception e) { + logger.warn("latestGridInfo get gridInfo exception,gridId:{}", girdInfo.getGridId()); + } + } + + return result; } /** diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java index 3df970fc0c..7f32733eb8 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/LatestGridInfoFormDTO.java @@ -35,4 +35,9 @@ public class LatestGridInfoFormDTO implements Serializable { */ private String userId; + /** + * 前n个 默认10 + */ + private Integer top = 10; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 415f818abe..849850e01a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1,7 +1,6 @@ package com.epmet.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; @@ -260,7 +259,7 @@ public interface EpmetUserOpenFeignClient { * @Date 2020/8/3 **/ @PostMapping(value = "epmetuser/gridlatest/latestgridinfo") - Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); + Result> latestGridList(@RequestBody LatestGridInfoFormDTO formDTO); /** * @Description 查询工作人员的信息 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 0f9f38ea5c..f614e8ea46 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -180,7 +180,7 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien } @Override - public Result latestGridInfo(LatestGridInfoFormDTO formDTO) { + public Result> latestGridList(LatestGridInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "latestGridInfo", formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index c470d793a9..f1faa9a29a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java @@ -139,8 +139,8 @@ public class GridLatestController { * @Date 2020/8/3 **/ @PostMapping("latestgridinfo") - public Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ - return new Result().ok(gridLatestService.latestGridInfo(formDTO)); + public Result> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ + return new Result>().ok(gridLatestService.latestGridInfo(formDTO)); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java index 979ac85a5f..7e28dc8154 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/GridLatestDao.java @@ -73,5 +73,5 @@ public interface GridLatestDao extends BaseDao { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - LatestGridInfoResultDTO selectLatestGridInfo(LatestGridInfoFormDTO formDTO); + List selectLatestGridInfo(LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java index e9ff239d1e..4716ff8bcd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/GridLatestService.java @@ -139,5 +139,5 @@ public interface GridLatestService extends BaseService { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - LatestGridInfoResultDTO latestGridInfo(LatestGridInfoFormDTO formDTO); + List latestGridInfo(LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index 58f9383078..ad2f79f266 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -36,7 +36,6 @@ import com.epmet.dto.result.CustomerUser4PointResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.GridLatestEntity; -import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.redis.UserBaseInfoRedis; import com.epmet.service.GridLatestService; import com.epmet.util.ModuleConstant; @@ -205,7 +204,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl latestGridInfo(LatestGridInfoFormDTO formDTO) { return baseDao.selectLatestGridInfo(formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml index 59f1be1af7..b06b1a8069 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GridLatestDao.xml @@ -109,6 +109,6 @@ AND gl.CUSTOMER_USER_ID = #{userId} ORDER BY gl.LATEST_TIME DESC - LIMIT 1 + LIMIT #{top} From 16397c6198e8d1e57188a6b23c15aed97b9263f3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 15 Mar 2022 17:25:07 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=AD=20=E5=8A=A0=E5=85=A5=E5=BC=83?= =?UTF-8?q?=E7=94=A8=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 1bd13058c8..ff6ef61026 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -175,6 +175,7 @@ WHERE cg.del_flag = '0' AND csg.del_flag = '0' + AND cg.ABANDON_FLAG='0' AND csg.user_id = #{userId} ORDER BY cg.GRID_NAME ASC From 1622660bb0b766a8b25602694fd4f31b08d2fa31 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 17:30:29 +0800 Subject: [PATCH 14/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC/gov/?= =?UTF-8?q?project/trace/departmentstafflist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 1 + .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 31bb56ca18..07bfa4eaf0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -250,6 +250,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl gridList = customerGridDao.selectGridList(canTick.getAgencyId()); List gridStaffs = new ArrayList<>(); if (null != gridList && gridList.size() > NumConstant.ZERO) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 1bd13058c8..2e8fdb58bf 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -372,6 +372,7 @@ grid_name AS "gridName" FROM customer_grid WHERE del_flag = '0' + and ABANDON_FLAG='0' AND pid = #{agencyId} ORDER BY created_time DESC From d07c40289bf769c1e111999d22284f288376337b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 17:36:05 +0800 Subject: [PATCH 15/24] =?UTF-8?q?/gov/org/grid/gridlist=E5=B9=B3=E9=98=B4?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95-=E7=BD=91=E6=A0=BC=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerGridDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index e43632a140..05895fd04c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -289,6 +289,7 @@ CUSTOMER_GRID WHERE DEL_FLAG = '0' + and ABANDON_FLAG='0' AND PID = #{agencyId} @@ -308,6 +309,7 @@ CUSTOMER_GRID DEL_FLAG = '0' + AND ABANDON_FLAG='0' AND PID = #{agencyId} ORDER BY CREATED_TIME DESC From 960bd501db35329edd29e6755ad84769a43a2a72 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 15 Mar 2022 17:43:36 +0800 Subject: [PATCH 16/24] =?UTF-8?q?/gov/mine/agency/getmygrids=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E8=8E=B7=E5=8F=96=E6=88=91=E7=9A=84=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/CustomerGridDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index 05895fd04c..e805ace544 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -174,6 +174,7 @@ INNER JOIN customer_staff_grid csg ON cg.id = csg.grid_id WHERE cg.del_flag = '0' + AND cg.ABANDON_FLAG='0' AND csg.del_flag = '0' AND cg.ABANDON_FLAG='0' AND csg.user_id = #{userId} From b6bf05b02b42970bd9c09b17d63b3403dc8fa7ce Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Mar 2022 17:48:03 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/ProjectController.java | 11 +++++++++++ .../src/main/java/com/epmet/dao/ProjectDao.java | 9 +++++++++ .../java/com/epmet/service/ProjectService.java | 9 +++++++++ .../epmet/service/impl/ProjectServiceImpl.java | 15 +++++++++++++++ .../src/main/resources/mapper/ProjectDao.xml | 10 ++++++++++ 5 files changed, 54 insertions(+) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 077b06e22d..7aa1ae7501 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -325,4 +325,15 @@ public class ProjectController { projectService.projectWorkMinutesJob(dto); return new Result(); } + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + @PostMapping("audit-reset") + public Result eventAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(projectService.eventAuditReset(gridId)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index b5a3e5107e..650d598e1b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -283,4 +283,13 @@ public interface ProjectDao extends BaseDao { * @Date 2022/1/12 17:05 */ List getProjectListForWorkMinutes(@Param("customerId")String customerId, @Param("projectId")String projectId, @Param("status")String status); + + /** + * Desc: 查询网格下群众直报处理中的个数 + * @param gridId + * @author zxc + * @date 2022/3/15 5:09 下午 + */ + Integer selectEventStatus(@Param("gridId") String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 4757113bc7..139fba06c8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -376,4 +376,13 @@ public interface ProjectService extends BaseService { * @Date 2022/1/4 16:27 */ PageData approvaledList(ApprovaledListFromDTO formDTO); + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + Boolean eventAuditReset(String gridId); + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6a591d9e8d..336095f215 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3134,6 +3134,21 @@ public class ProjectServiceImpl extends BaseServiceImpl + + + \ No newline at end of file From 453d8d3de29c7a4c1e425eb6e65c9f3828cb5c43 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Mar 2022 19:56:41 +0800 Subject: [PATCH 18/24] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E5=A4=84=E7=90=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=BE=A4=E4=BC=97=E7=9B=B4=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovProjectOpenFeignClient.java | 14 ++++++++++---- .../GovProjectOpenFeignClientFallback.java | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 9f58bbb306..6fcfe0827c 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -9,10 +9,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.GovProjectOpenFeignClientFallbackFactory; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -152,4 +149,13 @@ public interface GovProjectOpenFeignClient { **/ @PostMapping("gov/project/resievent/autoAudit") Result autoAudit(); + + /** + * Desc: 查询群众直报是否存在处理中的，true：存在，false：不存在 + * @param gridId + * @author zxc + * @date 2022/3/15 5:05 下午 + */ + @PostMapping("audit-reset") + Result eventAuditReset(@RequestParam("gridId")String gridId); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 58da1494d8..e3b6e51677 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -154,4 +154,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result autoAudit() { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "autoAudit"); } + + @Override + public Result eventAuditReset(String gridId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "eventAuditReset",gridId); + } } From d2c61a77cabf1e0964a288df381f37d26c4956f9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 15 Mar 2022 20:13:28 +0800 Subject: [PATCH 19/24] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/WarnAndPartyAuditResultDTO.java | 31 +++++++++++++++++++ .../feign/ResiPartyMemberOpenFeignClient.java | 3 +- ...esiPartyMemberOpenFeignClientFallback.java | 3 +- .../PartymemberConfirmManualController.java | 5 +-- .../dao/PartymemberConfirmManualDao.java | 8 +++++ .../PartymemberConfirmManualService.java | 3 +- .../PartymemberConfirmManualServiceImpl.java | 14 +++++++-- .../PartymemberConfirmManualDao.xml | 10 ++++++ 8 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java new file mode 100644 index 0000000000..1b900df696 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/WarnAndPartyAuditResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/3/15 8:00 下午 + * @DESC + */ +@Data +public class WarnAndPartyAuditResultDTO implements Serializable { + + private static final long serialVersionUID = 6971169159679812283L; + + /** + * 是否存在党员审核 + */ + private Boolean partyMemberStatus; + + /** + * 是否存在热心居民审核 + */ + private Boolean warnStatus; + + public WarnAndPartyAuditResultDTO() { + this.partyMemberStatus = false; + this.warnStatus = false; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index a0321d2ffc..debdc9afea 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback; import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -112,6 +113,6 @@ public interface ResiPartyMemberOpenFeignClient { * @date 2022/3/15 4:19 下午 */ @PostMapping("/resi/partymember/partymemberconfirmmanual/audit-reset") - Result partyMemberAuditReset(@RequestParam("gridId")String gridId); + Result partyMemberAuditReset(@RequestParam("gridId")String gridId); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index f26daa7faf..f7fe137a60 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partymember.form.DelPartyMemberBaseInfoFor import com.epmet.resi.partymember.dto.partymember.form.PartyMemberBaseInfoAddFormDTO; import com.epmet.resi.partymember.dto.partymember.result.PartyMemberBaseInfoDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.PartymemberBaseInfoResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import org.springframework.stereotype.Component; @@ -71,7 +72,7 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp } @Override - public Result partyMemberAuditReset(String gridId) { + public Result partyMemberAuditReset(String gridId) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberAuditReset", gridId); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java index e429743d52..ec0ae2d39c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberConfirmManualController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partymember.excel.PartymemberConfirmManualExcel; import com.epmet.modules.partymember.service.PartymemberConfirmManualService; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -98,8 +99,8 @@ public class PartymemberConfirmManualController { * @date 2022/3/15 4:19 下午 */ @PostMapping("audit-reset") - public Result partyMemberAuditReset(@RequestParam("gridId")String gridId){ - return new Result().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId)); + public Result partyMemberAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(partymemberConfirmManualService.partyMemberAuditReset(gridId)); } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java index badef14208..e3154645cf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberConfirmManualDao.java @@ -39,4 +39,12 @@ public interface PartymemberConfirmManualDao extends BaseDao + + + \ No newline at end of file From c45778bbf33ab1494157a612f3dbf17c2513e19b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 16 Mar 2022 08:52:37 +0800 Subject: [PATCH 20/24] =?UTF-8?q?grid/abandon=E5=BC=83=E7=94=A8=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/CustomerGridDTO.java | 4 + .../epmet/dto/form/AbandonGridFormDTO.java | 14 +++ .../epmet/dto/result/AbandonGridResDTO.java | 25 ++++++ epmet-module/gov-org/gov-org-server/pom.xml | 6 ++ .../com/epmet/controller/GridController.java | 12 +++ .../com/epmet/entity/CustomerGridEntity.java | 5 ++ .../epmet/service/CustomerGridService.java | 7 ++ .../service/impl/CustomerGridServiceImpl.java | 85 +++++++++++++++++-- 8 files changed, 152 insertions(+), 6 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 7acfd64627..78fecfca6d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -151,4 +151,8 @@ public class CustomerGridDTO implements Serializable { * 联系电话 */ private String mobile; + /** + * 弃用：1；正常使用：0 + */ + private Boolean abandonFlag; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java new file mode 100644 index 0000000000..1d1aca23e1 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java @@ -0,0 +1,14 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Data +public class AbandonGridFormDTO implements Serializable { + @NotBlank(message = "网格id不能为空",groups = AddGroup.class) + private String gridId; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java new file mode 100644 index 0000000000..5ded7f55e2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.result; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 废弃网格，前置条件查询返参 + */ +@AllArgsConstructor +@Data +public class AbandonGridResDTO implements Serializable { + + /** + * true:可以弃用，false:不可以弃用 + */ + private Boolean abandonFlag; + + /** + * 待办事项 + */ + private List toDoList; +} diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 777645a3c1..0331f95ce7 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -136,6 +136,12 @@ 3.0.3 compile + + com.epmet + gov-issue-client + 2.0.0 + compile + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index f7c4d8ec10..affc36fe0e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -226,4 +227,15 @@ public class GridController { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(customerGridService.getGridTree(formDTO)); } + + /** + * 弃用网格 + * @param formDTO + * @return + */ + @PostMapping("abandon") + public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result().ok(customerGridService.abandonGrid(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java index d6018c2a29..379d916654 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java @@ -109,4 +109,9 @@ public class CustomerGridEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + /** + * 弃用：1；正常使用：0 + */ + private Boolean abandonFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index cac10ea123..dea04e9f16 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -374,4 +374,11 @@ public interface CustomerGridService extends BaseService { * @date 2022/1/17 3:50 下午 */ List getStaffGridList(String customerId, String orgId, String orgType); + + /** + * 弃用网格，前置条件查询 + * @param formDTO + * @return + */ + AbandonGridResDTO abandonGrid(AbandonGridFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index cd0080f548..512e050c80 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -20,6 +20,7 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -28,6 +29,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; @@ -43,10 +45,9 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetMessageOpenFeignClient; -import com.epmet.feign.EpmetUserFeignClient; -import com.epmet.feign.OperCrmOpenFeignClient; +import com.epmet.feign.*; +import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; import com.epmet.util.ModuleConstant; @@ -88,10 +89,21 @@ public class CustomerGridServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -945,4 +957,65 @@ public class CustomerGridServiceImpl extends BaseServiceImpl partyMem = resiPartyMemberOpenFeignClient.partyMemberAuditReset(formDTO.getGridId()); + if (!partyMem.success() || null == partyMem.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "partyMemberAuditReset failed", "数据校验异常"); + } + //未处理的事件 + Result eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); + if (!eventRes.success() || null == eventRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "eventAuditReset failed", "数据校验异常"); + } + //表决中的议题 + Result issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId()); + if (!issueAuditReset.success() || null == issueAuditReset.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "issueAuditReset failed", "数据校验异常"); + } + //徽章???? + AbandonGridResDTO result=new AbandonGridResDTO(true,new ArrayList<>()); + if(partyMem.getData().getPartyMemberStatus()){ + result.setAbandonFlag(false); + result.getToDoList().add("存在未审核的党员申请"); + } + if(partyMem.getData().getWarnStatus()){ + result.setAbandonFlag(false); + result.getToDoList().add("存在未审核的热心居民申请"); + } + if(eventRes.getData()){ + result.setAbandonFlag(false); + result.getToDoList().add("存在未处理的事件"); + } + if(issueAuditReset.getData()){ + result.setAbandonFlag(false); + result.getToDoList().add("存在未处理的议题"); + } + + if(!result.getAbandonFlag()){ + return result; + } + //可以弃用、处理数据 todo + // .... + // .... + + + //处理成功，隐藏网格 + LambdaUpdateWrapper updateGrid=new LambdaUpdateWrapper<>(); + updateGrid.set(CustomerGridEntity::getAbandonFlag,true); + updateGrid.eq(CustomerGridEntity::getId,formDTO.getGridId()); + baseDao.update(null,updateGrid); + return result; + } + } From 65c1b4b904164b9275cdf59c7b3b26108492bba9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Mar 2022 10:02:08 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E4=B8=8B=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E6=9C=AA=E5=AE=A1=E6=A0=B8=E7=9A=84?= =?UTF-8?q?=E5=BE=BD=E7=AB=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/BadgeController.java | 12 ++++++++++++ .../src/main/java/com/epmet/dao/BadgeDao.java | 9 +++++++++ .../main/java/com/epmet/service/BadgeService.java | 9 +++++++++ .../com/epmet/service/impl/BadgeServiceImpl.java | 15 +++++++++++++++ .../src/main/resources/mapper/BadgeDao.xml | 10 ++++++++++ 5 files changed, 55 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java index e25083f669..7c02a9df9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java @@ -206,4 +206,16 @@ public class BadgeController { List users = badgeService.listUsersByBadge(customerId, badgeKey); return new Result>().ok(users); } + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + @PostMapping("audit-reset") + public Result badgeAuditReset(@RequestParam("gridId")String gridId){ + return new Result().ok(badgeService.badgeAuditReset(gridId)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java index d2a10f7026..113ed28dee 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java @@ -204,4 +204,13 @@ public interface BadgeDao extends BaseDao { * @date 2021.08.02 10:40 */ List listUsersByBadge(@Param("customerId") String customerId, @Param("badgeKey") String badgeKey); + + /** + * Desc: 查询网格下的徽章审核个数 + * @param gridId + * @author zxc + * @date 2022/3/16 9:52 上午 + */ + Integer badgeAuditReset(@Param("gridId") String gridId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java index fc06714fd9..4b2252b51c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java @@ -200,4 +200,13 @@ public interface BadgeService extends BaseService { * @date 2021.08.02 10:39 */ List listUsersByBadge(String customerId, String badgeKey); + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + Boolean badgeAuditReset(String gridId); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java index de2f864ff0..5667c6d401 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java @@ -495,4 +495,19 @@ public class BadgeServiceImpl extends BaseServiceImpl imp public List listUsersByBadge(String customerId, String badgeKey) { return baseDao.listUsersByBadge(customerId, badgeKey); } + + /** + * Desc: 查询网格下是否存在未审核的徽章，true：是，false：否 + * @param gridId + * @author zxc + * @date 2022/3/16 9:42 上午 + */ + @Override + public Boolean badgeAuditReset(String gridId) { + Integer badgeAuditCount = baseDao.badgeAuditReset(gridId); + if (badgeAuditCount.compareTo(NumConstant.ZERO) != NumConstant.ZERO){ + return true; + } + return false; + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml index 09c84bde81..275babd61f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml @@ -330,4 +330,14 @@ and user_base_info.DEL_FLAG = 0) + + + \ No newline at end of file From f157f5c4852ee1587be522156d884f73c7cecaca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 16 Mar 2022 11:25:36 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E5=BC=83=E7=94=A8=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E6=9C=AA=E5=A4=84=E7=90=86=E7=9A=84=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?+=E6=9C=AA=E5=85=B3=E9=97=AD=E7=9A=84=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82=E5=85=B6=E4=BB=96=E4=B8=8D=E7=AE=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AbandonGridResDTO.java | 10 ----- .../com/epmet/controller/GridController.java | 5 ++- .../epmet/service/CustomerGridService.java | 2 +- .../service/impl/CustomerGridServiceImpl.java | 40 ++++--------------- 4 files changed, 11 insertions(+), 46 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java index 5ded7f55e2..c09bee8db5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * 废弃网格，前置条件查询返参 @@ -13,13 +12,4 @@ import java.util.List; @Data public class AbandonGridResDTO implements Serializable { - /** - * true:可以弃用，false:不可以弃用 - */ - private Boolean abandonFlag; - - /** - * 待办事项 - */ - private List toDoList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index affc36fe0e..60ffda8b94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -234,8 +234,9 @@ public class GridController { * @return */ @PostMapping("abandon") - public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ + public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, AddGroup.class); - return new Result().ok(customerGridService.abandonGrid(formDTO)); + customerGridService.abandonGrid(formDTO); + return new Result(); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index dea04e9f16..c57c5052ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -380,5 +380,5 @@ public interface CustomerGridService extends BaseService { * @param formDTO * @return */ - AbandonGridResDTO abandonGrid(AbandonGridFormDTO formDTO); + void abandonGrid(AbandonGridFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 512e050c80..2f5436c710 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -46,7 +46,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.*; -import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResultDTO; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; @@ -966,45 +965,21 @@ public class CustomerGridServiceImpl extends BaseServiceImpl partyMem = resiPartyMemberOpenFeignClient.partyMemberAuditReset(formDTO.getGridId()); - if (!partyMem.success() || null == partyMem.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "partyMemberAuditReset failed", "数据校验异常"); - } + public void abandonGrid(AbandonGridFormDTO formDTO) { //未处理的事件 Result eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId()); - if (!eventRes.success() || null == eventRes.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "eventAuditReset failed", "数据校验异常"); - } //表决中的议题 Result issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId()); - if (!issueAuditReset.success() || null == issueAuditReset.getData()) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "issueAuditReset failed", "数据校验异常"); - } - //徽章???? - AbandonGridResDTO result=new AbandonGridResDTO(true,new ArrayList<>()); - if(partyMem.getData().getPartyMemberStatus()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未审核的党员申请"); + if (eventRes.success() || issueAuditReset.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了..."); } - if(partyMem.getData().getWarnStatus()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未审核的热心居民申请"); + if (eventRes.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件，请先将事件办结后再操作"); } - if(eventRes.getData()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未处理的事件"); - } - if(issueAuditReset.getData()){ - result.setAbandonFlag(false); - result.getToDoList().add("存在未处理的议题"); + if (issueAuditReset.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题，请处理完再操作"); } - if(!result.getAbandonFlag()){ - return result; - } //可以弃用、处理数据 todo // .... // .... @@ -1015,7 +990,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl Date: Wed, 16 Mar 2022 11:27:01 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/AbandonGridResDTO.java | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java deleted file mode 100644 index c09bee8db5..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AbandonGridResDTO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.epmet.dto.result; - -import lombok.AllArgsConstructor; -import lombok.Data; - -import java.io.Serializable; - -/** - * 废弃网格，前置条件查询返参 - */ -@AllArgsConstructor -@Data -public class AbandonGridResDTO implements Serializable { - -} From def4a20d61e1a70e9ea75febee4fb195deb6ad7b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 16 Mar 2022 11:41:14 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=BC=83=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../grid/service/impl/ResiMineGridServiceImpl.java | 12 ++++++++++++ .../epmet/dto/result/LatestGridInfoResultDTO.java | 5 +++++ 2 files changed, 17 insertions(+) diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index f77f59e033..b044e1bdbb 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; @@ -15,6 +16,7 @@ import com.epmet.dto.PaCustomerDTO; import com.epmet.dto.form.LatestGridInfoFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; +import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; @@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -161,6 +164,15 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { } } + // 查询注册网格的弃用状态 + Result> userBaseInfo = epmetUserOpenFeignClient.queryUserBaseInfo(Arrays.asList(formDTO.getUserId())); + if (!userBaseInfo.success()){ + throw new EpmetException("查询用户基本信息失败"); + } + GridInfoCache grid = CustomerOrgRedis.getGridInfo(userBaseInfo.getData().get(NumConstant.ZERO).getRegisteredGridId()); + if (grid != null) { + result.setRegisterGridStatus(grid.getAbandonFlag().compareTo(NumConstant.ONE) == NumConstant.ZERO ? true : false); + } return result; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java index ddf04a0fe7..af656061dd 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/LatestGridInfoResultDTO.java @@ -23,4 +23,9 @@ public class LatestGridInfoResultDTO implements Serializable { */ private String gridId; + /** + * 居民注册网格弃用状态 true：弃用，false：正常使用 + */ + private Boolean registerGridStatus = false; + }