Browse Source

Merge remote-tracking branch 'origin/dev' into dev

master
wangchao 5 years ago
parent
commit
0aabfd2edc
  1. 2
      epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml
  3. 2
      epmet-admin/epmet-admin-server/pom.xml
  4. 2
      epmet-auth/deploy/docker-compose-dev.yml
  5. 2
      epmet-auth/deploy/docker-compose-test.yml
  6. 2
      epmet-auth/pom.xml
  7. 9
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
  8. 4
      epmet-gateway/pom.xml
  9. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml
  10. 2
      epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml
  11. 2
      epmet-module/epmet-job/epmet-job-server/pom.xml
  12. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  13. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  14. 12
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
  15. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml
  16. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
  17. 2
      epmet-module/gov-access/gov-access-server/pom.xml
  18. 2
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
  19. 67
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
  20. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml
  21. 2
      epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml
  22. 2
      epmet-module/gov-grid/gov-grid-server/pom.xml
  23. 2
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java
  24. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
  25. 2
      epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml
  26. 2
      epmet-module/gov-issue/gov-issue-server/pom.xml
  27. 13
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java
  28. 8
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java
  29. 9
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueService.java
  30. 13
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  31. 10
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java
  32. 11
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
  33. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml
  34. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml
  35. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  36. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml
  37. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml
  38. 2
      epmet-module/gov-org/gov-org-server/pom.xml
  39. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
  40. 21
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
  41. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/AgencyService.java
  42. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
  43. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
  44. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml
  45. 2
      epmet-module/gov-project/gov-project-server/pom.xml
  46. 2
      epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml
  47. 5
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java
  48. 5
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java
  49. 5
      epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java
  50. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
  51. 2
      epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
  52. 2
      epmet-module/oper-crm/oper-crm-server/pom.xml
  53. 2
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
  54. 5
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java
  55. 3
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java
  56. 33
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
  57. 7
      epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml
  58. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
  59. 2
      epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
  60. 2
      epmet-module/oper-customize/oper-customize-server/pom.xml
  61. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  62. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  63. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  64. 9
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java
  65. 6
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java
  66. 119
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  67. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  68. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml
  69. 2
      epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml
  70. 2
      epmet-module/resi-guide/resi-guide-server/pom.xml
  71. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml
  72. 2
      epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml
  73. 2
      epmet-module/resi-hall/resi-hall-server/pom.xml
  74. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml
  75. 2
      epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml
  76. 2
      epmet-module/resi-home/resi-home-server/pom.xml
  77. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml
  78. 2
      epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml
  79. 2
      epmet-module/resi-mine/resi-mine-server/pom.xml
  80. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml
  81. 2
      epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml
  82. 2
      epmet-module/resi-partymember/resi-partymember-server/pom.xml
  83. 5
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java
  84. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  85. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  86. 2
      epmet-user/epmet-user-server/pom.xml
  87. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java
  88. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java
  89. 13
      epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java
  90. 1
      epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

2
epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-admin-server: epmet-admin-server:
container_name: epmet-admin-server-dev container_name: epmet-admin-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.9 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.10
ports: ports:
- "8082:8082" - "8082:8082"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-admin-server: epmet-admin-server:
container_name: epmet-admin-server-test container_name: epmet-admin-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.9 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-admin-server:0.3.10
ports: ports:
- "8082:8082" - "8082:8082"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-admin/epmet-admin-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.9</version> <version>0.3.10</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-admin</artifactId> <artifactId>epmet-admin</artifactId>

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-dev container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.12 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.13
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-test container_name: epmet-auth-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.12 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.13
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.12</version> <version>0.3.13</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

9
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@ -204,4 +204,13 @@ public class RedisKeys {
public static String getRoleAllOpeScopesKey(String roleId) { public static String getRoleAllOpeScopesKey(String roleId) {
return rootPrefix.concat("gov:access:role:allopescopes:").concat(roleId); return rootPrefix.concat("gov:access:role:allopescopes:").concat(roleId);
} }
/**
* 政府端机关单位缓存Key
* @param agencyId
* @return
*/
public static String getAgencyByIdKey(String agencyId) {
return rootPrefix.concat("gov:agency:").concat(agencyId);
}
} }

4
epmet-gateway/pom.xml

@ -108,8 +108,8 @@
<nacos.ip></nacos.ip> <nacos.ip></nacos.ip>
<!-- gateway routes --> <!-- gateway routes -->
<!-- 1、认证服务 --> <!-- 1、认证服务 -->
<gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri> <!-- <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>-->
<!-- <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>--> <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
<!-- 2、Admin服务 --> <!-- 2、Admin服务 -->
<gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri> <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
<!-- 4、OSS服务 --> <!-- 4、OSS服务 -->

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-job-server: epmet-job-server:
container_name: epmet-job-server-dev container_name: epmet-job-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.3 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.4
ports: ports:
- "8084:8084" - "8084:8084"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-job-server: epmet-job-server:
container_name: epmet-job-server-test container_name: epmet-job-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.2 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-job-server:0.3.4
ports: ports:
- "8084:8084" - "8084:8084"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-job/epmet-job-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.3</version> <version>0.3.4</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-job</artifactId> <artifactId>epmet-job</artifactId>

2
epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@ -3,7 +3,7 @@ services:
epmet-oss-server: epmet-oss-server:
container_name: epmet-oss-server-dev container_name: epmet-oss-server-dev
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2 # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.9 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.10
ports: ports:
- "8083:8083" - "8083:8083"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.9</version> <version>0.3.10</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId> <artifactId>epmet-oss</artifactId>

