Browse Source

Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into 主线测试

master
jianjun 4 years ago
parent
commit
1547fb142d
  1. 4
      epmet-admin/epmet-admin-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  2. 4
      epmet-auth/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  3. 6
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java
  4. 4
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java
  5. 23
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java
  6. 21
      epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java
  7. 10
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java
  8. 5
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java
  9. 58
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java
  10. 4
      epmet-gateway/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  11. 5
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java
  12. 4
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/config/NacosServiceListListenerRegisterer.java
  13. 5
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java
  14. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/config/NacosServiceListListenerRegisterer.java
  15. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  16. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java
  17. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java
  18. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java
  19. 1
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java
  20. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java
  21. 3
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml
  22. 4
      epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  23. 4
      epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  24. 4
      epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  25. 10
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  26. 4
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  27. 29
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java
  28. BIN
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx
  29. 4
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  30. 4
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  31. 4
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  32. 4
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  33. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  34. 4
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  35. 4
      epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  36. 34
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java
  37. 42
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java
  38. 9
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
  39. 5
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java
  40. 4
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  41. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
  42. 16
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
  43. 8
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
  44. 21
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  45. 20
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  46. 4
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  47. 4
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java
  48. 14
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AbandonGridFormDTO.java
  49. 6
      epmet-module/gov-org/gov-org-server/pom.xml
  50. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  51. 26
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
  52. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  53. 14
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java
  54. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java
  55. 25
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  56. 20
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
  57. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  58. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
  59. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  60. 125
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  61. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java
  62. 3
      epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.13__abandon_grid.sql
  63. 14
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  64. 16
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml
  65. 12
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java
  66. 19
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java
  67. 6
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java
  68. 14
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java
  69. 78
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java
  70. 29
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoConcernFormDTO.java
  71. 34
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyDetailFromDTO.java
  72. 47
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyFormDTO.java
  73. 25
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoWorkDiaryFormDTO.java
  74. 14
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
  75. 5
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
  76. 12
      epmet-module/gov-project/gov-project-server/pom.xml
  77. 4
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/config/NacosServiceListListenerRegisterer.java
  78. 12
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/MemoConstant.java
  79. 46
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java
  80. 139
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java
  81. 131
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java
  82. 116
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java
  83. 11
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
  84. 18
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java
  85. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java
  86. 16
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java
  87. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java
  88. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java
  89. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java
  90. 7
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java
  91. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java
  92. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java
  93. 20
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java
  94. 20
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java
  95. 8
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java
  96. 16
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java
  97. 14
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java
  98. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
  99. 40
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java
  100. 44
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

6
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java

@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.epmet.commons.mybatis.interceptor.DataFilterInterceptor;
import com.epmet.commons.mybatis.interceptor.MybatisPlusSqlInjector;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
@ -44,5 +45,10 @@ public class MybatisPlusConfig {
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
return interceptor;
}
@Bean
@Order(2)
public MybatisPlusSqlInjector mybatisPlusSqlInjector(){
return new MybatisPlusSqlInjector();
}
}

4
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/dao/BaseDao.java

@ -8,7 +8,7 @@
package com.epmet.commons.mybatis.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.epmet.commons.mybatis.mapper.MyBaseMapper;
/**
* 基础Dao
@ -16,6 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
public interface BaseDao<T> extends BaseMapper<T> {
public interface BaseDao<T> extends MyBaseMapper<T> {
}

23
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/interceptor/MybatisPlusSqlInjector.java

@ -0,0 +1,23 @@
package com.epmet.commons.mybatis.interceptor;
import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
import com.baomidou.mybatisplus.extension.injector.methods.LogicDeleteByIdWithFill;
import java.util.List;
/**
* desc:mybatisPlus拦截器
*
* @author: LiuJanJun
* @date: 2022/3/16 6:33 下午
* @version: 1.0
*/
public class MybatisPlusSqlInjector extends DefaultSqlInjector {
@Override
public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
final List<AbstractMethod> methods = super.getMethodList(mapperClass);
methods.add(new LogicDeleteByIdWithFill());
return methods;
}
}

21
epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/mapper/MyBaseMapper.java

@ -0,0 +1,21 @@
package com.epmet.commons.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* desc:自定义mapper方法
*
* @author: LiuJanJun
* @date: 2022/3/16 6:42 下午
* @version: 1.0
*/
public interface MyBaseMapper<Entity> extends BaseMapper<Entity> {
/**
* 根据Id逻辑删除 填充其他字段的值 id必填
*
* @param entity 要删除的实体对象
* @return 受影响记录数量
*/
int deleteByIdWithFill(Entity entity);
}

10
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@ -34,6 +34,7 @@ public class CustomerOrgRedis {
private static CustomerOrgRedis customerOrgRedis;
@PostConstruct
public void init() {
customerOrgRedis = this;
@ -90,4 +91,13 @@ public class CustomerOrgRedis {
return agencyInfoResult.getData();
}
/**
* desc:删除网格缓存
* @param gridId
*/
public static void delGridInfo(String gridId) {
String key = RedisKeys.getGridInfoKey(gridId);
customerOrgRedis.redisUtils.delete(key);
}
}

5
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;
}

58
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/FileUtils.java

@ -1,14 +1,18 @@
package com.epmet.commons.tools.utils;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
/**
* @author kamui
*/
@Slf4j
public class FileUtils {
/**
@ -62,4 +66,50 @@ public class FileUtils {
return createTmpFile(inputStream, name, ext, null);
}
/**
* 将classpath文件复制到宿主机
* @param fileName
* @return
* @throws IOException
*/
public static String copyClassPathResourcesToHostMachine(String fileName, String fileClassPath, String fileHostPath, Class loaderClass) throws IOException {
// 宿主机目录准备
if (StringUtils.isNotBlank(fileHostPath) && !fileHostPath.endsWith("/")) {
fileHostPath = fileHostPath.concat("/");
}
String homeDir = System.getProperty("user.home");
Path epmetFilesPath = Paths.get(homeDir, "epmet_files", fileHostPath);
if (Files.notExists(epmetFilesPath)) {
Files.createDirectories(epmetFilesPath);
}
Path templateFilePath = epmetFilesPath.resolve(fileName);
String templateFilePathStr = templateFilePath.toString();
if (Files.exists(templateFilePath)) {
return templateFilePathStr;
}
if (StringUtils.isNotBlank(fileClassPath) && !fileClassPath.endsWith("/")) {
fileClassPath = fileClassPath.concat("/");
}
// 将项目中的模板拷贝至用户家目录中
OutputStream os = null;
InputStream is = null;
try {
is = loaderClass.getClassLoader().getResourceAsStream(fileClassPath + fileName);
os = new FileOutputStream(templateFilePathStr);
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
if (os != null) {
os.close();
}
}
return templateFilePathStr;
}
}

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

5
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/CustomerGridDTO.java

@ -153,4 +153,9 @@ public class CustomerGridDTO implements Serializable {
* 联系电话
*/
private String mobile;
/**
* 弃用标记
*/
private Integer abandonFlag;
}

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

5
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/CustomerGridEntity.java

@ -99,4 +99,9 @@ public class CustomerGridEntity extends BaseEpmetEntity {
* 联系电话
*/
private String mobile;
/**
* 弃用标记
*/
private Integer abandonFlag;
}

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/org/CustomerGridEntity.java

@ -86,4 +86,9 @@ public class CustomerGridEntity extends BaseEpmetEntity {
*/
private String syncFlag;
/**
* 弃用标记
*/
private Integer abandonFlag;
}

7
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/DimGridEntity.java

@ -17,6 +17,7 @@
package com.epmet.entity.stats;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@ -59,4 +60,10 @@ public class DimGridEntity extends BaseEpmetEntity {
private String code;
/**
* 弃用标记
*/
@TableField(exist = false)
private Integer abandonFlag;
}

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@ -124,10 +124,15 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
screenGrid.setCode(grid.getCode());
screenCustomerGridDao.updateById(screenGrid);
if ("1".equals(grid.getDelFlag())) {
if ("1".equals(grid.getDelFlag()) || grid.getAbandonFlag().compareTo(1) == 0) {
LambdaQueryWrapper<ScreenCustomerGridEntity> w = new LambdaQueryWrapper<>();
w.eq(ScreenCustomerGridEntity::getGridId, grid.getId());
screenCustomerGridDao.delete(w);
ScreenCustomerGridEntity e = new ScreenCustomerGridEntity();
e.setDataEndTime(NumConstant.ONE_STR);
e.setUpdatedTime(new Date());
screenCustomerGridDao.update(e,w);
// 此delete不更新 updatedTime
// screenCustomerGridDao.delete(w);
}
}
}

1
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java

@ -112,6 +112,7 @@ public class StatsDimServiceImpl implements StatsDimService {
dimGrid.setAreaCode(updatedGrid.getAreaCode());
dimGrid.setCustomerId(updatedGrid.getCustomerId());
dimGrid.setCode(updatedGrid.getCode());
dimGrid.setAbandonFlag(updatedGrid.getAbandonFlag());
dimGrids.add(dimGrid);
}
}

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@ -130,7 +130,7 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
for (DimGridEntity updatedGridDim : changedGrids) {
baseDao.updateById(updatedGridDim);
if ("1".equals(updatedGridDim.getDelFlag())) {
if ("1".equals(updatedGridDim.getDelFlag()) || updatedGridDim.getAbandonFlag().compareTo(1) == 0) {
// 如果已经被删除了,那么这里也做删除操作
baseDao.deleteById(updatedGridDim.getId());
}

3
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@ -68,7 +68,8 @@
manage_district,
total_user,
pid,
pids
pids,
ABANDON_FLAG
FROM customer_grid
WHERE SYNC_FLAG='1'
AND CREATED_TIME <![CDATA[<]]> #{startTime}

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
//// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

10
epmet-module/epmet-heart/epmet-heart-server/pom.xml

@ -122,6 +122,16 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>xls</nonFilteredFileExtension>
<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

29
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcCommunitySelfOrganizationController.java

@ -45,13 +45,18 @@ import com.epmet.service.IcCommunitySelfOrganizationService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.URLEncoder;
import java.util.List;
import java.util.Map;
@ -181,6 +186,30 @@ public class IcCommunitySelfOrganizationController {
return new Result();
}
/**
* 下载社区自组织导入模板
* @param response
* @throws IOException
*/
@RequestMapping(value = "import-template-download", method = {RequestMethod.GET, RequestMethod.POST})
public void downloadTemplate(HttpServletResponse response) throws IOException {
response.setCharacterEncoding("UTF-8");
response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
//response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("社区自组织导入模板", "UTF-8") + ".xlsx");
InputStream is = this.getClass().getClassLoader().getResourceAsStream("templates/self_org_import_template.xlsx");
try {
ServletOutputStream os = response.getOutputStream();
IOUtils.copy(is, os);
} finally {
if (is != null) {
is.close();
}
}
}
/**
* @Description 添加社区自组织
* @param tokenDto

BIN
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/templates/self_org_import_template.xlsx

Binary file not shown.

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

34
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/MemosToRemindFormDTO.java

@ -0,0 +1,34 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
/**
* @Author sun
* @Description 书记日志-待提醒弹框-提醒内容列表-接口入参
**/
@Data
public class MemosToRemindFormDTO implements Serializable {
private static final long serialVersionUID = 4859779755214502427L;
public interface MemoAttr extends CustomerClientShowGroup {}
/**
* 待提醒业务Id
*/
@NotBlank(message = "待提醒业务Id不能为空", groups = { MemoAttr.class })
private String memoId;
/**
* 到期提醒时间,不传值默认查询当前时间之前的数据yyyy-MM-dd
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String remindTime;
//token中用户Id
private String userId;
}

42
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/MemosToRemindResultDTO.java

@ -0,0 +1,42 @@
package com.epmet.dto.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Author sun
* @Description 书记日志-待提醒弹框-提醒内容列表-接口返参
**/
@Data
@AllArgsConstructor
public class MemosToRemindResultDTO implements Serializable {
private static final long serialVersionUID = 4769136806332933579L;
/**
* 对应业务数据Id
*/
private String memoId;
/**
* 业务类型 人员关怀concern难点堵点difficulty工作日志work_diary
*/
private String type;
/**
* 业务类型 人员关怀concern难点堵点difficulty工作日志work_diary
*/
private String typeName;
/**
* 提醒内容
*/
private String content;
/**
* 提醒时间日期类型
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private String remindTime;
}

9
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<Map<String, String>> getCategoryMap(@PathVariable("customerId") String customerId);
/**
* Desc: 查询网格下是否存在审核中的表决中的议题 true存在false不存在
* @param gridId
* @author zxc
* @date 2022/3/15 4:40 下午
*/
@PostMapping("/gov/issue/issue/audit-reset")
Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId);
}

5
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<Map<String, String>> getCategoryMap(String customerId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "getCategoryMap", customerId);
}
@Override
public Result<Boolean> issueAuditReset(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueAuditReset", gridId);
}
}

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

11
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<List<ProjectDistributionAnalysisRightDTO>>().ok(issueService.getProjectCountByGrid(formDTO));
}
/**
* Desc: 查询网格下是否存在审核中的表决中的议题 true存在false不存在
* @param gridId
* @author zxc
* @date 2022/3/15 4:40 下午
*/
@PostMapping("audit-reset")
public Result<Boolean> issueAuditReset(@RequestParam("gridId")String gridId){
return new Result<Boolean>().ok(issueService.issueAuditReset(gridId));
}
}

16
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java

@ -292,4 +292,20 @@ public interface IssueDao extends BaseDao<IssueEntity> {
List<ResiBuzzIssueCategoryDTO> selectCategoryNameByIssueList(List<ResiBuzzLeftPieChartResultDTO> 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);
}

8
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java

@ -378,4 +378,12 @@ public interface IssueService extends BaseService<IssueEntity> {
*/
List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO);
/**
* Desc: 查询网格下是否存在审核中的表决中的议题 true存在false不存在
* @param gridId
* @author zxc
* @date 2022/3/15 4:40 下午
*/
Boolean issueAuditReset(String gridId);
}

21
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<IssueDao, IssueEntity> 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;
}
}

20
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@ -750,4 +750,24 @@
LEFT JOIN issue_project_category_dict cd ON (cd.CATEGORY_CODE = t1.categoryCode AND cd.DEL_FLAG = '0' AND cd.CUSTOMER_ID = #{customerId})
</foreach>
</select>
<!-- 查询网格中表决中的议题个数 -->
<select id="selectVotingIssue" resultType="java.lang.Integer">
SELECT
COUNT(id)
FROM issue
WHERE del_flag = 0
and ISSUE_STATUS = 'voting'
AND grid_id = #{gridId}
</select>
<!-- 查询网格中审核中的议题个数 -->
<select id="selectAuditIssue" resultType="java.lang.Integer">
SELECT
count( id )
FROM issue_application
WHERE DEL_FLAG = '0'
AND APPLY_STATUS = 'under_auditing'
AND GRID_ID = #{gridId}
</select>
</mapper>

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

4
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;
}

14
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;
}

6
epmet-module/gov-org/gov-org-server/pom.xml

@ -136,6 +136,12 @@
<version>3.0.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>gov-issue-client</artifactId>
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

26
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,29 @@ public class GridController {
ValidatorUtils.validateEntity(formDTO);
return new Result<List<GridTreeResultDTO>>().ok(customerGridService.getGridTree(formDTO));
}
/**
* 弃用网格
* @param formDTO
* @return
*/
@RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE)
@PostMapping("abandon")
public Result abandonGrid(@RequestBody AbandonGridFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, AddGroup.class);
customerGridService.abandonGrid(formDTO);
return new Result();
}
/**
* desc:移除网格内的工作人员关系 并迁移到组织
* @author jianjun liu
* @remark: 如果是网格添加的则解除关系后将注册关系改为对应的组织 如果不是则直接解除关系(相当于移除该人员与网格的关系)
*/
@PostMapping("removeGridStaff2Agency/{gridId}")
//@RequirePermission(requirePermission = RequirePermissionEnum.ORG_STAFF_TRANSFER)
public Result removeGridStaff2Agency( @PathVariable String gridId){
customerGridService.abandonGridForDealBizData(gridId);
return new Result();
}
}

12
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@ -367,11 +367,19 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
List<CustomerStaffGridResultDTO> getStaffGridList(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgType") String orgType);
/**
* @Description 根据网格名字查询网格信息
* @param names
* @Description 根据网格名字查询网格信息
* @author zxc
* @date 2022/2/12 2:06 下午
*/
List<InfoByNamesResultDTO> selectGridInfoByNames(@Param("names")List<String> names,@Param("customerId")String customerId);
List<InfoByNamesResultDTO> selectGridInfoByNames(@Param("names") List<String> names, @Param("customerId") String customerId);
/**
* desc:修改网格工作人员数量
*
* @param gridId
* @param incrCount 增加人数 负数为 -
* @return
*/
int updateTotalUser(@Param("gridId") String gridId, @Param("incrCount") long incrCount);
}

14
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffGridDao.java