12
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -136,4 +136,16 @@ public class OssController {
public Result<UploadImgResultDTO> uploadImg(@RequestParam("file") MultipartFile file) { public Result<UploadImgResultDTO> uploadImg(@RequestParam("file") MultipartFile file) {
return ossService.uploadImg(file); return ossService.uploadImg(file);
} }
/**
* 上传客户logo(考虑到以后可能会针对不同的业务有不同的限制条件这里不再使用通用的接口
* 针对每一个业务新建上传接口)
* @param file
* @return
*/
@PostMapping("customerlogo/upload")
public Result uploadCustomerLogo(@RequestParam("file") MultipartFile file) {
return ossService.uploadImg(file);
}
} }

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-access-server: gov-access-server:
container_name: gov-access-server-dev container_name: gov-access-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.14 image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.20
ports: ports:
- "8099:8099" - "8099:8099"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-access-server: gov-access-server:
container_name: gov-access-server-test container_name: gov-access-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.18
ports: ports:
- "8099:8099" - "8099:8099"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-access/gov-access-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.14</version> <version>0.3.20</version>
<parent> <parent>
<artifactId>gov-access</artifactId> <artifactId>gov-access</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @Description * @Description
* @Author sun * @Author sun
*/ */
//, url = "localhost:8092" //@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092")
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient { public interface GovOrgFeignClient {

67
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java

@ -7,6 +7,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.GovTokenDto; import com.epmet.commons.tools.security.dto.GovTokenDto;
import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.OperationScopeConstant; import com.epmet.constant.OperationScopeConstant;
@ -55,9 +56,13 @@ public class AccessServiceImpl implements AccessService {
@Autowired @Autowired
private EpmetUserFeignClient userFeignClient; private EpmetUserFeignClient userFeignClient;
@Autowired
private LoginUserUtil loginUserUtil;
public static final String ORG_RELATION_SAME = "same"; public static final String ORG_RELATION_SAME = "same";
public static final String ORG_RELATION_SUB = "sub"; public static final String ORG_RELATION_SUB = "sub";
public static final String ORG_RELATION_SUP = "sup"; public static final String ORG_RELATION_SUP = "sup";
public static final String ORG_PATH_SEPARATOR = ":";
/** /**
* 更新权限缓存 * 更新权限缓存
@ -448,28 +453,42 @@ public class AccessServiceImpl implements AccessService {
@Override @Override
public Set<String> listOperationPermissions(String staffId, String currAgencyId) { public Set<String> listOperationPermissions(String staffId, String currAgencyId) {
// 1.拿到所属组织机构信息 GovTokenDto userDetails = getUserDetails(loginUserUtil.getLoginUserApp(), loginUserUtil.getLoginUserClient(), loginUserUtil.getLoginUserId());
Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId); if (userDetails == null) {
if (!agencyByStaffRst.success()) { throw new RenException(EpmetErrorCode.ERR10006.getCode(), EpmetErrorCode.ERR10006.getMsg());
logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg());
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
} }
CustomerAgencyDTO belongAgency = agencyByStaffRst.getData();
if (belongAgency == null) { // 1.拿到所属组织机构信息
logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId); String belongAgencyId = getBelongAgencyFromOrgIdPath(userDetails.getOrgIdPath());
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); Result<CustomerAgencyDTO> belongAgencyRst = govOrgFeignClient.getAgencyById(belongAgencyId);
if (!belongAgencyRst.success()) {
throw new RenException("查询用户的操作权限列表:调用GovOrg,根据belongAgencyId查询机构信息失败:".concat(belongAgencyRst.getInternalMsg()));
} }
CustomerAgencyDTO belongAgency = belongAgencyRst.getData();
//Result<CustomerAgencyDTO> agencyByStaffRst = govOrgFeignClient.getAgencyByStaff(staffId);
//if (!agencyByStaffRst.success()) {
// logger.error("根据StaffId查询所属单位出错,StaffId:{}, 错误信息:{}", staffId, agencyByStaffRst.getMsg());
// throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
//}
//CustomerAgencyDTO belongAgency = agencyByStaffRst.getData();
//if (belongAgency == null) {
// logger.error("根据StaffId查询所属单位结果为空,StaffId:{}", staffId);
// throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
//}
// 2.拿到当前所处机关单位信息 // 2.拿到当前所处机关单位信息
Result<CustomerAgencyDTO> currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId); Result<CustomerAgencyDTO> currAgencyRst = govOrgFeignClient.getAgencyById(currAgencyId);
CustomerAgencyDTO currAgencyDto = currAgencyRst.getData(); CustomerAgencyDTO currAgencyDto = currAgencyRst.getData();
if (!currAgencyRst.success() || currAgencyDto == null) { if (!currAgencyRst.success() || currAgencyDto == null) {
logger.error("根据当前机构id[{}]查询pids失败:{}", currAgencyId, currAgencyRst.getMsg()); throw new RenException(String.format("根据当前机构id[%s]查询pids失败:%s", currAgencyId, currAgencyRst.getMsg()));
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
} }
// 查询机关单位中的角色 // 获取机关单位中的角色
List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId()); // 目前一个人只在一个单位下,所以不动态查询,如果后面需要一个人在多个单位,再改这里
//List<GovStaffRoleDTO> roleDTOS = queryGovStaffRoles(staffId, belongAgency.getId());
Set<String> roleIdList = userDetails.getRoleIdList();
// 当前组织和所属组织的orgId路径,以及他们的上下级关系 // 当前组织和所属组织的orgId路径,以及他们的上下级关系
String belongOrgIdPath = getOrgIdPath(belongAgency); String belongOrgIdPath = getOrgIdPath(belongAgency);
@ -478,13 +497,27 @@ public class AccessServiceImpl implements AccessService {
Set<String> filtedOps = new HashSet<>(); Set<String> filtedOps = new HashSet<>();
roleDTOS.forEach(roleDTO -> { if (!CollectionUtils.isEmpty(roleIdList)) {
List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleDTO.getId()); roleIdList.forEach(roleId -> {
filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO)); List<RoleOpeScopeResultDTO> opeAndScopeDTO = listAllRoleOperationScopesByRoleId(roleId);
}); filtedOps.addAll(filterOpesByScope(currOrgRelation, opeAndScopeDTO));
});
}
return filtedOps; return filtedOps;
} }
/**
* 从OrgIdPath中取所属机构(即最后一截)
* @param orgIdPath
* @return
*/
private String getBelongAgencyFromOrgIdPath(String orgIdPath) {
if (!orgIdPath.contains(ORG_PATH_SEPARATOR)) {
return orgIdPath;
}
return orgIdPath.substring(orgIdPath.lastIndexOf(ORG_PATH_SEPARATOR) + 1);
}
/** /**
* 获取当前所处机关与所属机关的关系 * 获取当前所处机关与所属机关的关系
*/ */

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-dev container_name: gov-grid-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.23 image: 192.168.1.130:10080/epmet-cloud-dev/gov-grid-server:0.3.24
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-grid-server: gov-grid-server:
container_name: gov-grid-server-test container_name: gov-grid-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.23 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-grid-server:0.3.24
ports: ports:
- "8097:8097" - "8097:8097"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-grid/gov-grid-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.23</version> <version>0.3.24</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-grid</artifactId> <artifactId>gov-grid</artifactId>

2
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/LatestIssueListResultDTO.java

@ -28,7 +28,7 @@ public class LatestIssueListResultDTO implements Serializable {
/** /**
* 用户头像 * 用户头像
*/ */
private String staffHeadPhoto = ""; private String userHeadPhoto = "";
/** /**
* 议题发起人XX路-XX先生/女士 * 议题发起人XX路-XX先生/女士
* *

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-dev container_name: gov-issue-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.27 image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.30
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-issue-server: gov-issue-server:
container_name: gov-issue-server-test container_name: gov-issue-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.26 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-issue-server:0.3.30
ports: ports:
- "8101:8101" - "8101:8101"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-issue/gov-issue-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.27</version> <version>0.3.30</version>
<parent> <parent>
<artifactId>gov-issue</artifactId> <artifactId>gov-issue</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

13
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueController.java

@ -13,8 +13,10 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.excel.IssueExcel; import com.epmet.excel.IssueExcel;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import com.epmet.service.IssueService; import com.epmet.service.IssueService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -138,5 +140,16 @@ public class IssueController {
return new Result<List<LatestIssueListResultDTO>>().ok(issueService.getNewestIssueList(formDTO)); return new Result<List<LatestIssueListResultDTO>>().ok(issueService.getNewestIssueList(formDTO));
} }
/**
* @Description 校验话题是否已转议题
* @param formDTO
* @author zxc
*/
@PostMapping(value = "checktopicshiftissue")
public Result<Integer> checkTopicShiftIssue(@RequestBody TopicInfoFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return new Result<Integer>().ok(issueService.checkTopicShiftIssue(formDTO));
}
} }

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

@ -22,6 +22,7 @@ import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueEntity;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -136,4 +137,11 @@ public interface IssueDao extends BaseDao<IssueEntity> {
* @date 2020.05.22 00:36 * @date 2020.05.22 00:36
**/ **/
Set<IssueDTO> selectIssueIdsByCondition(IssueDTO issueDTO); Set<IssueDTO> selectIssueIdsByCondition(IssueDTO issueDTO);
/**
* @Description 校验话题是否已转议题
* @param formDTO
* @author zxc
*/
Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
} }

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

@ -2,6 +2,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueDTO;
import com.epmet.dto.form.CloseIssueFormDTO; import com.epmet.dto.form.CloseIssueFormDTO;
import com.epmet.dto.form.DepartmentStaffListFormDTO; import com.epmet.dto.form.DepartmentStaffListFormDTO;
@ -20,6 +21,7 @@ import com.epmet.dto.form.IssueDetailFormDTO;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueEntity;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import java.util.List; import java.util.List;
@ -223,4 +225,11 @@ public interface IssueService extends BaseService<IssueEntity> {
* @date 2020.05.22 00:36 * @date 2020.05.22 00:36
**/ **/
Set<IssueDTO> getIssueIdsByCondition(IssueDTO issueDTO); Set<IssueDTO> getIssueIdsByCondition(IssueDTO issueDTO);
/**
* @Description 校验话题是否已转议题
* @param formDTO
* @author zxc
*/
Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO);
} }