@ -19,8 +19,8 @@ package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.CustomerGridDTO;
import com.epmet.dto.CustomerStaffDepartmentDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffOrgRelationDTO;
import com.epmet.dto.form.LatestGridFormDTO;
import com.epmet.dto.result.EventTitleOrgResultDTO;
import com.epmet.dto.result.GridStaffResultDTO;
@ -28,12 +28,11 @@ import com.epmet.entity.CustomerStaffGridEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
* 网格人员关系表
* 网格人员关系表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-04-20
@ -115,4 +114,11 @@ public interface CustomerStaffGridDao extends BaseDao<CustomerStaffGridEntity> {
* @date 2021/8/5 5:36 下午
*/
List<EventTitleOrgResultDTO> eventOrg(@Param("userId") String userId);
}
/**
* desc:根据网格id 获取网格下的工作人员及其添加关系
* @param gridId
* @return
*/
List<StaffOrgRelationDTO> getGridStaffList(String gridId);
}

5
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;
}

25
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -3,28 +3,14 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.*;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffGridListDTO;
import com.epmet.dto.form.AddDepartmentStaffFormDTO;
import com.epmet.dto.form.DepartmentInStaffFormDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.result.DepartInStaffListResultDTO;
import com.epmet.dto.result.StaffDetailResultDTO;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.StaffInitResultDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffGridListDTO;
import com.epmet.feign.fallback.EpmetUserFeignClientFallBack;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@ -169,4 +155,13 @@ public interface EpmetUserFeignClient {
**/
@PostMapping(value = "/epmetuser/customerstaff/getcustomerstafflist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList);
/**
* desc:删除审核中的徽章认证记录
* @param customerId
* @param gridId
* @return
*/
@PostMapping("/epmetuser/badge/deleteBadgeCertificateAuditing")
Result<Integer> deleteBadgeCertificateAuditing(@RequestParam("customerId") String customerId, @RequestParam("gridId") String gridId);
}

20
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java

@ -4,23 +4,8 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.*;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffGridListDTO;
import com.epmet.dto.form.AddDepartmentStaffFormDTO;
import com.epmet.dto.form.DepartmentInStaffFormDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.result.DepartInStaffListResultDTO;
import com.epmet.dto.result.StaffDetailResultDTO;
import com.epmet.dto.result.StaffInfoResultDTO;
import com.epmet.dto.result.StaffInitResultDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.CustomerStaffGridDTO;
import com.epmet.dto.StaffGridListDTO;
import com.epmet.feign.EpmetUserFeignClient;
import org.springframework.stereotype.Component;
@ -106,4 +91,9 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<CustomerStaffListResultDTO> getCustomerStaffList(List<String> staffIdList) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getCustomerStaffList", staffIdList);
}
@Override
public Result<Integer> deleteBadgeCertificateAuditing(String customerId, String gridId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deleteBadgeCertificateAuditing", customerId, gridId);
}
}

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@ -374,4 +374,17 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
* @date 2022/1/17 3:50 下午
*/
List<CustomerStaffGridResultDTO> getStaffGridList(String customerId, String orgId, String orgType);
/**
* 弃用网格前置条件查询
* @param formDTO
* @return
*/
void abandonGrid(AbandonGridFormDTO formDTO);
/**
* desc:移除网格内的工作人员关系 并迁移到组织
* @param gridId
*/
void abandonGridForDealBizData(String gridId);
}

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java