13
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -31,6 +31,7 @@ import com.epmet.feign.*;
import com.epmet.redis.GovIssueRedis; import com.epmet.redis.GovIssueRedis;
import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO;
import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO;
import com.epmet.service.IssueProcessService; import com.epmet.service.IssueProcessService;
import com.epmet.service.IssueProjectRelationService; import com.epmet.service.IssueProjectRelationService;
@ -677,7 +678,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000); resultDTO.setCreateIssueTime(issue.getCreatedTime().getTime()/1000);
userInfoList.forEach(user -> { userInfoList.forEach(user -> {
if (issue.getCreatedBy().equals(user.getUserId())) { if (issue.getCreatedBy().equals(user.getUserId())) {
resultDTO.setStaffHeadPhoto(user.getHeadPhoto()); resultDTO.setUserHeadPhoto(user.getHeadPhoto());
//话题发起人昵称 //话题发起人昵称
resultDTO.setIssuePublisherName(user.getShowName()); resultDTO.setIssuePublisherName(user.getShowName());
} }
@ -706,4 +707,14 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
return baseDao.selectIssueIdsByCondition(issueDTO); return baseDao.selectIssueIdsByCondition(issueDTO);
} }
/**
* @Description 校验话题是否已转议题
* @param formDTO
* @author zxc
*/
@Override
public Integer checkTopicShiftIssue(TopicInfoFormDTO formDTO) {
return baseDao.checkTopicShiftIssue(formDTO);
}
} }

10
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@ -168,21 +168,24 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
*/ */
@Override @Override
public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) { public VotingTrendResultDTO votingTrend(IssueIdFormDTO issueId) {
//缓存获取议题表决详情
VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId()); VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId());
VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO(); VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO();
BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO); BeanUtils.copyProperties(voteRedisFormDTO, votingTrendResultDTO);
votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount()); votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount() + voteRedisFormDTO.getOppositionAmount());
//DB获取表决 日统计详情
List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId); List<PolyLineDTO> polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId);
PolyLineDTO polyLineDTO = new PolyLineDTO(); PolyLineDTO polyLineDTO = new PolyLineDTO();
polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"))); polyLineDTO.setVoteDate(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")));
//议题 已转项目 或 已结案 的时间
String date = issueDao.operateTime(issueId.getIssueId());
//今天刚转项目或刚刚关闭,当天数据DB没有,直接从缓存拿 //今天刚转项目或刚刚关闭,当天数据DB没有,直接从缓存拿
if (polyLineDTOS.size() == NumConstant.ZERO) { if (polyLineDTOS.size() == NumConstant.ZERO && date.equals(LocalDate.now().toString())) {
polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount()); polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());
polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount()); polyLineDTO.setOppositionIncrement(voteRedisFormDTO.getOppositionAmount());
polyLineDTOS.add(polyLineDTO); polyLineDTOS.add(polyLineDTO);
} else { } else {
//折线数据=DB //折线数据=DB,今天之前转成的议题,今天 “已转项目”或“已结案”
String date = issueDao.operateTime(issueId.getIssueId());
if (date.equals(LocalDate.now().toString())) { if (date.equals(LocalDate.now().toString())) {
Integer yesterdaySupport = 0; Integer yesterdaySupport = 0;
Integer yesterdayOppose = 0; Integer yesterdayOppose = 0;
@ -195,6 +198,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
polyLineDTOS.add(polyLineDTO); polyLineDTOS.add(polyLineDTO);
} }
} }
//今天之前 “已转项目”或“已关闭”
votingTrendResultDTO.setPolyLine(polyLineDTOS); votingTrendResultDTO.setPolyLine(polyLineDTOS);
return votingTrendResultDTO; return votingTrendResultDTO;
} }

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

@ -366,4 +366,15 @@
ISSUE_STATUS = #{issueStatus} ISSUE_STATUS = #{issueStatus}
</select> </select>
<!-- 校验话题是否已转议题 -->
<select id="checkTopicShiftIssue" resultType="integer" parameterType="com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO">
SELECT
COUNT(*) AS issueCount
FROM
issue
WHERE
del_flag = 0
AND source_id = #{topicId}
</select>
</mapper> </mapper>

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-mine-server: gov-mine-server:
container_name: gov-mine-server-dev container_name: gov-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.20 image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.21
ports: ports:
- "8098:8098" - "8098:8098"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-mine-server: gov-mine-server:
container_name: gov-mine-server-test container_name: gov-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.20 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.21
ports: ports:
- "8098:8098" - "8098:8098"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-mine/gov-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.20</version> <version>0.3.21</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId> <artifactId>gov-mine</artifactId>

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-dev container_name: gov-org-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.52 image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.55
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-org-server: gov-org-server:
container_name: gov-org-server-test container_name: gov-org-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.52 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.55
ports: ports:
- "8092:8092" - "8092:8092"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.52</version> <version>0.3.55</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>gov-org</artifactId> <artifactId>gov-org</artifactId>

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@ -169,13 +169,11 @@ public class AgencyController {
*/ */
@PostMapping("agencybyid/{agencyId}") @PostMapping("agencybyid/{agencyId}")
public Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId) { public Result<CustomerAgencyDTO> getAgencyById(@PathVariable("agencyId") String agencyId) {
CustomerAgencyEntity agency = agencyService.getAgencyById(agencyId); CustomerAgencyDTO agency = agencyService.getAgencyById(agencyId);
CustomerAgencyDTO customerAgencyDTO = new CustomerAgencyDTO(); if (agency == null) {
if (agency != null) { agency = new CustomerAgencyDTO();
BeanUtils.copyProperties(agency, customerAgencyDTO);
return new Result<CustomerAgencyDTO>().ok(customerAgencyDTO);
} }
return new Result<>(); return new Result<CustomerAgencyDTO>().ok(agency);
} }
/** /**

21
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java

@ -17,9 +17,15 @@
package com.epmet.redis; package com.epmet.redis;
import cn.hutool.core.bean.BeanUtil;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.dto.CustomerAgencyDTO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import java.util.Map;
/** /**
* 机关单位信息表 * 机关单位信息表
@ -36,12 +42,19 @@ public class CustomerAgencyRedis {
} }
public void set(){ public void set(String agencyId, CustomerAgencyDTO value){
String key = RedisKeys.getAgencyByIdKey(agencyId);
Map<String, Object> map = BeanUtil.beanToMap(value, false, true);
redisUtils.hMSet(key, map);
} }
public String get(String id){ public CustomerAgencyDTO get(String agencyId){
return null; String key = RedisKeys.getAgencyByIdKey(agencyId);
Map<String, Object> resultMap = redisUtils.hGetAll(key);
if (CollectionUtils.isEmpty(resultMap)) {
return null;
}
return BeanUtil.mapToBean(resultMap, CustomerAgencyDTO.class, true);
} }
} }

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

@ -88,7 +88,7 @@ public interface AgencyService {
* @param agencyId * @param agencyId
* @return * @return
*/ */
CustomerAgencyEntity getAgencyById(String agencyId); CustomerAgencyDTO getAgencyById(String agencyId);
CustomerAgencyEntity getAgencyByStaff(String staffId); CustomerAgencyEntity getAgencyByStaff(String staffId);