@ -89,7 +89,7 @@ public interface StaffService {
* @return com.epmet.dto.result.MineResultDTO
*/
MineResultDTO mine(StaffInfoFromDTO fromDTO);
/**
* 工作人员调动
* @author zhaoqifeng

5
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<CustomerAgencyDao
}
//3:根据组织Id查询该组织下网格、人员列表
//3.1:查询组织下网格列表
// 未隐藏的网格
List<GridListResultDTO> gridList = customerGridDao.selectGridList(canTick.getAgencyId());
List<CustomerStaffGridDTO> gridStaffs = new ArrayList<>();
if (null != gridList && gridList.size() > NumConstant.ZERO) {
@ -728,6 +729,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
if (party) {
//4.1:查询当前机关的网格列表以及所有下级机关的网格列表
//当前机关下网格列表
// 未隐藏的网格
List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
returnDTO.setGridList(gridList);
//递归查询当前组织的下级组织以及每个下级组织对应的网格列表
@ -762,6 +764,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
List<ArticleGridResultDTO> subAgencyList = baseDao.selectAllSubAgency(subAgencyPids);
if (subAgencyList.size() > NumConstant.ZERO) {
for (ArticleGridResultDTO sub : subAgencyList) {
//未隐藏的网格
List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(sub.getAgencyId());
sub.setGridList(gridList);
List<ArticleGridResultDTO> subAgency = getGridList(sub.getPids() + ":" + sub.getAgencyId());
@ -826,11 +829,13 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
List<AgencyDeptList> agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId());
returnDTO.setAgencyDeptList(agencyDeptList);
//当前机关下网格列表
// 未隐藏的网格
List<AgencyGridList> agencyGridList = customerGridDao.selectAgencyGridMsgList(agencyEntity.getId());
returnDTO.setAgencyGridList(agencyGridList);
} else if (gridParty) {
//4.2:查询人员在当前机关下参与的网格列表
//查询当前组织下的网格列表
//未隐藏的网格
List<AgencyGridListResultDTO> gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId());
//查询该工作人员在该客户下参与的网格列表
CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO();

125
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@ -18,8 +18,10 @@
package com.epmet.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
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;
@ -27,26 +29,31 @@ import com.epmet.commons.tools.constant.NumConstant;
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.enums.OrgTypeEnum;
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;
import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
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.Result;
import com.epmet.constant.CustomerGridConstant;
import com.epmet.dao.CustomerGridDao;
import com.epmet.dao.CustomerStaffGridDao;
import com.epmet.dao.StaffOrgRelationDao;
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.entity.CustomerStaffGridEntity;
import com.epmet.entity.StaffOrgRelationEntity;
import com.epmet.feign.*;
import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
import com.epmet.service.CustomerAgencyService;
import com.epmet.service.CustomerGridService;
import com.epmet.util.ModuleConstant;
@ -86,12 +93,25 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
@Autowired
private CustomerGridDao customerGridDao;
@Autowired
private RedisUtils redisUtils;
private StaffOrgRelationDao staffOrgRelationDao;
@Autowired
private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
private RedisUtils redisUtils;
@Autowired
private EpmetAdminOpenFeignClient adminOpenFeignClient;
//迁移网格
@Autowired
private GovIssueOpenFeignClient govIssueOpenFeignClient;
@Autowired
private GovProjectOpenFeignClient govProjectOpenFeignClient;
@Autowired
private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Override
public PageData<CustomerGridDTO> page(Map<String, Object> params) {
IPage<CustomerGridEntity> page = baseDao.selectPage(
@ -945,4 +965,97 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
return baseDao.getStaffGridList(customerId,orgId,orgType);
}
/**
* 弃用网格
*
* @param formDTO
* @return
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void abandonGrid(AbandonGridFormDTO formDTO) {
//未处理的事件
Result<Boolean> eventRes = govProjectOpenFeignClient.eventAuditReset(formDTO.getGridId());
//表决中的议题
Result<Boolean> issueAuditReset = govIssueOpenFeignClient.issueAuditReset(formDTO.getGridId());
if (!eventRes.success() || !issueAuditReset.success()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "校验数据异常", "服务器开小差了...");
}
if (eventRes.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未处理的事件", "该网格存在未办结的群众直报事件,请先将事件办结后再操作");
}
if (issueAuditReset.getData()) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未关闭的议题", "该网格存在未关闭的议题,请处理完再操作");
}
//可以弃用、处理数据 todo
// ....
// ....
this.abandonGridForDealBizData(formDTO.getGridId());
//处理成功,隐藏网格
LambdaUpdateWrapper<CustomerGridEntity> updateGrid=new LambdaUpdateWrapper<>();
updateGrid.set(CustomerGridEntity::getAbandonFlag,true);
updateGrid.eq(CustomerGridEntity::getId,formDTO.getGridId());
baseDao.update(null,updateGrid);
CustomerOrgRedis.delGridInfo(formDTO.getGridId());
}
@Override
public void abandonGridForDealBizData(String gridId) {
try {
//根据网格id 获取网格内工作人员及其添加关系
List<StaffOrgRelationDTO> staffList = customerStaffGridDao.getGridStaffList(gridId);
if (CollectionUtils.isEmpty(staffList)){
log.info("abandonGridForDealBizData gridId:{} have any staff", gridId);
return;
}
logger.debug("abandonGridForDealBizData staffList:{}", JSON.toJSONString(staffList));
List<StaffOrgRelationEntity> updateList = new ArrayList<>();
staffList.forEach(staffOrg->{
if(OrgTypeEnum.GRID.getCode().equals(staffOrg.getOrgType())){
StaffOrgRelationEntity entity = new StaffOrgRelationEntity();
entity.setId(staffOrg.getId());
entity.setOrgType(OrgTypeEnum.AGENCY.getCode());
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(staffOrg.getOrgId());
if (gridInfo == null || StringUtils.isBlank(gridInfo.getPid())){
log.error("abandonGridForDealBizData agencyId:{} is not exist",gridInfo.getPid());
return;
}
entity.setOrgId(gridInfo.getPid());
updateList.add(entity);
}
});
//更新工作人员组织关系
String customerId = staffList.get(NumConstant.ZERO).getCustomerId();
updateGridStaff2Agency(customerId,gridId, staffList, updateList);
//清空工作人员缓存
staffList.forEach(staff->CustomerStaffRedis.delStaffInfoFormCache(customerId,staff.getStaffId()));
} catch (Exception e) {
log.error("abandonGridForDealBizData exception", e);
throw e;
}
}
@Transactional
public void updateGridStaff2Agency(String customerId, String gridId, List<StaffOrgRelationDTO> staffList, List<StaffOrgRelationEntity> updateList) {
//1.删除工作人员与网格的关系
LambdaQueryWrapper<CustomerStaffGridEntity> updateWrapper = new LambdaQueryWrapper<>();
updateWrapper.eq(CustomerStaffGridEntity::getGridId,gridId);
customerStaffGridDao.delete(updateWrapper);
//2.修改 网格内添加工作人员改为组织
updateList.forEach(e->{
staffOrgRelationDao.update(e,null);
});
//网格对应的人数减少
long reduceCount = NumConstant.ZERO - staffList.stream().map(StaffOrgRelationDTO::getStaffId).distinct().count();
log.debug("updateGridStaff2Agency gridId:{} reduceCount:{}",gridId, reduceCount);
int effectRow = customerGridDao.updateTotalUser(gridId, reduceCount);
Result<Integer> badgeResult = epmetUserFeignClient.deleteBadgeCertificateAuditing(customerId,gridId);
if (badgeResult == null || !badgeResult.success()){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"删除未审核徽章失败,请稍后重试");
}
}
}

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcPartyServiceCenterServiceImpl.java

@ -148,7 +148,8 @@ public class IcPartyServiceCenterServiceImpl extends BaseServiceImpl<IcPartyServ
}
});
if (CollectionUtils.isNotEmpty(names)){
throw new EpmetException(names.stream().collect(Collectors.joining("、")) + "存在未来时间的预约事项,不允许删除");
// throw new EpmetException(names.stream().collect(Collectors.joining("、")) + "存在未来时间的预约事项,不允许删除");
throw new EpmetException(EpmetErrorCode.MATTER_EXISTS_APPOINTMENT_ERROR.getCode());
}
baseDao.deleteBatchIds(centerIds);
baseDao.delMatters(centerIds);

3
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;

14
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@ -174,7 +174,9 @@
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}
ORDER BY cg.GRID_NAME ASC
</select>
@ -288,6 +290,7 @@
CUSTOMER_GRID
WHERE
DEL_FLAG = '0'
and ABANDON_FLAG='0'
AND
PID = #{agencyId}
</select>
@ -307,6 +310,7 @@
CUSTOMER_GRID
<where>
DEL_FLAG = '0'
AND ABANDON_FLAG='0'
AND PID = #{agencyId}
ORDER BY CREATED_TIME DESC
<if test="null != pageSize and pageSize > 0">
@ -338,6 +342,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
<foreach item="id" collection="gridIdList" open="(" separator="," close=")">
#{id}
@ -371,6 +376,7 @@
grid_name AS "gridName"
FROM customer_grid
WHERE del_flag = '0'
and ABANDON_FLAG='0'
AND pid = #{agencyId}
ORDER BY created_time DESC
</select>
@ -407,6 +413,7 @@
grid_name AS "gridName"
FROM customer_grid
WHERE del_flag = '0'
and ABANDON_FLAG='0'
AND pid = #{agencyId}
</select>
@ -428,6 +435,7 @@
WHERE
cg.del_flag = '0'
AND ca.del_flag = '0'
and cg.ABANDON_FLAG='0'
AND cg.pid = #{agencyId}
</select>
@ -457,6 +465,7 @@
WHERE
grid.del_flag = 0
and grid.SYNC_FLAG='1'
and grid.ABANDON_FLAG='0'
<if test='areaCode != "" and areaCode != null'>
AND grid.area_code LIKE CONCAT(#{areaCode},'%')
</if>
@ -497,6 +506,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
@ -834,5 +844,9 @@
</foreach>
)
</select>
<update id="updateTotalUser">
UPDATE customer_grid SET total_user = total_user+#{incrCount}
where id = #{gridId} and del_flag = '0'
</update>
</mapper>

16
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffGridDao.xml

@ -173,4 +173,18 @@
AND
DEL_FLAG = 0
</update>
</mapper>
<select id="getGridStaffList" resultType="com.epmet.dto.StaffOrgRelationDTO">
SELECT
csg.customer_id,
csg.GRID_ID orgId,
csg.USER_ID staffId,
ifnull(sor.ORG_TYPE,'agency') orgType,
sor.id id
FROM
customer_staff_grid csg
LEFT JOIN staff_org_relation sor ON csg.USER_ID = sor.STAFF_ID AND csg.grid_id = sor.ORG_ID AND sor.del_flag = '0'
WHERE
csg.del_flag = '0'
AND csg.GRID_ID = #{gridId}
</select>
</mapper>

12
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoAttachmentDTO.java

@ -1,5 +1,6 @@
package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -20,16 +21,19 @@ public class MemoAttachmentDTO implements Serializable {
/**
* 主键
*/
@JsonIgnore
private String id;
/**
* 客户ID
*/
@JsonIgnore
private String customerId;
/**
* REMIND_MSG.ID
* REMIND_MSG.ID 业务(工作日志难点堵点人员关怀)表Id
*/
@JsonIgnore
private String remindMsgId;
/**
@ -70,21 +74,25 @@ public class MemoAttachmentDTO implements Serializable {
/**
* 排序字段
*/
@JsonIgnore
private Integer sort;
/**
* 删除标记 0未删除1已删除
*/
@JsonIgnore
private String delFlag;
/**
* 乐观锁
*/
@JsonIgnore
private Integer revision;
/**
* 创建人
*/
@JsonIgnore
private String createdBy;
/**
@ -95,11 +103,13 @@ public class MemoAttachmentDTO implements Serializable {
/**
* 更新人
*/
@JsonIgnore
private String updatedBy;
/**
* 更新时间
*/
@JsonIgnore
private Date updatedTime;
}

19
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoConcernDTO.java

@ -1,9 +1,14 @@
package com.epmet.dto;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -20,6 +25,7 @@ public class MemoConcernDTO implements Serializable {
/**
* 唯一标识(同memo_attr表Id)
*/
@NotBlank(message = "ID不能为空", groups = { UpdateGroup.class })
private String id;
/**
@ -35,12 +41,13 @@ public class MemoConcernDTO implements Serializable {
/**
* 关怀对象
*/
@NotBlank(message = "关怀人员不能为空", groups = { AddGroup.class, UpdateGroup.class })
private String resiName;
/**
* 关怀对象电话
*/
private String phnoe;
private String phone;
/**
* 关怀对象地址
@ -50,16 +57,19 @@ public class MemoConcernDTO implements Serializable {
/**
* 关怀事项
*/
@NotBlank(message = "关怀事项不能为空", groups = { AddGroup.class, UpdateGroup.class })
private String content;
/**
* 计划执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;
/**
* 实际执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date actualTime;
/**
@ -70,6 +80,7 @@ public class MemoConcernDTO implements Serializable {
/**
* 提醒时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date remindTime;
/**
@ -90,6 +101,7 @@ public class MemoConcernDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date createdTime;
/**
@ -101,5 +113,8 @@ public class MemoConcernDTO implements Serializable {
* 更新时间
*/
private Date updatedTime;
/**
* 附件
*/
private List<MemoAttachmentDTO> attachmentList;
}

6
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoDifficultyDTO.java

@ -1,9 +1,11 @@
package com.epmet.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -45,11 +47,13 @@ public class MemoDifficultyDTO implements Serializable {
/**
* 计划执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;
/**
* 提醒时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date remindTime;
/**
@ -70,6 +74,7 @@ public class MemoDifficultyDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date createdTime;
/**
@ -82,4 +87,5 @@ public class MemoDifficultyDTO implements Serializable {
*/
private Date updatedTime;
private List<MemoAttachmentDTO> attachmentList;
}

14
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/MemoWorkDiaryDTO.java