18
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@ -28,11 +28,13 @@ import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.*; import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerAgencyEntity;
import com.epmet.redis.CustomerAgencyRedis;
import com.epmet.service.AgencyService; import com.epmet.service.AgencyService;
import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerAgencyService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -53,6 +55,9 @@ public class AgencyServiceImpl implements AgencyService {
@Autowired @Autowired
private CustomerAgencyService customerAgencyService; private CustomerAgencyService customerAgencyService;
@Autowired
private CustomerAgencyRedis customerAgencyRedis;
/** /**
* @param formDTO * @param formDTO
* @return * @return
@ -241,8 +246,17 @@ public class AgencyServiceImpl implements AgencyService {
} }
@Override @Override
public CustomerAgencyEntity getAgencyById(String agencyId) { public CustomerAgencyDTO getAgencyById(String agencyId) {
return customerAgencyDao.selectById(agencyId); CustomerAgencyDTO cachedAgency = customerAgencyRedis.get(agencyId);
if (cachedAgency == null) {
cachedAgency = new CustomerAgencyDTO();
CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(agencyId);
if (agencyEntity != null) {
BeanUtils.copyProperties(agencyEntity, cachedAgency);
}
customerAgencyRedis.set(agencyId, cachedAgency);
}
return cachedAgency;
} }
@Override @Override

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-dev container_name: gov-project-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.18 image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.19
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-project/gov-project-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-project-server: gov-project-server:
container_name: gov-project-server-test container_name: gov-project-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.17 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-project-server:0.3.19
ports: ports:
- "8102:8102" - "8102:8102"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

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

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.18</version> <version>0.3.19</version>
<parent> <parent>
<artifactId>gov-project</artifactId> <artifactId>gov-project</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml

@ -34,7 +34,7 @@
</select> </select>
<select id="selectProjectStaffInfo" resultType="com.epmet.dto.ProjectStaffDTO"> <select id="selectProjectStaffInfo" resultType="com.epmet.dto.ProjectStaffDTO">
SELECT ps.* FROM project_staff ps SELECT ps.* FROM project_staff ps
INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID INNER JOIN project_process pp ON ps.DEPARTMENT_NAME = pp.DEPARTMENT_NAME AND ps.STAFF_ID = pp.STAFF_ID AND ps.PROJECT_ID = pp.PROJECT_ID
WHERE ps.DEL_FLAG = '0' WHERE ps.DEL_FLAG = '0'
AND pp.DEL_FLAG = '0' AND pp.DEL_FLAG = '0'
AND pp.ID = #{processId} AND pp.ID = #{processId}

5
epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/CustomerDTO.java

@ -83,6 +83,11 @@ public class CustomerDTO implements Serializable {
*/ */
private String organizationLevel; private String organizationLevel;
/**
* 客户logo
*/
private String logo;
/** /**
* 删除标识0.未删除 1.已删除 * 删除标识0.未删除 1.已删除
*/ */

5
epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/CustomerFormDTO.java

@ -39,5 +39,10 @@ public class CustomerFormDTO implements Serializable {
@NotBlank(message = "客户ID", groups = {GetCustomerDetailGroup.class}) @NotBlank(message = "客户ID", groups = {GetCustomerDetailGroup.class})
private String customerId; private String customerId;
/**
* 客户LOGO
*/
private String logo;
} }

5
epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/ValidCustomerResultDTO.java

@ -37,4 +37,9 @@ public class ValidCustomerResultDTO implements Serializable {
* 根级组织ID * 根级组织ID
*/ */
private String rootAgencyId; private String rootAgencyId;
/**
* 客户logo
*/
private String logo;
} }

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-dev container_name: oper-crm-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.14 image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.16
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-crm-server: oper-crm-server:
container_name: oper-crm-server-test container_name: oper-crm-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.14 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.15
ports: ports:
- "8090:8090" - "8090:8090"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-crm/oper-crm-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.14</version> <version>0.3.16</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-crm</artifactId> <artifactId>oper-crm</artifactId>

2
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@ -177,7 +177,7 @@ public class CustomerController {
@PostMapping("add") @PostMapping("add")
public Result<Map<String, String>> addCustomer(@RequestBody CustomerFormDTO form) { public Result<Map<String, String>> addCustomer(@RequestBody CustomerFormDTO form) {
ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class); ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class);
String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel()); String customerId = customerService.addCustomer(form.getCustomerName(), form.getOrganizationLevel(), form.getLogo());
Map<String, String> resultmap = new HashMap<>(); Map<String, String> resultmap = new HashMap<>();
resultmap.put("customerId", customerId); resultmap.put("customerId", customerId);
return new Result<Map<String, String>>().ok(resultmap); return new Result<Map<String, String>>().ok(resultmap);

5
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java

@ -83,4 +83,9 @@ public class CustomerEntity extends BaseEpmetEntity {
*/ */
private String organizationLevel; private String organizationLevel;
/**
* 客户logo
*/
private String logo;
} }

3
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerService.java

@ -137,9 +137,10 @@ public interface CustomerService extends BaseService<CustomerEntity> {
* 新增客户 * 新增客户
* @param customerName * @param customerName
* @param organizationLevel * @param organizationLevel
* @param logo logo
* @return * @return
*/ */
String addCustomer(String customerName, String organizationLevel); String addCustomer(String customerName, String organizationLevel, String logo);
/** /**
* 添加管理员 * 添加管理员

33
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java

@ -147,7 +147,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
validCustomers.stream().forEach(customer -> { validCustomers.stream().forEach(customer -> {
CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId()); CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId());
customer.setHasRootAgency(rootAgency == null ? false : true); customer.setHasRootAgency(rootAgency == null ? false : true);
customer.setRootAgencyId(rootAgency == null ? null : rootAgency.getId()); customer.setRootAgencyId(rootAgency == null ? "" : rootAgency.getId());
if (rootAgency != null) { if (rootAgency != null) {
rootAgencyIds.add(rootAgency.getId()); rootAgencyIds.add(rootAgency.getId());
} }
@ -160,7 +160,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
//2.查询客户的根级组织对应的管理员角色列表,批量查询 //2.查询客户的根级组织对应的管理员角色列表,批量查询
StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO(); StaffRoleFormDTO staffRoleFormDTO = new StaffRoleFormDTO();
staffRoleFormDTO.setOrgIds(rootAgencyIds); staffRoleFormDTO.setOrgIds(rootAgencyIds);
staffRoleFormDTO.setRoleKey("manager");// TODO ,此处应该将所有的角色key放到EpmetUser的client中 staffRoleFormDTO.setRoleKey(RoleKeyConstants.ROLE_KEY_MANAGER);// TODO ,此处应该将所有的角色key放到EpmetUser的client中
Result<Map<String, List<GovStaffRoleResultDTO>>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO); Result<Map<String, List<GovStaffRoleResultDTO>>> managersResult = epmetUserFeignClient.getStaffsInRoleOfOrgs(staffRoleFormDTO);
if (managersResult.success()) { if (managersResult.success()) {
Map<String, List<GovStaffRoleResultDTO>> rootAgencyManagerMap = managersResult.getData(); Map<String, List<GovStaffRoleResultDTO>> rootAgencyManagerMap = managersResult.getData();
@ -207,7 +207,7 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
@Override @Override
@Transactional @Transactional
public String addCustomer(String customerName, String organizationLevel) { public String addCustomer(String customerName, String organizationLevel, String logo) {
// 校验 // 校验
CustomerDTO customerExists = baseDao.selectByCustomerName(customerName); CustomerDTO customerExists = baseDao.selectByCustomerName(customerName);
@ -223,24 +223,25 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
customerEntity.setOrganizationImg(""); customerEntity.setOrganizationImg("");
customerEntity.setValidityTime(getValidityTime()); customerEntity.setValidityTime(getValidityTime());
customerEntity.setOrganizationLevel(organizationLevel); customerEntity.setOrganizationLevel(organizationLevel);
customerEntity.setLogo(logo);
int insert = baseDao.insert(customerEntity); int insert = baseDao.insert(customerEntity);
if (insert == 0) { if (insert == 0) {
throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode()); throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_ERROR.getCode());
} }
// 2. 给客户初始化角色列表 //// 2. 给客户初始化角色列表
Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId()); //Result initResult = epmetUserFeignClient.initGovStaffRolesForCustomer(customerEntity.getId());
if (!initResult.success()) { //if (!initResult.success()) {
throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString())); // throw new RenException("客户新增:为客户初始化角色调用user服务失败:".concat(initResult.toString()));
} //}
//
//3. 给客户初始化 定制化首页 ////3. 给客户初始化 定制化首页
CustomerHomeDTO initHomeForm = new CustomerHomeDTO(); //CustomerHomeDTO initHomeForm = new CustomerHomeDTO();
initHomeForm.setCustomerId(customerEntity.getId()); //initHomeForm.setCustomerId(customerEntity.getId());
Result initHomeResult = operCustomizeFeignClient.init(initHomeForm); //Result initHomeResult = operCustomizeFeignClient.init(initHomeForm);
if (!initHomeResult.success()) { //if (!initHomeResult.success()) {
throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg())); // throw new RenException("初始化首页失败:".concat(initHomeResult.getInternalMsg()));
} //}
return customerEntity.getId(); return customerEntity.getId();
} }

7
epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml

@ -13,6 +13,7 @@
<result property="customerAdmin" column="CUSTOMER_ADMIN"/> <result property="customerAdmin" column="CUSTOMER_ADMIN"/>
<result property="customerPassword" column="CUSTOMER_PASSWORD"/> <result property="customerPassword" column="CUSTOMER_PASSWORD"/>
<result property="organizationLevel" column="ORGANIZATION_LEVEL"/> <result property="organizationLevel" column="ORGANIZATION_LEVEL"/>
<result property="logo" column="LOGO"/>
<result property="delFlag" column="DEL_FLAG"/> <result property="delFlag" column="DEL_FLAG"/>
<result property="revision" column="REVISION"/> <result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/> <result property="createdBy" column="CREATED_BY"/>
@ -23,9 +24,9 @@
<!-- 运营端-获取有效客户列表 (未删除+有效期内的,按照客户名称排序 )--> <!-- 运营端-获取有效客户列表 (未删除+有效期内的,按照客户名称排序 )-->
<select id="selectListValidCustomerResultDTO" resultType="com.epmet.dto.result.ValidCustomerResultDTO"> <select id="selectListValidCustomerResultDTO" resultType="com.epmet.dto.result.ValidCustomerResultDTO">
SELECT SELECT c.id AS CUSTOMER_ID,
c.id AS CUSTOMER_ID, c.CUSTOMER_NAME,
c.CUSTOMER_NAME CASE WHEN c.LOGO IS NULL THEN '' ELSE c.LOGO END AS LOGO
FROM FROM
customer c customer c
WHERE WHERE

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-dev container_name: oper-customize-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.13 image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.14
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
oper-customize-server: oper-customize-server:
container_name: oper-customize-server-test container_name: oper-customize-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.13 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.14
ports: ports:
- "8089:8089" - "8089:8089"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/oper-customize/oper-customize-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.13</version> <version>0.3.14</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>oper-customize</artifactId> <artifactId>oper-customize</artifactId>

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-dev container_name: resi-group-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.37 image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.39
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-group-server: resi-group-server:
container_name: resi-group-server-test container_name: resi-group-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.36 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.39
ports: ports:
- "8095:8095" - "8095:8095"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.37</version> <version>0.3.39</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId> <artifactId>resi-group</artifactId>

9
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/GovIssueFeignClient.java

@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.modules.feign.fallback.GovIssueFeignClientFallBack; import com.epmet.modules.feign.fallback.GovIssueFeignClientFallBack;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -26,4 +27,12 @@ public interface GovIssueFeignClient {
**/ **/
@PostMapping(value = "gov/issue/issue/topicshiftissue", consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = "gov/issue/issue/topicshiftissue", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO); Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO);
/**
* @Description 校验话题是否已转议题
* @param formDTO
* @author zxc
*/
@PostMapping(value = "gov/issue/issue/checktopicshiftissue", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<Integer> checkTopicShiftIssue(TopicInfoFormDTO formDTO);
} }

6
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/fallback/GovIssueFeignClientFallBack.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.IssueShiftedFromTopicFormDTO; import com.epmet.dto.form.IssueShiftedFromTopicFormDTO;
import com.epmet.modules.feign.GovIssueFeignClient; import com.epmet.modules.feign.GovIssueFeignClient;
import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@ -20,4 +21,9 @@ public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
public Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO) { public Result<String> issueShiftedToTopic(IssueShiftedFromTopicFormDTO issueShiftedFromTopicFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueShiftedToTopic", issueShiftedFromTopicFormDTO); return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueShiftedToTopic", issueShiftedFromTopicFormDTO);
} }
@Override
public Result<Integer> checkTopicShiftIssue(TopicInfoFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "checkTopicShiftIssue", formDTO);
}
} }