@ -1,9 +1,14 @@
package com.epmet.dto;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
@ -20,6 +25,7 @@ public class MemoWorkDiaryDTO implements Serializable {
/**
* 唯一标识(同memo_attr表Id)
*/
@NotBlank(message = "ID不能为空", groups = { UpdateGroup.class })
private String id;
/**
@ -35,11 +41,13 @@ public class MemoWorkDiaryDTO implements Serializable {
/**
* 内容
*/
@NotBlank(message = "内容不能为空", groups = { AddGroup.class, UpdateGroup.class })
private String content;
/**
* 提醒时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date remindTime;
/**
@ -60,6 +68,7 @@ public class MemoWorkDiaryDTO implements Serializable {
/**
* 创建时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date createdTime;
/**
@ -72,4 +81,9 @@ public class MemoWorkDiaryDTO implements Serializable {
*/
private Date updatedTime;
/**
* 附件
*/
private List<MemoAttachmentDTO> attachmentList;
}

78
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/AddMemoDifficultyFromDTO.java

@ -0,0 +1,78 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import com.epmet.dto.MemoAttachmentDTO;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* 备忘录-难点读点
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-03-15
*/
@Data
public class AddMemoDifficultyFromDTO implements Serializable {
private static final long serialVersionUID = 1L;
public interface AddMemoDifficulty extends CustomerClientShowGroup {}
/**
* id
*/
private String id;
/**
* 内容
*/
@NotBlank(message = "难点堵点内容不能为空", groups = { AddMemoDifficulty.class })
@Length(max = 500, message = "难点堵点内容最长为50个字", groups = { AddMemoDifficulty.class })
private String content;
/**
* 解决方式
*/
private String resolveWay;
/**
* 备注
*/
private String remark;
/**
* 计划执行时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date scheduledTime;
/**
* 提醒时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date remindTime;
/**
* 创建时间
*/
@JsonFormat(pattern="yyyy-MM-dd HH:mm")
private Date createdTime;
/**
* 附件集合
*/
private List<MemoAttachmentDTO> attachmentList;
//token中客户ID
private String customerId;
//token中用户Id
private String userId;
}

29
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoConcernFormDTO.java

@ -0,0 +1,29 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 17:11
*/
@NoArgsConstructor
@Data
public class MemoConcernFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = -2355555089163762829L;
private String userId;
private String id;
private String readFlag = "0";
private String content;
private String concernType;
private String resiName;
private String status;
private String startTime;
private String endTime;
private String scheduledStartTime;
private String scheduledEndTime;
}

34
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyDetailFromDTO.java

@ -0,0 +1,34 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 备忘录-难点读点
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-03-15
*/
@Data
public class MemoDifficultyDetailFromDTO implements Serializable {
private static final long serialVersionUID = 1L;
public interface Detail extends CustomerClientShowGroup {}
/**
* id
*/
@NotBlank(message = "难点堵点Id不能为空", groups = { Detail.class })
private String id;
/**
* 阅读标记1 已读0未读
*/
@NotNull(message = "阅读标记不能为空", groups = { Detail.class })
private Integer readFlag;
}

47
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoDifficultyFormDTO.java

@ -0,0 +1,47 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
/**
* @Description 难点堵点列表
* @Author sun
*/
@NoArgsConstructor
@Data
public class MemoDifficultyFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 3101320969471756516L;
/**
* 内容摘要
*/
private String content;
/**
* 起始预计处理时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String scheduledStartTime;
/**
* 终止预计处理时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String scheduledEndTime;
/**
* 起始创建时间Y-%m-%d
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String startTime;
/**
* 终止创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String endTime;
//token中用户Id
private String userId;
}

25
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/MemoWorkDiaryFormDTO.java

@ -0,0 +1,25 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.dto.form.PageFormDTO;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 15:09
*/
@NoArgsConstructor
@Data
public class MemoWorkDiaryFormDTO extends PageFormDTO implements Serializable {
private static final long serialVersionUID = 3101320969471756516L;
private String userId;
private String id;
private String readFlag = "0";
private String content;
private String workType;
private String startTime;
private String endTime;
}

14
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("gov/project/project/audit-reset")
Result<Boolean> eventAuditReset(@RequestParam("gridId")String gridId);
}

5
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<Boolean> eventAuditReset(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "eventAuditReset",gridId);
}
}

12
epmet-module/gov-project/gov-project-server/pom.xml

@ -148,6 +148,18 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<nonFilteredFileExtensions>
<nonFilteredFileExtension>xls</nonFilteredFileExtension>
<nonFilteredFileExtension>xlsx</nonFilteredFileExtension>
<nonFilteredFileExtension>doc</nonFilteredFileExtension>
<nonFilteredFileExtension>docx</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
</plugins>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<resources>