119
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@ -1025,67 +1025,72 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
Date now = new Date(); Date now = new Date();
//2.调用gov-org获取数据权限 //2.调用gov-org获取数据权限
ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId()); ResiTopicAndGroupResultDTO group = baseDao.getGroupInfoByTopicId(topicTurnIssueFromDTO.getTopicId());
if(null != group){ if(null == group) {
CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO(); throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId()); }
dataFilterParam.setGridId(group.getGridId()); TopicInfoFormDTO topicId = new TopicInfoFormDTO();
Result<CommonDataFilterResultDTO> dataFilterResult = topicId.setTopicId(topicTurnIssueFromDTO.getTopicId());
govOrgFeignClient.gridDataFilter(dataFilterParam); Integer issueCount = govIssueFeignClient.checkTopicShiftIssue(topicId).getData();
if(dataFilterResult.success() && null != dataFilterResult.getData()){ if (issueCount != NumConstant.ZERO){
IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(topicTurnIssueFromDTO,IssueShiftedFromTopicFormDTO.class); throw new RenException(ModuleConstant.ALREADY_SHIFT_ISSUE);
issueInfo.setCreatedTime(now); }
issueInfo.setGridId(group.getGridId()); CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
issueInfo.setCustomerId(group.getCustomerId()); dataFilterParam.setUserId(topicTurnIssueFromDTO.getUserId());
issueInfo.setOrgId(dataFilterResult.getData().getAgencyId()); dataFilterParam.setGridId(group.getGridId());
issueInfo.setOrgIdPath(dataFilterResult.getData().getOrgIdPath()); Result<CommonDataFilterResultDTO> dataFilterResult =
issueInfo.setOrgName(dataFilterResult.getData().getOrgName()); govOrgFeignClient.gridDataFilter(dataFilterParam);
//3.获取小组名称、话题作者、议题发起人 if(dataFilterResult.success() && null != dataFilterResult.getData()){
ResiGroupMemberInfoRedisDTO topicAuthor = resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId()); IssueShiftedFromTopicFormDTO issueInfo = ConvertUtils.sourceToTarget(topicTurnIssueFromDTO,IssueShiftedFromTopicFormDTO.class);
issueInfo.setTopicAuthor(null == topicAuthor ? ModuleConstant.EMPTY_STR : topicAuthor.getUserShowName()); issueInfo.setCreatedTime(now);
ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(),topicTurnIssueFromDTO.getUserId()); issueInfo.setGridId(group.getGridId());
issueInfo.setIssueAuthor(null == issueAuthor ? ModuleConstant.EMPTY_STR : issueAuthor.getUserShowName()); issueInfo.setCustomerId(group.getCustomerId());
ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(group.getGroupId()); issueInfo.setOrgId(dataFilterResult.getData().getAgencyId());
issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName()); issueInfo.setOrgIdPath(dataFilterResult.getData().getOrgIdPath());
issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId())); issueInfo.setOrgName(dataFilterResult.getData().getOrgName());
//4.调用gov-issue新增议题 //3.获取小组名称、话题作者、议题发起人
Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo); ResiGroupMemberInfoRedisDTO topicAuthor = resiGroupMemberRedis.get(group.getGroupId(), group.getTopicAuthorId());
//5.修改话题shiftIssue字段 issueInfo.setTopicAuthor(null == topicAuthor ? ModuleConstant.EMPTY_STR : topicAuthor.getUserShowName());
if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){ ResiGroupMemberInfoRedisDTO issueAuthor = resiGroupMemberRedis.get(group.getGroupId(),topicTurnIssueFromDTO.getUserId());
ResiTopicEntity topic2Upd = new ResiTopicEntity(); issueInfo.setIssueAuthor(null == issueAuthor ? ModuleConstant.EMPTY_STR : issueAuthor.getUserShowName());
topic2Upd.setId(topicTurnIssueFromDTO.getTopicId()); ResiGroupInfoRedisDTO groupCache = resiGroupRedis.get(group.getGroupId());
topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId()); issueInfo.setGroupName(null == groupCache ? ModuleConstant.EMPTY_STR : groupCache.getGroupName());
topic2Upd.setShiftIssue(Boolean.TRUE); issueInfo.setVotableCount(resiGroupMemberService.gridResiCount(group.getGridId()));
topic2Upd.setIssueId(issueResult.getData()); //4.调用gov-issue新增议题
topic2Upd.setUpdatedTime(now); Result<String> issueResult = govIssueFeignClient.issueShiftedToTopic(issueInfo);
int topicResult = baseDao.updateOne(topic2Upd); //5.修改话题shiftIssue字段
//6.新增话题操作记录 if(issueResult.success() && StringUtils.isNotBlank(issueResult.getData())){
if(topicResult == NumConstant.ONE) { ResiTopicEntity topic2Upd = new ResiTopicEntity();
ResiTopicOperationEntity operation = new ResiTopicOperationEntity(); topic2Upd.setId(topicTurnIssueFromDTO.getTopicId());
operation.setCreatedTime(now); topic2Upd.setUpdatedBy(topicTurnIssueFromDTO.getUserId());
operation.setCreatedBy(topicTurnIssueFromDTO.getUserId()); topic2Upd.setShiftIssue(Boolean.TRUE);
operation.setTopicId(topicTurnIssueFromDTO.getTopicId()); topic2Upd.setIssueId(issueResult.getData());
operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE); topic2Upd.setUpdatedTime(now);
int operationResult = resiTopicOperationDao.insertOneByParams(operation); int topicResult = baseDao.updateOne(topic2Upd);
if(operationResult != NumConstant.ONE){ //6.新增话题操作记录
logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION); if(topicResult == NumConstant.ONE) {
} ResiTopicOperationEntity operation = new ResiTopicOperationEntity();
} operation.setCreatedTime(now);
//7.更新组统计信息 议题数量+1 operation.setCreatedBy(topicTurnIssueFromDTO.getUserId());
resiGroupStatisticalDao.incryTotalIssues(group.getGroupId()); operation.setTopicId(topicTurnIssueFromDTO.getTopicId());
if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){ operation.setOperationType(ModuleConstant.TOPIC_OPERATION_TYPE_SHIFT_ISSUE);
groupCache.getGroupStatisticalInfo().setTotalIssues( int operationResult = resiTopicOperationDao.insertOneByParams(operation);
null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE if(operationResult != NumConstant.ONE){
: groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE logger.warn(ModuleConstant.FAILURE_TO_ADD_TOPIC_OPERATION);
);
resiGroupRedis.set(groupCache);
} }
logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
} }
//7.更新组统计信息 议题数量+1
resiGroupStatisticalDao.incryTotalIssues(group.getGroupId());
if(null != groupCache && null != groupCache.getGroupStatisticalInfo()){
groupCache.getGroupStatisticalInfo().setTotalIssues(
null == groupCache.getGroupStatisticalInfo().getTotalIssues() ? NumConstant.ONE
: groupCache.getGroupStatisticalInfo().getTotalIssues() + NumConstant.ONE
);
resiGroupRedis.set(groupCache);
}
logger.warn(ModuleConstant.FAILURE_TO_UPDATE_TOPIC);
} }
return;
} }
throw new RenException(ModuleConstant.FAILURE_TO_TURN_ISSUE);
} }
/** /**

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@ -311,4 +311,6 @@ public interface ModuleConstant extends Constant {
* 组状态 审核中 * 组状态 审核中
* */ * */
String GROUP_STATUS_UNDER_AUDITTING = "under_auditting"; String GROUP_STATUS_UNDER_AUDITTING = "under_auditting";
String ALREADY_SHIFT_ISSUE = "话题已转议题,请勿重复操作";
} }

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-dev container_name: resi-guide-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.9 image: 192.168.1.130:10080/epmet-cloud-dev/resi-guide-server:0.3.10
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-guide-server: resi-guide-server:
container_name: resi-guide-server-test container_name: resi-guide-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.9 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.10
ports: ports:
- "8091:8091" - "8091:8091"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-guide/resi-guide-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.9</version> <version>0.3.10</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-guide</artifactId> <artifactId>resi-guide</artifactId>

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-dev container_name: resi-hall-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.12 image: 192.168.1.130:10080/epmet-cloud-dev/resi-hall-server:0.3.13
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-hall-server: resi-hall-server:
container_name: resi-hall-server-test container_name: resi-hall-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.12 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-hall-server:0.3.13
ports: ports:
- "8100:8100" - "8100:8100"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-hall/resi-hall-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.12</version> <version>0.3.13</version>
<parent> <parent>
<artifactId>resi-hall</artifactId> <artifactId>resi-hall</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

2
epmet-module/resi-home/resi-home-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-home-server: resi-home-server:
container_name: resi-home-server-dev container_name: resi-home-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.5 image: 192.168.1.130:10080/epmet-cloud-dev/resi-home-server:0.3.7
ports: ports:
- "8104:8104" - "8104:8104"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-home/resi-home-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-home-server: resi-home-server:
container_name: resi-home-server-test container_name: resi-home-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.4 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-home-server:0.3.7
ports: ports:
- "8104:8104" - "8104:8104"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-home/resi-home-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.5</version> <version>0.3.7</version>
<parent> <parent>
<artifactId>resi-home</artifactId> <artifactId>resi-home</artifactId>

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-dev container_name: resi-mine-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.16 image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.19
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-mine-server: resi-mine-server:
container_name: resi-mine-server-test container_name: resi-mine-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.16 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.19
ports: ports:
- "8094:8094" - "8094:8094"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-mine/resi-mine-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.16</version> <version>0.3.19</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-mine</artifactId> <artifactId>resi-mine</artifactId>

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-dev container_name: resi-partymember-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.34 image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.35
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
resi-partymember-server: resi-partymember-server:
container_name: resi-partymember-server-test container_name: resi-partymember-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.34 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.35
ports: ports:
- "8096:8096" - "8096:8096"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/resi-partymember/resi-partymember-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.34</version> <version>0.3.35</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>resi-partymember</artifactId> <artifactId>resi-partymember</artifactId>

5
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GovStaffRoleTemplateDTO.java

@ -53,6 +53,11 @@ public class GovStaffRoleTemplateDTO implements Serializable {
*/ */
private String orgType; private String orgType;
/**
* 是否只有全职
* */
private Boolean fullTimeOnly;
/** /**
* *
*/ */

2
epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-dev container_name: epmet-user-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.40 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.44
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/deploy/docker-compose-test.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-user-server: epmet-user-server:
container_name: epmet-user-server-test container_name: epmet-user-server-test
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.40 image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.44
ports: ports:
- "8087:8087" - "8087:8087"
network_mode: host # 不会创建新的网络 network_mode: host # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.40</version> <version>0.3.44</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId> <artifactId>epmet-user</artifactId>

5
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/GovStaffRoleTemplateEntity.java

@ -53,4 +53,9 @@ public class GovStaffRoleTemplateEntity extends BaseEpmetEntity {
*/ */
private String orgType; private String orgType;
/**
* 是否只有全职
* */
private Boolean fullTimeOnly;
} }

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@ -16,15 +16,16 @@ import com.epmet.entity.UserEntity;
import com.epmet.entity.UserWechatEntity; import com.epmet.entity.UserWechatEntity;
import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.GovOrgFeignClient;
import com.epmet.service.UserService; import com.epmet.service.UserService;
import com.epmet.util.ModuleConstant;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
@ -153,12 +154,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
if(StringUtils.isNotBlank(myselfMsg.getGridId())){ if(StringUtils.isNotBlank(myselfMsg.getGridId())){
//registerGridName 首次注册的网格 //registerGridName 首次注册的网格
CustomerGridFormDTO gridId = new CustomerGridFormDTO(); CustomerGridFormDTO gridId = new CustomerGridFormDTO();
gridId.setGridId(myselfMsg.getGridId()); gridId.setGridId(myResiUserInfoFormDTO.getGridId());
Result<CustomerGridDTO> gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId); Result<CustomerGridDTO> gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId);
if(gridResult.success() && null != gridResult.getData()){ if(gridResult.success() && null != gridResult.getData()){
result.setRegisterGridName(gridResult.getData().getGridName()); result.setRegisterGridName(gridResult.getData().getGridName());
}else{ }else{
if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg()); if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg());
result.setRegisterGridName(ModuleConstant.EMPTY_STR);
} }
} }

13
epmet-user/epmet-user-server/src/main/java/com/epmet/util/ModuleConstant.java

@ -0,0 +1,13 @@
package com.epmet.util;
/**
* 常量类
* */
public interface ModuleConstant {
/**
* 空字符串
* */
String EMPTY_STR = "";
}

1
epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@ -38,7 +38,6 @@
where where
DEL_FLAG = '0' DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId} AND CUSTOMER_ID = #{customerId}
AND ORG_TYPE = 'agency'
ORDER BY SORT ASC ORDER BY SORT ASC
</select> </select>

Loading…
Cancel
Save