4
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<String> serviceList = serviceListView.getData();
log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
// log.debug("【Nacos服务列表定时刷新】Nacos服务端服务列表: {}", serviceList);
for (String service : serviceList) {
try {

12
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/MemoConstant.java

@ -0,0 +1,12 @@
package com.epmet.constant;
/**
* @Description
* @Author zhaoqifeng
* @Date 2022/3/15 16:56
*/
public interface MemoConstant {
String WORK_DIARY = "work_diary";
String CONCERN = "concern";
String DIFFICULTY = "difficulty";
}

46
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoAttrController.java

@ -1,7 +1,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -9,10 +11,13 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.MemoAttrDTO;
import com.epmet.dto.form.MemosToRemindFormDTO;
import com.epmet.dto.result.MemosToRemindResultDTO;
import com.epmet.service.MemoAttrService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@ -30,20 +35,20 @@ public class MemoAttrController {
private MemoAttrService memoAttrService;
@RequestMapping("page")
public Result<PageData<MemoAttrDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<MemoAttrDTO>> page(@RequestParam Map<String, Object> params) {
PageData<MemoAttrDTO> page = memoAttrService.page(params);
return new Result<PageData<MemoAttrDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoAttrDTO> get(@PathVariable("id") String id){
@RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
public Result<MemoAttrDTO> get(@PathVariable("id") String id) {
MemoAttrDTO data = memoAttrService.get(id);
return new Result<MemoAttrDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoAttrDTO dto){
public Result save(@RequestBody MemoAttrDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
memoAttrService.save(dto);
@ -52,7 +57,7 @@ public class MemoAttrController {
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoAttrDTO dto){
public Result update(@RequestBody MemoAttrDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
memoAttrService.update(dto);
@ -60,13 +65,42 @@ public class MemoAttrController {
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
memoAttrService.delete(ids);
return new Result();
}
/**
* @Author sun
* @Description 书记日志-待提醒弹框-提醒内容列表
**/
@PostMapping("memosToRemind")
public Result<List<MemosToRemindResultDTO>> memosToRemind(@LoginUser TokenDto tokenDTO, @RequestBody MemosToRemindFormDTO formDTO) {
formDTO.setUserId(tokenDTO.getUserId());
return new Result<List<MemosToRemindResultDTO>>().ok(memoAttrService.memosToRemind(formDTO));
}
/**
* @Author sun
* @Description 书记日志-待提醒时间列表
**/
@PostMapping("memoTime")
public Result<List<String>> memoTime(@LoginUser TokenDto tokenDTO) {
return new Result<List<String>>().ok(memoAttrService.memoTime(tokenDTO.getUserId()));
}
/**
* @Author sun
* @Description 书记日志-提醒列表-我知道了
**/
@PostMapping("setReaded")
public Result setReaded(@RequestBody MemosToRemindFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, MemosToRemindFormDTO.MemoAttr.class);
memoAttrService.setReaded(formDTO.getMemoId());
return new Result();
}
}

139
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoConcernController.java

@ -1,7 +1,15 @@
package com.epmet.controller;
import cn.afterturn.easypoi.word.WordExportUtil;
import cn.hutool.core.bean.BeanUtil;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -9,10 +17,25 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.MemoConcernDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.service.MemoConcernService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;
@ -22,6 +45,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-03-15
*/
@Slf4j
@RestController
@RequestMapping("memoConcern")
public class MemoConcernController {
@ -30,31 +54,36 @@ public class MemoConcernController {
private MemoConcernService memoConcernService;
@RequestMapping("page")
public Result<PageData<MemoConcernDTO>> page(@RequestParam Map<String, Object> params){
PageData<MemoConcernDTO> page = memoConcernService.page(params);
public Result<PageData<MemoConcernDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
PageData<MemoConcernDTO> page = memoConcernService.page(formDTO);
return new Result<PageData<MemoConcernDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoConcernDTO> get(@PathVariable("id") String id){
MemoConcernDTO data = memoConcernService.get(id);
@RequestMapping(method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoConcernDTO> get(@RequestBody MemoConcernFormDTO formDTO){
MemoConcernDTO data = memoConcernService.get(formDTO);
return new Result<MemoConcernDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoConcernDTO dto){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
dto.setCreatedBy(tokenDto.getUserId());
memoConcernService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoConcernDTO dto){
public Result update(@LoginUser TokenDto tokenDto, @RequestBody MemoConcernDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
memoConcernService.update(dto);
return new Result();
}
@ -67,6 +96,102 @@ public class MemoConcernController {
return new Result();
}
@PostMapping("/{id}/exportWord")
public void exportWord(@PathVariable("id") String id, HttpServletResponse response) throws Exception {
String templateFilePath = loadTemplate("memo_concern_export_template.docx");
MemoConcernFormDTO formDTO = new MemoConcernFormDTO();
formDTO.setId(id);
MemoConcernDTO data = memoConcernService.get(formDTO);
if (data == null) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未找到id为" + id + "的关怀项目", "未找到该关怀项目");
}
Map<String, Object> map = BeanUtil.beanToMap(data);
// 创建时间
if (data.getCreatedTime() != null) {
String createTimeStr = DateUtils.format(data.getCreatedTime(), "yyyy年MM月dd日 HH:mm");
map.put("createTime", createTimeStr);
} else {
map.put("createTime", "");
}
// 预计关怀时间
if (data.getScheduledTime() != null) {
String scheduledTimeStr = DateUtils.format(data.getScheduledTime(), "yyyy年MM月dd日 HH:mm");
map.put("scheduledTime", scheduledTimeStr);
} else {
map.put("scheduledTime", "");
}
//状态
map.put("statusName", "0".equals(data.getStatus()) ? "未完成" : "已完成");
XWPFDocument doc = WordExportUtil.exportWord07(templateFilePath, map);
String suffix = templateFilePath.substring(templateFilePath.lastIndexOf("."));
response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;fileName=人员关怀导入模板" + suffix);
ServletOutputStream fos = null;
try {
fos = response.getOutputStream();
doc.write(fos);
} finally {
if (fos != null) {
fos.close();
}
}
}
/**
* 加载模板
* @param templateFileName
* @return
* @throws IOException
*/
private String loadTemplate(String templateFileName) throws IOException {
String homeDir = System.getProperty("user.home");
Path templates = Paths.get(homeDir, "epmet_files", "templates");
if (Files.notExists(templates)) {
Files.createDirectories(templates);
}
Path templateFilePath = templates.resolve(templateFileName);
String templateFilePathStr = templateFilePath.toString();
if (Files.exists(templateFilePath)) {
return templateFilePathStr;
}
// 将项目中的模板拷贝至用户家目录中
OutputStream os = null;
InputStream is = null;
try {
is = this.getClass().getClassLoader().getResourceAsStream("templates/" + templateFileName);
os = new FileOutputStream(templateFilePathStr);
IOUtils.copy(is, os);
} finally {
try {
if (is != null) {
is.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输入流出错:{}", errorMsg);
}
try {
if (os != null) {
os.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输出流出错:{}", errorMsg);
}
}
return templateFilePathStr;
}
}

131
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoDifficultyController.java

@ -1,18 +1,39 @@
package com.epmet.controller;
import cn.afterturn.easypoi.word.WordExportUtil;
import cn.hutool.core.bean.BeanUtil;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.DateUtils;
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.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.MemoDifficultyDTO;
import com.epmet.dto.form.AddMemoDifficultyFromDTO;
import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
import com.epmet.dto.form.MemoDifficultyFormDTO;
import com.epmet.service.MemoDifficultyService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Map;
@ -22,6 +43,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-03-15
*/
@Slf4j
@RestController
@RequestMapping("memoDifficulty")
public class MemoDifficultyController {
@ -30,8 +52,9 @@ public class MemoDifficultyController {
private MemoDifficultyService memoDifficultyService;
@RequestMapping("page")
public Result<PageData<MemoDifficultyDTO>> page(@RequestParam Map<String, Object> params){
PageData<MemoDifficultyDTO> page = memoDifficultyService.page(params);
public Result<PageData<MemoDifficultyDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoDifficultyFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
PageData<MemoDifficultyDTO> page = memoDifficultyService.page(formDTO);
return new Result<PageData<MemoDifficultyDTO>>().ok(page);
}
@ -43,18 +66,18 @@ public class MemoDifficultyController {
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoDifficultyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
public Result save(@LoginUser TokenDto tokenDTO, @RequestBody AddMemoDifficultyFromDTO dto){
ValidatorUtils.validateEntity(dto, AddMemoDifficultyFromDTO.AddMemoDifficulty.class);
dto.setCustomerId(tokenDTO.getCustomerId());
dto.setUserId(tokenDTO.getUserId());
memoDifficultyService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoDifficultyDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
public Result update(@LoginUser TokenDto tokenDTO, @RequestBody AddMemoDifficultyFromDTO dto){
dto.setCustomerId(tokenDTO.getCustomerId());
memoDifficultyService.update(dto);
return new Result();
}
@ -67,6 +90,92 @@ public class MemoDifficultyController {
return new Result();
}
@PostMapping("detail")
public Result<AddMemoDifficultyFromDTO> detail(@RequestBody MemoDifficultyDetailFromDTO fromDTO){
return new Result<AddMemoDifficultyFromDTO>().ok(memoDifficultyService.detail(fromDTO));
}
@PostMapping("/{id}/exportWord")
public void exportWord(@PathVariable("id") String id, HttpServletResponse response) throws Exception {
String templateFilePath = loadTemplate("memo_difficulty_export_template.docx");
MemoDifficultyDTO data = memoDifficultyService.get(id);
if (data == null) {
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未找到id为" + id + "的难点堵点项", "未找到该难点堵点项");
}
Map<String, Object> map = BeanUtil.beanToMap(data);
String createTimeStr = DateUtils.format(data.getCreatedTime(), "yyyy年MM月dd日 HH:mm");
map.put("createTime", createTimeStr);
String scheduledTimeStr = DateUtils.format(data.getScheduledTime(), "yyyy年MM月dd日 HH:mm");
map.put("scheduledTime", scheduledTimeStr);
XWPFDocument doc = WordExportUtil.exportWord07(templateFilePath, map);
String suffix = templateFilePath.substring(templateFilePath.lastIndexOf("."));
response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;fileName=工作日志导入模板" + suffix);
ServletOutputStream fos = null;
try {
fos = response.getOutputStream();
doc.write(fos);
} finally {
if (fos != null) {
fos.close();
}
}
}
/**
* 加载模板
* @param templateFileName
* @return
* @throws IOException
*/
private String loadTemplate(String templateFileName) throws IOException {
String homeDir = System.getProperty("user.home");
Path templates = Paths.get(homeDir, "epmet_files", "templates");
if (Files.notExists(templates)) {
Files.createDirectories(templates);
}
Path templateFilePath = templates.resolve(templateFileName);
String templateFilePathStr = templateFilePath.toString();
if (Files.exists(templateFilePath)) {
return templateFilePathStr;
}
// 将项目中的模板拷贝至用户家目录中
OutputStream os = null;
InputStream is = null;
try {
is = this.getClass().getClassLoader().getResourceAsStream("templates/" + templateFileName);
os = new FileOutputStream(templateFilePathStr);
IOUtils.copy(is, os);
} finally {
try {
if (is != null) {
is.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输入流出错:{}", errorMsg);
}
try {
if (os != null) {
os.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输出流出错:{}", errorMsg);
}
}
return templateFilePathStr;
}
}

116
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/MemoWorkDiaryController.java

@ -1,7 +1,13 @@
package com.epmet.controller;
import cn.afterturn.easypoi.word.WordExportUtil;
import cn.hutool.core.bean.BeanUtil;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -9,11 +15,28 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.MemoWorkDiaryDTO;
import com.epmet.dto.form.MemoWorkDiaryFormDTO;
import com.epmet.service.MemoWorkDiaryService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.web.bind.annotation.*;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
/**
@ -22,6 +45,7 @@ import java.util.Map;
* @author generator generator@elink-cn.com
* @since v1.0.0 2022-03-15
*/
@Slf4j
@RestController
@RequestMapping("memoWorkDiary")
public class MemoWorkDiaryController {
@ -30,31 +54,35 @@ public class MemoWorkDiaryController {
private MemoWorkDiaryService memoWorkDiaryService;
@RequestMapping("page")
public Result<PageData<MemoWorkDiaryDTO>> page(@RequestParam Map<String, Object> params){
PageData<MemoWorkDiaryDTO> page = memoWorkDiaryService.page(params);
public Result<PageData<MemoWorkDiaryDTO>> page(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryFormDTO formDTO){
formDTO.setUserId(tokenDto.getUserId());
PageData<MemoWorkDiaryDTO> page = memoWorkDiaryService.page(formDTO);
return new Result<PageData<MemoWorkDiaryDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoWorkDiaryDTO> get(@PathVariable("id") String id){
MemoWorkDiaryDTO data = memoWorkDiaryService.get(id);
@RequestMapping(method = {RequestMethod.POST,RequestMethod.GET})
public Result<MemoWorkDiaryDTO> get(@RequestBody MemoWorkDiaryFormDTO formDTO){
MemoWorkDiaryDTO data = memoWorkDiaryService.get(formDTO);
return new Result<MemoWorkDiaryDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody MemoWorkDiaryDTO dto){
public Result save(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
dto.setCreatedBy(tokenDto.getUserId());
memoWorkDiaryService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody MemoWorkDiaryDTO dto){
public Result update(@LoginUser TokenDto tokenDto, @RequestBody MemoWorkDiaryDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
dto.setCustomerId(tokenDto.getCustomerId());
memoWorkDiaryService.update(dto);
return new Result();
}
@ -67,6 +95,80 @@ public class MemoWorkDiaryController {
return new Result();
}
@PostMapping("/{id}/exportWord")
public void exportWord(@PathVariable("id") String id, HttpServletResponse response) throws Exception {
String templateFilePath = loadTemplate("memo_work_diary_export_template.docx");
MemoWorkDiaryFormDTO form = new MemoWorkDiaryFormDTO();
form.setId(id);
MemoWorkDiaryDTO data = memoWorkDiaryService.get(form);
Map<String, Object> map = BeanUtil.beanToMap(data);
String createTimeStr = DateUtils.format(data.getCreatedTime(), "yyyy年MM月dd日 HH:mm");
map.put("createTime", createTimeStr);
XWPFDocument doc = WordExportUtil.exportWord07(templateFilePath, map);
String suffix = templateFilePath.substring(templateFilePath.lastIndexOf("."));
response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition");
response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;fileName=工作日志导入模板" + suffix);
ServletOutputStream fos = null;
try {
fos = response.getOutputStream();
doc.write(fos);
} finally {
if (fos != null) {
fos.close();
}
}
}
/**
* 加载模板
* @param templateFileName
* @return
* @throws IOException
*/
private String loadTemplate(String templateFileName) throws IOException {
String homeDir = System.getProperty("user.home");
Path templates = Paths.get(homeDir, "epmet_files", "templates");
if (Files.notExists(templates)) {
Files.createDirectories(templates);
}
Path templateFilePath = templates.resolve(templateFileName);
String templateFilePathStr = templateFilePath.toString();
if (Files.exists(templateFilePath)) {
return templateFilePathStr;
}
// 将项目中的模板拷贝至用户家目录中
OutputStream os = null;
InputStream is = null;
try {
is = this.getClass().getClassLoader().getResourceAsStream("templates/" + templateFileName);
os = new FileOutputStream(templateFilePathStr);
IOUtils.copy(is, os);
} finally {
try {
if (is != null) {
is.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输入流出错:{}", errorMsg);
}
try {
if (os != null) {
os.close();
}
} catch (IOException e) {
String errorMsg = ExceptionUtils.getThrowableErrorStackTrace(e);
log.error("【导出工作日志doc】关闭输出流出错:{}", errorMsg);
}
}
return templateFilePathStr;
}
}

11
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<Boolean> eventAuditReset(@RequestParam("gridId")String gridId){
return new Result<Boolean>().ok(projectService.eventAuditReset(gridId));
}
}

18
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoAttrDao.java

@ -1,8 +1,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.result.MemosToRemindResultDTO;
import com.epmet.entity.MemoAttrEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
/**
* 备忘录-属性表
@ -12,5 +17,16 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoAttrDao extends BaseDao<MemoAttrEntity> {
/**
* @Author sun
* @Description 查询提醒内容列表有时间的按时间查询没有的查询当前日期之前的数据
**/
List<MemosToRemindResultDTO> memosToRemind(@Param("remindTime") String remindTime, @Param("userId") String userId);
/**
* @Author sun
* @Description 查询某个人当前日期之后当日0点之前待提醒时间节点列表
**/
List<String> memoTime(@Param("userId") String userId);
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoConcernDao.java

@ -1,9 +1,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.MemoConcernDTO;
import com.epmet.dto.form.MemoConcernFormDTO;
import com.epmet.entity.MemoConcernEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 备忘录-人文关怀
*
@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoConcernDao extends BaseDao<MemoConcernEntity> {
/**
* 查询列表
*
* @Param formDTO
* @Return {@link List < MemoConcernDTO>}
* @Author zhaoqifeng
* @Date 2022/3/15 15:31
*/
List<MemoConcernDTO> getPage(MemoConcernFormDTO formDTO);
}

16
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoDifficultyDao.java

@ -1,8 +1,15 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.MemoDifficultyDTO;
import com.epmet.dto.MemoWorkDiaryDTO;
import com.epmet.dto.form.AddMemoDifficultyFromDTO;
import com.epmet.dto.form.MemoDifficultyFormDTO;
import com.epmet.entity.MemoDifficultyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 备忘录-难点读点
@ -12,5 +19,12 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoDifficultyDao extends BaseDao<MemoDifficultyEntity> {
/**
* 难点堵点查询列表
* @Author sun
*/
List<MemoDifficultyDTO> getPage(MemoDifficultyFormDTO formDTO);
AddMemoDifficultyFromDTO selectByDifficutyId(@Param("id") String id);
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/MemoWorkDiaryDao.java

@ -1,9 +1,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.MemoWorkDiaryDTO;
import com.epmet.dto.form.MemoWorkDiaryFormDTO;
import com.epmet.entity.MemoWorkDiaryEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 备忘录-工作日志
*
@ -12,5 +16,15 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface MemoWorkDiaryDao extends BaseDao<MemoWorkDiaryEntity> {
/**
* 查询列表
*
* @Param formDTO
* @Return {@link List< MemoWorkDiaryDTO>}
* @Author zhaoqifeng
* @Date 2022/3/15 15:31
*/
List<MemoWorkDiaryDTO> getPage(MemoWorkDiaryFormDTO formDTO);
}

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java

@ -283,4 +283,13 @@ public interface ProjectDao extends BaseDao<ProjectEntity> {
* @Date 2022/1/12 17:05
*/
List<ProjectEntity> 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);
}

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoAttachmentEntity.java

@ -1,5 +1,7 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
@ -24,7 +26,7 @@ public class MemoAttachmentEntity extends BaseEpmetEntity {
private String customerId;
/**
* REMIND_MSG.ID
* REMIND_MSG.ID 业务(工作日志难点堵点人员关怀)表Id
*/
private String remindMsgId;
@ -68,4 +70,9 @@ public class MemoAttachmentEntity extends BaseEpmetEntity {
*/
private Integer sort;
/**
* 物理删除
*/
@TableField(fill = FieldFill.INSERT)
private String delFlag;
}

7
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoConcernEntity.java

@ -38,7 +38,7 @@ public class MemoConcernEntity extends BaseEpmetEntity {
/**
* 关怀对象电话
*/
private String phnoe;
private String phone;
/**
* 关怀对象地址
@ -65,9 +65,4 @@ public class MemoConcernEntity extends BaseEpmetEntity {
*/
private Integer status;
/**
* 提醒时间
*/
private Date remindTime;
}

5
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoDifficultyEntity.java

@ -45,9 +45,4 @@ public class MemoDifficultyEntity extends BaseEpmetEntity {
*/
private Date scheduledTime;
/**
* 提醒时间
*/
private Date remindTime;
}

5
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/MemoWorkDiaryEntity.java

@ -35,9 +35,4 @@ public class MemoWorkDiaryEntity extends BaseEpmetEntity {
*/
private String content;
/**
* 提醒时间
*/
private Date remindTime;
}

20
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttachmentService.java

@ -75,4 +75,24 @@ public interface MemoAttachmentService extends BaseService<MemoAttachmentEntity>
* @date 2022-03-15
*/
void delete(String[] ids);
/**
* 根据备忘录ID查询附件
*
* @Param memoId
* @Return {@link List< MemoAttachmentDTO>}
* @Author zhaoqifeng
* @Date 2022/3/15 15:56
*/
List<MemoAttachmentDTO> getListByMemoId(String memoId);
/**
* 根据备忘录ID删除附件
*
* @Param memoId
* @Return
* @Author zhaoqifeng
* @Date 2022/3/15 15:57
*/
void deleteByMemoId(String memoId);
}

20
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoAttrService.java

@ -3,6 +3,8 @@ 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.dto.form.MemosToRemindFormDTO;
import com.epmet.dto.result.MemosToRemindResultDTO;
import com.epmet.entity.MemoAttrEntity;
import java.util.List;
@ -75,4 +77,22 @@ public interface MemoAttrService extends BaseService<MemoAttrEntity> {
* @date 2022-03-15
*/
void delete(String[] ids);
/**
* @Author sun
* @Description 书记日志-待提醒弹框-提醒内容列表
**/
List<MemosToRemindResultDTO> memosToRemind(MemosToRemindFormDTO formDTO);
/**
* @Author sun
* @Description 书记日志-待提醒时间列表
**/
List<String> memoTime(String userId);
/**
* @Author sun
* @Description 书记日志-提醒列表-我知道了
**/
void setReaded(String memoId);
}

8
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoConcernService.java

@ -3,10 +3,10 @@ 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.dto.form.MemoConcernFormDTO;
import com.epmet.entity.MemoConcernEntity;
import java.util.List;
import java.util.Map;
/**
* 备忘录-人文关怀
@ -24,7 +24,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
PageData<MemoConcernDTO> page(Map<String, Object> params);
PageData<MemoConcernDTO> page(MemoConcernFormDTO formDTO);
/**
* 默认查询
@ -34,7 +34,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
List<MemoConcernDTO> list(Map<String, Object> params);
List<MemoConcernDTO> list(MemoConcernFormDTO formDTO);
/**
* 单条查询
@ -44,7 +44,7 @@ public interface MemoConcernService extends BaseService<MemoConcernEntity> {
* @author generator
* @date 2022-03-15
*/
MemoConcernDTO get(String id);
MemoConcernDTO get(MemoConcernFormDTO formDTO);
/**
* 默认保存

16
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoDifficultyService.java

@ -3,6 +3,9 @@ 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.dto.form.AddMemoDifficultyFromDTO;
import com.epmet.dto.form.MemoDifficultyFormDTO;
import com.epmet.dto.form.MemoDifficultyDetailFromDTO;
import com.epmet.entity.MemoDifficultyEntity;
import java.util.List;
@ -24,7 +27,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
* @author generator
* @date 2022-03-15
*/
PageData<MemoDifficultyDTO> page(Map<String, Object> params);
PageData<MemoDifficultyDTO> page(MemoDifficultyFormDTO formDTO);
/**
* 默认查询
@ -54,7 +57,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
* @author generator
* @date 2022-03-15
*/
void save(MemoDifficultyDTO dto);
void save(AddMemoDifficultyFromDTO dto);
/**
* 默认更新
@ -64,7 +67,7 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
* @author generator
* @date 2022-03-15
*/
void update(MemoDifficultyDTO dto);
void update(AddMemoDifficultyFromDTO dto);
/**
* 批量删除
@ -75,4 +78,11 @@ public interface MemoDifficultyService extends BaseService<MemoDifficultyEntity>
* @date 2022-03-15
*/
void delete(String[] ids);
/**
* 详情接口
* @author generator
* @date 2022-03-15
*/
AddMemoDifficultyFromDTO detail(MemoDifficultyDetailFromDTO fromDTO);
}

14
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/MemoWorkDiaryService.java

@ -3,10 +3,10 @@ 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.dto.form.MemoWorkDiaryFormDTO;
import com.epmet.entity.MemoWorkDiaryEntity;
import java.util.List;
import java.util.Map;
/**
* 备忘录-工作日志
@ -19,32 +19,32 @@ public interface MemoWorkDiaryService extends BaseService<MemoWorkDiaryEntity> {
/**
* 默认分页
*
* @param params
* @param formDTO
* @return PageData<MemoWorkDiaryDTO>
* @author generator
* @date 2022-03-15
*/
PageData<MemoWorkDiaryDTO> page(Map<String, Object> params);
PageData<MemoWorkDiaryDTO> page(MemoWorkDiaryFormDTO formDTO);
/**
* 默认查询
*
* @param params
* @param formDTO
* @return java.util.List<MemoWorkDiaryDTO>
* @author generator
* @date 2022-03-15
*/
List<MemoWorkDiaryDTO> list(Map<String, Object> params);
List<MemoWorkDiaryDTO> list(MemoWorkDiaryFormDTO formDTO);
/**
* 单条查询
*
* @param id
* @param formDTO
* @return MemoWorkDiaryDTO
* @author generator
* @date 2022-03-15
*/
MemoWorkDiaryDTO get(String id);
MemoWorkDiaryDTO get(MemoWorkDiaryFormDTO formDTO);
/**
* 默认保存

9
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java

@ -376,4 +376,13 @@ public interface ProjectService extends BaseService<ProjectEntity> {
* @Date 2022/1/4 16:27
*/
PageData<ApprovaledListResultDTO> approvaledList(ApprovaledListFromDTO formDTO);
/**
* Desc: 查询群众直报是否存在处理中的true存在false不存在
* @param gridId
* @author zxc
* @date 2022/3/15 5:05 下午
*/
Boolean eventAuditReset(String gridId);
}

40
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttachmentServiceImpl.java

@ -1,5 +1,6 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@ -10,11 +11,13 @@ import com.epmet.dao.MemoAttachmentDao;
import com.epmet.dto.MemoAttachmentDTO;
import com.epmet.entity.MemoAttachmentEntity;
import com.epmet.service.MemoAttachmentService;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@ -80,4 +83,41 @@ public class MemoAttachmentServiceImpl extends BaseServiceImpl<MemoAttachmentDao
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* 根据备忘录ID查询附件
*
* @param memoId
* @Param memoId
* @Return {@link List< MemoAttachmentDTO>}
* @Author zhaoqifeng
* @Date 2022/3/15 15:56
*/
@Override
public List<MemoAttachmentDTO> getListByMemoId(String memoId) {
LambdaQueryWrapper<MemoAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MemoAttachmentEntity::getRemindMsgId, memoId);
wrapper.orderByAsc(MemoAttachmentEntity::getSort);
List<MemoAttachmentEntity> list = baseDao.selectList(wrapper);
if (CollectionUtils.isEmpty(list)) {
return Collections.emptyList();
}
return ConvertUtils.sourceToTarget(list, MemoAttachmentDTO.class);
}
/**
* 根据备忘录ID删除附件
*
* @param memoId
* @Param memoId
* @Return
* @Author zhaoqifeng
* @Date 2022/3/15 15:57
*/
@Override
public void deleteByMemoId(String memoId) {
LambdaQueryWrapper<MemoAttachmentEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(MemoAttachmentEntity::getRemindMsgId, memoId);
baseDao.delete(wrapper);
}
}

44
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/MemoAttrServiceImpl.java

@ -4,12 +4,16 @@ 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.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.MemoAttrDao;
import com.epmet.dto.MemoAttrDTO;
import com.epmet.dto.form.MemosToRemindFormDTO;
import com.epmet.dto.result.MemosToRemindResultDTO;
import com.epmet.entity.MemoAttrEntity;
import com.epmet.service.MemoAttrService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -25,6 +29,7 @@ import java.util.Map;
* @since v1.0.0 2022-03-15
*/
@Service
@Slf4j
public class MemoAttrServiceImpl extends BaseServiceImpl<MemoAttrDao, MemoAttrEntity> implements MemoAttrService {
@ -44,8 +49,8 @@ public class MemoAttrServiceImpl extends BaseServiceImpl<MemoAttrDao, MemoAttrEn
return ConvertUtils.sourceToTarget(entityList, MemoAttrDTO.class);
}
private QueryWrapper<MemoAttrEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<MemoAttrEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<MemoAttrEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -80,4 +85,39 @@ public class MemoAttrServiceImpl extends BaseServiceImpl<MemoAttrDao, MemoAttrEn
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @Author sun
* @Description 书记日志-待提醒弹框-提醒内容列表
**/
@Override
public List<MemosToRemindResultDTO> memosToRemind(MemosToRemindFormDTO formDTO) {
//1.查询提醒内容列表,有时间的按时间查询,没有的查询当前日期之前的数据
List<MemosToRemindResultDTO> resultList = baseDao.memosToRemind(formDTO.getRemindTime(), formDTO.getUserId());
return resultList;
}
/**
* @Author sun
* @Description 书记日志-待提醒时间列表
**/
@Override
public List<String> memoTime(String userId) {
List<String> resultList = baseDao.memoTime(userId);
return resultList;
}
/**
* @Author sun
* @Description 书记日志-提醒列表-我知道了
**/
@Override
public void setReaded(String memoId) {
MemoAttrEntity entity = new MemoAttrEntity();
entity.setId(memoId);
entity.setReadFlag(NumConstant.ONE);
if (baseDao.updateById(entity) < NumConstant.ONE) {
log.warn(String.format("书记日志-提醒列表-修改阅读状态失败,提醒记录Id", memoId));
}
}
}

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save