Browse Source

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

master
yinzuomei 5 years ago
parent
commit
bd5dab379c
  1. 2
      epmet-auth/deploy/docker-compose-prod.yml
  2. 21
      epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java
  3. 39
      epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java
  4. 9
      epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java
  5. 38
      epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java
  6. 1
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
  7. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  8. 2
      epmet-gateway/deploy/docker-compose-prod.yml
  9. 2
      epmet-gateway/pom.xml
  10. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
  11. 2
      epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml
  12. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
  13. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
  14. 2
      epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml
  15. 2
      epmet-module/data-statistical/data-statistical-server/pom.xml
  16. 2
      epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
  17. 2
      epmet-module/epmet-common-service/common-service-server/pom.xml
  18. 1
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml
  19. 3
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml
  20. 1
      epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml
  21. 2
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  22. 13
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java
  23. 6
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java
  24. 2
      epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml
  25. 2
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  26. 13
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java
  27. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java
  28. 9
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java
  29. 5
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
  30. 8
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
  31. 5
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java
  32. 36
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java
  33. 27
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java
  34. 5
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java
  35. 26
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java
  36. 4
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java
  37. 41
      epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java
  38. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml
  39. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
  40. 2
      epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml
  41. 2
      epmet-module/epmet-third/epmet-third-server/pom.xml
  42. 4
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
  43. 30
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
  44. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java
  45. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java
  46. 18
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java
  47. 5
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java
  48. 20
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
  49. 23
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
  50. 56
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
  51. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java
  52. 14
      epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml
  53. 1
      epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql
  54. 12
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml
  55. 11
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml
  56. 50
      epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml
  57. 2
      epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
  58. 2
      epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml
  59. 2
      epmet-module/gov-mine/gov-mine-server/pom.xml
  60. 8
      epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
  61. 101
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java
  62. 30
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java
  63. 6
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java
  64. 44
      epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java
  65. 2
      epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
  66. 6
      epmet-module/gov-org/gov-org-server/pom.xml
  67. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java
  68. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
  69. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java
  70. 94
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java
  71. 16
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
  72. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
  73. 18
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
  74. 33
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java
  75. 71
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java
  76. 74
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java
  77. 47
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java
  78. 8
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
  79. 10
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java
  80. 9
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
  81. 12
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java
  82. 95
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java
  83. 49
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
  84. 24
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java
  85. 13
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  86. 91
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
  87. 104
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java
  88. 16
      epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql
  89. 30
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
  90. 5
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
  91. 17
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  92. 8
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml
  93. 4
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java
  94. 16
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
  95. 11
      epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
  96. 2
      epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
  97. 20
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
  98. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectStaffDao.java
  99. 1
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
  100. 9
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectStaffService.java

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

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

21
epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@ -2,13 +2,11 @@ package com.epmet.controller;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.LoginFormDTO;
import com.epmet.dto.form.StaffOrgsFormDTO;
import com.epmet.dto.form.ThirdStaffOrgsFormDTO;
import com.epmet.dto.form.ThirdWxmpEnteOrgFormDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.StaffOrgsResultDTO;
import com.epmet.dto.result.UserTokenResultDTO;
import com.epmet.service.ThirdLoginService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -91,4 +89,19 @@ public class ThirdLoginController {
return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
}
/**
* @param formDTO
* @return
* @author sun
* @description 单客户-获取微信用户手机号
**/
@PostMapping("getresiwxphone")
public Result getResiWxPhone(@RequestBody GetResiWxPhoneFormDTO formDTO) {
String phone = thirdLoginService.getResiWxPhone(formDTO);
if (StringUtils.isNotBlank(phone) && !"null".equals(phone)) {
return new Result().ok(phone);
}
return new Result().ok("");
}
}

39
epmet-auth/src/main/java/com/epmet/dto/form/GetResiWxPhoneFormDTO.java

@ -0,0 +1,39 @@
package com.epmet.dto.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 单客户-获取微信用户手机号
*
* @author sun
*/
@Data
public class GetResiWxPhoneFormDTO implements Serializable {
private static final long serialVersionUID = 4381236451736209332L;
/**
* 小程序appId
*/
@NotBlank(message = "appId不能为空",groups = {AddUserInternalGroup.class})
private String appId;
/**
* 微信code
*/
@NotBlank(message = "wxCode不能为空",groups = {AddUserInternalGroup.class})
private String wxCode;
/**
* 用户信息
*/
@NotBlank(message = "encryptedData不能为空",groups = {AddUserInternalGroup.class})
private String encryptedData;
/**
* 加密算法的初始向量
*/
@NotBlank(message = "iv不能为空",groups = {AddUserInternalGroup.class})
private String iv;
public interface AddUserInternalGroup {}
}

9
epmet-auth/src/main/java/com/epmet/service/ThirdLoginService.java

@ -1,5 +1,6 @@
package com.epmet.service;
import com.epmet.dto.form.GetResiWxPhoneFormDTO;
import com.epmet.dto.form.LoginFormDTO;
import com.epmet.dto.form.ThirdStaffOrgsFormDTO;
import com.epmet.dto.form.ThirdWxmpEnteOrgFormDTO;
@ -53,4 +54,12 @@ public interface ThirdLoginService {
* @description 单客户-手机号密码获取组织
**/
List<StaffOrgsResultDTO> getMyOrgByPassword(ThirdStaffOrgsFormDTO formDTO);
/**
* @param formDTO
* @return
* @author sun
* @description 单客户-获取微信用户手机号
**/
String getResiWxPhone(GetResiWxPhoneFormDTO formDTO);
}

38
epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@ -1,6 +1,8 @@
package com.epmet.service.impl;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.util.crypt.WxMaCryptUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.epmet.common.token.constant.LoginConstant;
@ -549,4 +551,40 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
return userWechatDTO;
}
/**
* @param formDTO
* @return
* @author sun
* @description 单客户-获取微信用户手机号
* 此接口只适配第三方客户对于党群e事通客户还是走原接口
**/
@Override
public String getResiWxPhone(GetResiWxPhoneFormDTO formDTO) {
String phone = "";
try {
//1.根据wxcode获取sessionKey
WxLoginFormDTO resiLoginFormDTO = new WxLoginFormDTO();
resiLoginFormDTO.setAppId(formDTO.getAppId());
resiLoginFormDTO.setWxCode(formDTO.getWxCode());
//此方法会校验appId是否授权,然后在判断客户是否存在,之后才是获取sessionKey,如果只想获取sessionKey需要写新接口
UserWechatDTO userWechatDTO = this.getUserWeChat(resiLoginFormDTO);
if (null == userWechatDTO || null == userWechatDTO.getSessionKey()) {
logger.error(String.format("调用生成third服务wxcode获取sessionKey失败,对应appId->" + formDTO.getAppId()));
throw new RenException("获取本机号码失败");
}
//2.使用sessionKey解密获取手机号
WxMaPhoneNumberInfo phoneNoInfo = WxMaPhoneNumberInfo.fromJson(WxMaCryptUtils.decrypt(userWechatDTO.getSessionKey(),
formDTO.getEncryptedData(),
formDTO.getIv()));
if (null != phoneNoInfo) {
phone = phoneNoInfo.getPurePhoneNumber();
}
} catch (Exception e) {
e.printStackTrace();
log.error(String.format("获取用户微信绑定的手机号接口异常%s", e.getMessage()));
}
return phone;
}
}

1
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@ -51,6 +51,7 @@ public enum RequirePermissionEnum {
ORG_STAFF_CREATE("org_staff_create", "组织:工作人员:新增", "组织:工作人员:新增"),
ORG_STAFF_UPDATE("org_staff_update", "组织:工作人员:编辑", "组织:工作人员:编辑"),
ORG_STAFF_FORBIDDEN("org_staff_forbidden", "组织:工作人员:禁用", "组织:工作人员:禁用"),
ORG_STAFF_TRANSFER("org_staff_transfer", "组织:工作人员:调动", "组织:工作人员:调动"),
/**
* 组织-部门

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@ -77,6 +77,8 @@ public enum EpmetErrorCode {
CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),
NO_SET_GRID_COUNT(8406,"您还未设置创建网格数量上限,请联系管理员设置"),
GRID_COUNT_UP(8407,"您的创建网格数量已到达上限,请联系管理员设置"),
EXIT_PEND_PROJECT(8408,"该工作人员有项目尚在处理,处理完毕方可操作"),
EXIT_PUBLISHED_ACTIVITY(8409,"该工作人员有活动尚在进行,等活动完成方可操作"),
ALREADY_EVALUATE(8501,"您已评价"),
ALREADY_VOTE(8502,"您已表态"),

2
epmet-gateway/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-gateway-server:
container_name: epmet-gateway-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.30
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.33
ports:
- "8080:8080"
network_mode: host # 使用现有网络

2
epmet-gateway/pom.xml

@ -182,7 +182,7 @@
<!-- <gateway.routes.data-report-server.uri>http://localhost:8109</gateway.routes.data-report-server.uri>-->
<!-- 29、统计服务 -->
<gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
<!--<gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
<!-- <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
<!-- 30、内容审核服务 -->
<gateway.routes.epmet-openapi-scan.uri>lb://epmet-openapi-scan</gateway.routes.epmet-openapi-scan.uri>
<!-- <gateway.routes.epmet-openapi-scan.uri>http://localhost:8107</gateway.routes.epmet-openapi-scan.uri>-->

2
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.27
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.36
ports:
- "8108:8108"
network_mode: host # 使用现有网络

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.47
image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.48
ports:
- "8108:8108"
network_mode: host # 使用现有网络

2
epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.42
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.48
ports:
- "8108:8108"
network_mode: host # 使用现有网络

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

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

2
epmet-module/data-statistical/data-statistical-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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<version>0.3.47</version>
<version>0.3.48</version>
<parent>
<artifactId>data-statistical</artifactId>
<groupId>com.epmet</groupId>

2
epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
common-service-server:
container_name: common-service-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.9
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.17
ports:
- "8103:8103"
network_mode: host # 使用现有网络

2
epmet-module/epmet-common-service/common-service-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"
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>
<version>0.3.16</version>
<version>0.3.17</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-common-service</artifactId>

1
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/dev:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

3
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-ext-server:
container_name: epmet-ext-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.1
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.7
ports:
- "8113:8113"
network_mode: host # 使用现有网络
@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/prod:/logs"
environment:
RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

1
epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml

@ -10,6 +10,7 @@ services:
- "/opt/epmet-cloud-logs/test:/logs"
environment:
RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar"
restart: "unless-stopped"
deploy:
resources:
limits:

2
epmet-module/epmet-ext/epmet-ext-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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.6</version>
<version>0.0.7</version>
<parent>
<groupId>com.epmet</groupId>

13
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java

@ -2,9 +2,11 @@ package com.epmet.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.ActInfoDTO;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.feign.fallback.EpmetHeartOpenFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -28,4 +30,15 @@ public interface EpmetHeartOpenFeignClient {
**/
@PostMapping("/heart/resi/volunteer/volunteeruserids")
Result<List<String>> volunteerUserIds(@RequestBody CommonCustomerFormDTO customerFormDTO);
/**
* 查询用户创建的未结束的活动
*
* @author zhaoqifeng
* @date 2020/8/28 14:38
* @param staffId
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ActInfoDTO>>
*/
@PostMapping("/heart/resi/act/published/{staffId}")
Result<List<ActInfoDTO>> getPublishedAct(@PathVariable String staffId);
}

6
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java

@ -3,6 +3,7 @@ package com.epmet.feign.fallback;
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.ActInfoDTO;
import com.epmet.dto.form.CommonCustomerFormDTO;
import com.epmet.feign.EpmetHeartOpenFeignClient;
import org.springframework.stereotype.Component;
@ -29,4 +30,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli
public Result<List<String>> volunteerUserIds(CommonCustomerFormDTO customerFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "volunteerUserIds", customerFormDTO);
}
@Override
public Result<List<ActInfoDTO>> getPublishedAct(String staffId) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "getPublishedAct", staffId);
}
}

2
epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-heart-server:
container_name: epmet-heart-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.52
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.53
ports:
- "8111:8111"
network_mode: host # 使用现有网络

2
epmet-module/epmet-heart/epmet-heart-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"
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>
<version>0.0.52</version>
<version>0.0.53</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart</artifactId>

13
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@ -3,6 +3,7 @@ package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.ActInfoDTO;
import com.epmet.dto.form.resi.*;
import com.epmet.dto.result.resi.*;
import com.epmet.service.*;
@ -331,4 +332,16 @@ public class ResiActListController {
ValidatorUtils.validateEntity(formDTO, ResiActContentFormDTO.AddUserInternalGroup.class);
return actInfoService.checkSignInTime(formDTO);
}
/**
* 查询用户创建的未结束的活动
* @author zhaoqifeng
* @date 2020/8/28 14:37
* @param staffId
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.ActInfoDTO>>
*/
@PostMapping("published/{staffId}")
public Result<List<ActInfoDTO>> getPublishedAct(@PathVariable String staffId) {
return new Result<List<ActInfoDTO>>().ok(actInfoService.getPublishedAct(staffId));
}
}

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@ -310,4 +310,13 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
* @Date 11:00 2020-07-20
**/
List<ResiLookBackActResultDTO> selectListLookBackActAssembly(ResiLatestActFormDTO formDTO);
/**
* 查询用户创建的未结束的活动
* @author zhaoqifeng
* @date 2020/8/28 14:27
* @param staffId
* @return java.util.List<com.epmet.dto.ActInfoDTO>
*/
List<ActInfoDTO> selectPublishedAct(@Param("staffId") String staffId);
}

9
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java

@ -245,4 +245,13 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
* @Date 15:03 2020-08-05
**/
Result<ResiActRegistrationResultDTO> checkSignInTime(ResiActContentFormDTO formDTO);
/**
* 查询用户创建的未结束的活动
* @author zhaoqifeng
* @date 2020/8/28 14:32
* @param staffId
* @return java.util.List<com.epmet.dto.ActInfoDTO>
*/
List<ActInfoDTO> getPublishedAct(String staffId);
}

5
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java

@ -416,4 +416,9 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
}
return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
}
@Override
public List<ActInfoDTO> getPublishedAct(String staffId) {
return baseDao.selectPublishedAct(staffId);
}
}

8
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@ -758,4 +758,12 @@
ORDER BY a.CREATED_TIME DESC
LIMIT 0, #{num}
</select>
<select id="selectPublishedAct" resultType="com.epmet.dto.ActInfoDTO">
SELECT ID,
TITLE
FROM act_info
WHERE DEL_FLAG = '0'
AND ACT_STATUS = 'published'
AND CREATED_BY = #{staffId}
</select>
</mapper>

5
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java

@ -58,6 +58,11 @@ public class CodeAuditResultDTO implements Serializable {
*/
private String result;
/**
* 是否加急
*/
private Boolean isSpeed;
/**
* 原因
*/

36
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdAndSrcFormDTO.java

@ -0,0 +1,36 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 公众号客户删除入参DTO
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @ClassName CommonCustomerIdAndSrcFormDTO
* @Auth wangc
* @Date 2020-08-25 11:02
*/
@Data
public class CommonCustomerIdAndSrcFormDTO implements Serializable {
private static final long serialVersionUID = -2945388338786885295L;
public interface CustomerAndSrcGroup extends CustomerClientShowGroup{}
/**
* 客户Id
* */
@NotBlank(message = "客户Id不能为空",groups = CustomerAndSrcGroup.class)
private String customerId;
/**
* 数据来源(dev:开发 test:体验 prod:生产)
* */
@NotBlank(message = "数据来源不能为空",groups = CustomerAndSrcGroup.class)
private String source;
@NotBlank(message = "用户Id不能为空",groups = CustomerAndSrcGroup.class)
private String userId;
}

27
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CommonCustomerIdFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.dto.form;
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 获取客户第三方token 入参DTO
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323480
* @ClassName CommonCustomerIdFormDTO
* @Auth wangc
* @Date 2020-08-25 10:57
*/
@Data
public class CommonCustomerIdFormDTO implements Serializable {
private static final long serialVersionUID = 3160741101286756024L;
public interface PaCustomerIdGroup extends CustomerClientShowGroup{}
/**
* 客户Id
* */
@NotBlank(message = "客户Id不能为空" , groups = PaCustomerIdGroup.class)
private String customerId;
}

5
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java

@ -25,6 +25,11 @@ public class SubmitAuditFormDTO implements Serializable {
*/
private Boolean isSpeed;
/**
* isSpeed=true时是否是审核失败后的反馈提审
*/
private Boolean isRepeat;
/**
* 小程序版本说明和功能解释
*/

26
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AuthAccessTokenClientResultDTO.java

@ -0,0 +1,26 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 授权accessToken和app端的查询返参
* @ClassName AuthAccessTokenClientResultDTO
* @Auth wangc
* @Date 2020-08-25 13:41
*/
@Data
public class AuthAccessTokenClientResultDTO implements Serializable {
private static final long serialVersionUID = -642465145534993509L;
/**
* 客户端类型
* */
private String clientType;
/**
* 调用令牌
* */
private String accessToken;
}

4
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CodeVersionInfoResultDTO.java

@ -71,6 +71,10 @@ public class CodeVersionInfoResultDTO implements Serializable {
*
*/
private String status;
/**
*
*/
private Boolean isSpeed;
}
@Data

41
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CustomerTokensResultDTO.java

@ -0,0 +1,41 @@
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description
* @ClassName CustomerTokensResultDTO
* @Auth wangc
* @Date 2020-08-25 11:16
*/
@Data
public class CustomerTokensResultDTO implements Serializable {
private static final long serialVersionUID = -6811282503588315365L;
/**
* 客户Id
* */
private String customerId = "";
/**
* 客户名称
* */
private String customerName = "";
/**
* 第三方token
* */
private String componentAccessToken = "";
/**
* 授权方居民端token
* */
private String resiAuthorizerToken = "";
/**
* 授权方工作端token
* */
private String workAuthorizerToken = "";
}

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

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.134
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.141
ports:
- "8110:8110"
network_mode: host # 使用现有网络

2
epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml

@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-third-server:
container_name: epmet-third-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.131
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.141
ports:
- "8110:8110"
network_mode: host # 使用现有网络

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

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

2
epmet-module/epmet-third/epmet-third-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"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.0.134</version>
<version>0.0.141</version>
<parent>
<groupId>com.epmet</groupId>

4
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java

@ -116,5 +116,9 @@ public interface ModuleConstant {
int EIGHTY_NINE_THOUSAND_AND_THREE = 89003;
int EIGHTY_NINE_THOUSAND_AND_FOUR = 89004;
/**
* 数据来源 生产环境
* */
String SRC_PROD = "prod";
}

30
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@ -192,5 +192,35 @@ public class PaCustomerController {
return new Result<PageData>().ok(pageData);
}
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/req/?pid=52285&id=323480
* @param param CommonCustomerIdFormDTO.class
* @return Result<CustomerTokensResultDTO>
* @author wangc
* @date 2020.08.25 15:39
**/
@PostMapping("tokenlist")
public Result<CustomerTokensResultDTO> tokenList(@RequestBody CommonCustomerIdFormDTO param){
ValidatorUtils.validateEntity(param, CustomerUserFormDTO.CustomerIdGroup.class);
return new Result<CustomerTokensResultDTO>().ok(paCustomerService.tokenList(param));
}
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param token
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
@PostMapping("deletepubliccustomer")
public Result deletePublicCustomer(@LoginUser TokenDto token , @RequestBody CommonCustomerIdAndSrcFormDTO param){
param.setUserId(token.getUserId());
ValidatorUtils.validateEntity(param, CommonCustomerIdAndSrcFormDTO.CustomerAndSrcGroup.class);
paCustomerService.clearPublicCustomer(param);
return new Result();
}
}

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java

@ -22,6 +22,7 @@ import com.epmet.dto.AuthorizationInfoDTO;
import com.epmet.dto.form.AuthorizationInfoFormDTO;
import com.epmet.dto.form.AuthorizerAccessTokenFormDTO;
import com.epmet.dto.form.CustomerAccessTokenInfoFormDTO;
import com.epmet.dto.result.AuthAccessTokenClientResultDTO;
import com.epmet.dto.result.AuthCodeResultDTO;
import com.epmet.dto.result.CustomerAccessTokenInfoResultDTO;
import com.epmet.dto.result.WillOverDueResultDTO;
@ -109,4 +110,12 @@ public interface AuthorizationInfoDao extends BaseDao<AuthorizationInfoEntity> {
*/
List<CustomerAccessTokenInfoResultDTO> getCustomerAccessTokenInfo(CustomerAccessTokenInfoFormDTO customerAccessTokenInfoFormDTO);
/**
* @Description 查询来源端对应的accessToken
* @param customerId
* @return List<AuthAccessTokenClientResultDTO>
* @author wangc
* @date 2020.08.25 15:24
**/
List<AuthAccessTokenClientResultDTO> selectClientToken(@Param("customerId") String customerId);
}

9
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/ComponentAccessTokenDao.java

@ -69,4 +69,13 @@ public interface ComponentAccessTokenDao extends BaseDao<ComponentAccessTokenEnt
*/
String getComponentAccessToken();
/**
* @Description 查询ComponentAccessToken唯一
* @param
* @return String
* @author wangc
* @date 2020.08.25 15:14
**/
String selectComponentAccessToken();
}

18
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/PaCustomerDao.java

@ -102,4 +102,22 @@ public interface PaCustomerDao extends BaseDao<PaCustomerEntity> {
* @Description 查询客户及管理员信息
*/
CustomerAndUserResultDTO selectCustomerAndUser(@Param("customerId") String customerId);
/**
* @Description 清除第三方库中客户的信息
* @param customerId
* @return
* @author wangc
* @date 2020.08.26 10:44
**/
void clearCustomerInfo(@Param("customerId") String customerId);
/**
* @Description 根据客户Id查询当前客户的来源
* @param customerId
* @return
* @author wangc
* @date 2020.08.26 10:59
**/
String selectSourceById(@Param("customerId") String customerId,@Param("source") String source);
}

5
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java

@ -58,6 +58,11 @@ public class CodeAuditResultEntity extends BaseEpmetEntity {
*/
private String result;
/**
* 是否加急
*/
private Boolean isSpeed;
/**
* 原因
*/

20
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java

@ -213,4 +213,24 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
* @return com.epmet.commons.tools.page.PageData
*/
PageData getCustomerList(UploadListFormDTO formDTO);
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
* @param param
* @return
* @author wangc
* @date 2020.08.25 14:51
**/
CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param);
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param);
}

23
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@ -183,6 +183,7 @@ public class CodeServiceImpl implements CodeService {
//审核版本
CodeCustomerDTO audit = codeCustomerService.getAuditInfo(formDTO.getCustomerId(), formDTO.getClientType());
if(null != audit) {
CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
CodeVersionInfoResultDTO.AuditBean auditBean = new CodeVersionInfoResultDTO.AuditBean();
auditBean.setCodeId(audit.getId());
auditBean.setVersion(audit.getUserVersion());
@ -191,7 +192,6 @@ public class CodeServiceImpl implements CodeService {
//获取小程序调用令牌
AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
//获取审核结果信息
CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(audit.getId());
//调用微信API获取最新审核状态
WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
request.setAuditId(auditResult.getAuditId());
@ -222,6 +222,7 @@ public class CodeServiceImpl implements CodeService {
}
}
auditBean.setStatus(audit.getStatus());
auditBean.setIsSpeed(auditResult.getIsSpeed());
auditBean.setCommitTime(DateUtils.format(audit.getCommitTime(), DateUtils.DATE_TIME_PATTERN));
auditBean.setAuditTime(DateUtils.format(audit.getAuditTime(), DateUtils.DATE_TIME_PATTERN));
resultDTO.setAudit(auditBean);
@ -283,6 +284,7 @@ public class CodeServiceImpl implements CodeService {
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxResult.getErrorMsg());
throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
}
boolean speedSuccess = false;
if(formDTO.getIsSpeed()) {
//调用微信API 加急审核
WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq();
@ -291,8 +293,9 @@ public class CodeServiceImpl implements CodeService {
if (!wxSpeedResult.success()) {
saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(),
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
log.error(wxSpeedResult.getErrorMsg());
}
speedSuccess = wxSpeedResult.success();
}
//获取审核结果信息
CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId());
@ -302,18 +305,24 @@ public class CodeServiceImpl implements CodeService {
codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
codeAuditResultDTO.setAuditId(wxResult.getData());
codeAuditResultDTO.setIsSpeed(speedSuccess);
codeAuditResultDTO.setResult(CodeConstant.AUDITING);
codeAuditResultService.save(codeAuditResultDTO);
} else {
codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
codeAuditResultService.update(codeAuditResultDTO);
codeAuditResultService.deleteById(codeAuditResultDTO.getId());
codeAuditResultDTO = new CodeAuditResultDTO();
codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo());
codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff());
codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId());
codeAuditResultDTO.setCodeId(codeCustomerDTO.getId());
codeAuditResultDTO.setAuditId(wxResult.getData());
codeAuditResultDTO.setResult(CodeConstant.AUDITING);
if (formDTO.getIsRepeat()) {
codeAuditResultDTO.setIsSpeed(true);
} else {
codeAuditResultDTO.setIsSpeed(speedSuccess);
}
codeAuditResultService.save(codeAuditResultDTO);
}
//更新代码表状态
@ -575,12 +584,12 @@ public class CodeServiceImpl implements CodeService {
//设置服务器域名
WxResult<WxMaModifyDomainResult> modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set");
if (!modifyDomain.success()) {
throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg());
log.error(modifyDomain.getErrorMsg());
}
//设置业务域名
WxResult<WxMaSetWebviewDomainResult> setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set");
if (!setWebviewDomain.success()) {
throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg());
log.error(modifyDomain.getErrorMsg());
}
});
}
@ -656,6 +665,8 @@ public class CodeServiceImpl implements CodeService {
codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, wxSpeedResult.getErrorMsg());
throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg());
}
codeAuditResultDTO.setIsSpeed(true);
codeAuditResultService.update(codeAuditResultDTO);
}
@Override

56
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java

@ -31,6 +31,8 @@ import com.epmet.commons.tools.redis.RedisUtils;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.constant.CodeConstant;
import com.epmet.constant.ModuleConstant;
import com.epmet.constant.PaConstant;
import com.epmet.dao.*;
import com.epmet.dto.*;
@ -102,6 +104,8 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
private WxMaCodeService wxMaCodeService;
@Autowired
private AuthorizationInfoDao authorizationInfoDao;
@Autowired
private ComponentAccessTokenDao componentAccessTokenDao;
@Override
public PageData<PaCustomerDTO> page(Map<String, Object> params) {
@ -641,4 +645,56 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
return new PageData<>(list, pageInfo.getTotal());
}
/**
* @Description 获取客户第三方token
* @NEI https://nei.netease.com/interface/detail/res/?pid=52285&id=323480
* @param param
* @return
* @author wangc
* @date 2020.08.25 14:51
**/
@Override
public CustomerTokensResultDTO tokenList(CommonCustomerIdFormDTO param) {
CustomerTokensResultDTO result = new CustomerTokensResultDTO();
String customerName = baseDao.selectCustomerName(param.getCustomerId());
String componentAccessToken = componentAccessTokenDao.selectComponentAccessToken();
List<AuthAccessTokenClientResultDTO> clientList = authorizationInfoDao.selectClientToken(param.getCustomerId());
result.setCustomerId(param.getCustomerId());
result.setComponentAccessToken(StringUtils.isBlank(componentAccessToken) ? "" : componentAccessToken);
result.setCustomerName(StringUtils.isBlank(customerName) ? "" : customerName);
if(null != clientList || !clientList.isEmpty()){
clientList.forEach(client -> {
if(StringUtils.equals(CodeConstant.WORK,client.getClientType())){
result.setWorkAuthorizerToken(client.getAccessToken());
}else if(StringUtils.equals(CodeConstant.RESI,client.getClientType())){
result.setResiAuthorizerToken(client.getAccessToken());
}
});
}
return result;
}
/**
* @Description 公众号客户删除
* @NEI https://nei.netease.com/interface/detail/?pid=52285&id=323482
* @param param
* @return
* @author wangc
* @date 2020.08.25 15:46
**/
@Override
@Transactional(rollbackFor = Exception.class)
public void clearPublicCustomer(CommonCustomerIdAndSrcFormDTO param) {
if(StringUtils.equals(ModuleConstant.SRC_PROD,param.getSource())){
logger.warn("有人试图删除用户的生产数据,试图删除的客户Id:{},操作者Id:{}",param.getCustomerId(),param.getUserId());
throw new RenException("禁止对生产环境数据进行删除操作!");
}
String check = baseDao.selectSourceById(param.getCustomerId(),param.getSource());
if (!StringUtils.equals(check,param.getCustomerId())) {
logger.warn("com.epmet.service.impl.PaCustomerServiceImpl.clearPublicCustomer,客户来源信息不匹配,客户Id:{},来源:{}",param.getCustomerId(),param.getSource());
return ;
}
baseDao.clearCustomerInfo(param.getCustomerId());
}
}

2
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java

@ -44,7 +44,7 @@ public interface WxMaCodeConstant {
* 下面注释url为按钮形式
*/
String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/cgi-bin/componentloginpage?component_appid=%s&pre_auth_code=%s&redirect_uri=%s";
// String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s#wechat_redirect";
// String API_AUTH_REGISTER_URL = "https://mp.weixin.qq.com/safe/bindcomponent?action=bindcomponent&auth_type=3&no_scan=1&component_appid=%s&pre_auth_code=%s&redirect_uri=%s&auth_type=3#wechat_redirect";
/**
* 创建开放平台帐号并绑定公众号/小程序

14
epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@ -123,6 +123,14 @@ third:
- https://epmet-dev.elinkservice.cn
- https://epmet-test.elinkservice.cn
webviewDomain:
- udp://epmet-cloud.elinkservice.cn
- udp://epmet-dev.elinkservice.cn
- udp://epmet-test.elinkservice.cn
- https://epmet-ext.elinkservice.cn
- https://epmet-ext1.elinkservice.cn
- https://epmet-ext2.elinkservice.cn
- https://epmet-ext3.elinkservice.cn
- https://epmet-ext4.elinkservice.cn
- https://epmet-ext5.elinkservice.cn
- https://epmet-ext6.elinkservice.cn
- https://epmet-ext7.elinkservice.cn
- https://epmet-ext8.elinkservice.cn
- https://epmet-ext9.elinkservice.cn
- https://epmet-ext10.elinkservice.cn

1
epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.9__thirdUpdate.sql

@ -0,0 +1 @@
ALTER TABLE code_audit_result ADD COLUMN IS_SPEED tinyint NULL DEFAULT 0 COMMENT '是否加急' AFTER RESULT;

12
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml

@ -121,4 +121,16 @@
</if>
</select>
<!-- 查询来源端对应的accessToken -->
<select id="selectClientToken" resultType="com.epmet.dto.result.AuthAccessTokenClientResultDTO">
SELECT
CLIENT_TYPE,
AUTHORIZER_ACCESS_TOKEN AS accessToken
FROM
authorization_info
WHERE
DEL_FLAG = '0'
AND CUSTOMER_ID = #{customerId}
</select>
</mapper>

11
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml

@ -48,4 +48,15 @@
AND (UNIX_TIMESTAMP(expires_in_time) - UNIX_TIMESTAMP(NOW())) <![CDATA[ <= ]]> 900
</select>
<!-- 查询ComponentAccessToken【唯一】 -->
<select id="selectComponentAccessToken" resultType="java.lang.String">
SELECT
COMPONENT_ACCESS_TOKEN
FROM
component_access_token
WHERE
DEL_FLAG = '0'
ORDER BY UPDATED_TIME DESC
LIMIT 1
</select>
</mapper>

50
epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml

@ -146,4 +146,54 @@
AND id = #{oldCustomerId}
</update>
<!-- 清除用户信息 -->
<delete id="clearCustomerInfo">
DELETE FROM auth_code WHERE CUSTOMER_ID = #{customerId};
DELETE FROM auth_result_record WHERE CUSTOMER_ID = #{customerId};
DELETE FROM authorization_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM binding_account WHERE CUSTOMER_ID = #{customerId};
DELETE FROM business_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_audit_record WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_audit_result WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_customer WHERE CUSTOMER_ID = #{customerId};
DELETE FROM code_operation_history WHERE CUSTOMER_ID = #{customerId};
DELETE FROM customer_mp WHERE CUSTOMER_ID = #{customerId};
DELETE FROM func_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_category_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM mini_network_info WHERE CUSTOMER_ID = #{customerId};
DELETE FROM open_platform_account WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer_agency WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer_user_agency WHERE CUSTOMER_ID = #{customerId};
DELETE FROM pa_customer WHERE ID = #{customerId};
</delete>
<!-- 根据客户Id查询当前客户的来源 -->
<select id="selectSourceById" resultType="java.lang.String">
SELECT
ID
FROM
PA_CUSTOMER
WHERE
ID = #{customerId}
AND
SOURCE = #{source}
</select>
</mapper>

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

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

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-mine-server:
container_name: gov-mine-server-prod
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.33
image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.34
ports:
- "8098:8098"
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"
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">
<version>0.3.33</version>
<version>0.3.34</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>gov-mine</artifactId>

8
epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java

@ -220,6 +220,14 @@ public class StaffAgencyServiceImpl implements StaffAgencyService {
Result<CustomerGridByUserIdResultDTO> staffGridResult =
govOrgFeignClient.getStaffGrid(latestGridFormDTO);
if (staffGridResult.success() && null != staffGridResult.getData() && StringUtils.isNotBlank(staffGridResult.getData().getGridId())) {
StaffGridVisitedFormDTO gridRecordParam = new StaffGridVisitedFormDTO();
gridRecordParam.setGridId(staffGridResult.getData().getGridId());
gridRecordParam.setCustomerId(latestGridFormDTO.getCustomerId());
gridRecordParam.setStaffId(latestGridFormDTO.getStaffId());
Result writeRecordResult = epmetUserFeignClient.saveStaffGridVisitedRecord(gridRecordParam);
if(writeRecordResult.success()){
logger.warn("com.epmet.service.impl.StaffAgencyServiceImpl.getLatestGrid,工作人员网格访问网格写入失败,staffId:{},gridId:{}",latestGridFormDTO.getStaffId(),staffGridResult.getData().getGridId());
}
return staffGridResult;
}
}

101
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/StaffTransferRecordDTO.java

@ -0,0 +1,101 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Data
public class StaffTransferRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private String id;
/**
* 客户ID
*/
private String customerId;
/**
* 调动人员Id(操作人)
*/
private String operateStaffId;
/**
* 被调动人员Id
*/
private String operatedStaffId;
/**
* 调动前组织Id
*/
private String oldAgencyId;
/**
* 调动后组织Id
*/
private String agencyId;
/**
* 备注说明
*/
private String remarks;
/**
* 删除标识
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

30
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffTransferFormDTO.java

@ -0,0 +1,30 @@
package com.epmet.dto.form;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author zhaoqifeng
* @dscription
* @date 2020/8/27 16:05
*/
@NoArgsConstructor
@Data
public class StaffTransferFormDTO implements Serializable {
private static final long serialVersionUID = -9011669876505775874L;
/**
* 被调动工作人员Id
*/
private String staffId;
/**
* 调动后组织Id
*/
private String agencyId;
/**
* 备注说明
*/
private String remarks;
}

6
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyResultDTO.java

@ -17,6 +17,7 @@
package com.epmet.dto.result;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
import java.io.Serializable;
@ -40,4 +41,9 @@ public class AgencyResultDTO implements Serializable {
* 机关组织名称
*/
private String agencyName = "";
/**
* 所有上级组织机构ID(以英文:隔开)
*/
@JsonIgnore
private String pids = "";
}

44
epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInAgencyListResultDTO.java

@ -0,0 +1,44 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dto.result;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 工作端-查询当前人员所属组织及所有下级组织--接口返参
*
* @author sun
*/
@Data
public class StaffInAgencyListResultDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 当前组织信息
*/
private AgencyResultDTO agencyList;
/**
* 下级组织信息(递归)
*/
private List<AgencySubResultDTO> subAgencyList;
}

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

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

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

@ -89,6 +89,12 @@
<version>2.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.epmet</groupId>
<artifactId>epmet-heart-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/constant/CustomerAgencyConstant.java

@ -67,4 +67,8 @@ public interface CustomerAgencyConstant {
* 网格党建指导员角色
*/
String GRID_PARTY_DIRECTOR = "grid_party_director";
/**
* 获取工作人员组织信息失败
*/
String SELECT_STAFF_AGENCY_EXCEPTION = "获取工作人员组织信息失败";
}

13
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@ -17,7 +17,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -229,4 +231,15 @@ public class CustomerAgencyController {
Result<ExtUserInfoResultDTO> userInfoExt(@RequestBody ExtUserInfoResultDTO result){
return new Result<ExtUserInfoResultDTO>().ok(customerAgencyService.extUserInfo(result));
}
/**
* @param tokenDTO
* @return
* @Author sun
* @Description 工作端-查询当前人员所属组织及所有下级组织
**/
@PostMapping("staffinagencylist")
public Result<StaffInAgencyListResultDTO> staffInAgencyList(@LoginUser TokenDto tokenDTO) {
return new Result<StaffInAgencyListResultDTO>().ok(customerAgencyService.staffInAgencyList(tokenDTO.getUserId()));
}
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java

@ -10,6 +10,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
import com.epmet.dto.form.StaffTransferFormDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.result.*;
import com.epmet.service.StaffService;
@ -135,4 +136,19 @@ public class StaffController {
public Result<MineResultDTO> mine(@RequestBody StaffInfoFromDTO fromDTO){
return new Result<MineResultDTO>().ok(staffService.mine(fromDTO));
}
/**
* 工作人员调动
*
* @author zhaoqifeng
* @date 2020/8/27 16:12
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
*/
@PostMapping("stafftransfer")
public Result staffTransfer(@LoginUser TokenDto tokenDto, @RequestBody StaffTransferFormDTO formDTO){
staffService.staffTransfer(tokenDto, formDTO);
return new Result();
}
}

94
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffTransferRecordController.java

@ -0,0 +1,94 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.controller;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.StaffTransferRecordDTO;
import com.epmet.excel.StaffTransferRecordExcel;
import com.epmet.service.StaffTransferRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@RestController
@RequestMapping("stafftransferrecord")
public class StaffTransferRecordController {
@Autowired
private StaffTransferRecordService staffTransferRecordService;
@GetMapping("page")
public Result<PageData<StaffTransferRecordDTO>> page(@RequestParam Map<String, Object> params){
PageData<StaffTransferRecordDTO> page = staffTransferRecordService.page(params);
return new Result<PageData<StaffTransferRecordDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<StaffTransferRecordDTO> get(@PathVariable("id") String id){
StaffTransferRecordDTO data = staffTransferRecordService.get(id);
return new Result<StaffTransferRecordDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody StaffTransferRecordDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
staffTransferRecordService.save(dto);
return new Result();
}
@PutMapping
public Result update(@RequestBody StaffTransferRecordDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
staffTransferRecordService.update(dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
staffTransferRecordService.delete(ids);
return new Result();
}
@GetMapping("export")
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<StaffTransferRecordDTO> list = staffTransferRecordService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, StaffTransferRecordExcel.class);
}
}

16
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java

@ -133,7 +133,14 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
* @date 2020.08.17 09:50
**/
ExtStaffInfoResultDTO selectAgencyAndGridInfoExt(@Param("gridId") String gridId);
/**
* @Description 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息
* @param staffId
* @return
* @author wangc
* @date 2020.08.17 09:50
**/
ExtStaffInfoResultDTO selectAgencyInfoWhenGridIdIsNull(@Param("staffId")String staffId);
/**
* @Description 根据agencyId查找指定机构的信息直属网格部门
* @param agencyId
@ -161,4 +168,11 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
**/
List<ExtDeptResultDTO> selectDeptList(@Param("agencyId") String agencyId);
/**
* @param staffId
* @return
* @Author sun
* @Description 查询工作人员所属组织信息
**/
AgencyResultDTO selectAgencyByStaffId(@Param("staffId") String staffId);
}

9
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java

@ -84,4 +84,13 @@ public interface CustomerDepartmentDao extends BaseDao<CustomerDepartmentEntity>
* @Description 查询机关下部门列表信息
**/
List<AgencyDeptList> selectAgencyDeptMsgList(@Param("agencyId") String agencyId);
/**
* 删除工作人员与部门关联
* @author zhaoqifeng
* @date 2020/8/28 15:12
* @param staffId
* @return void
*/
void deleteStaffDep(@Param("staffId") String staffId);
}

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

@ -224,4 +224,22 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
* @date 2020/8/12 5:10 下午
*/
Integer selectGridCount(@Param("customerId")String customerId);
/**
* 删除工作人员与网格关联
* @author zhaoqifeng
* @date 2020/8/28 15:32
* @param staffId
* @return void
*/
void deleteGridStaff(@Param("staffId") String staffId);
/**
* 查询工作人员所在网格
* @author zhaoqifeng
* @date 2020/8/28 15:41
* @param staffId
* @return java.util.List<com.epmet.entity.CustomerGridEntity>
*/
List<CustomerGridEntity> selectGridByStaff(@Param("staffId") String staffId);
}

33
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffTransferRecordDao.java

@ -0,0 +1,33 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.StaffTransferRecordEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Mapper
public interface StaffTransferRecordDao extends BaseDao<StaffTransferRecordEntity> {
}

71
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/StaffTransferRecordEntity.java

@ -0,0 +1,71 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("staff_transfer_record")
public class StaffTransferRecordEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户ID
*/
private String customerId;
/**
* 调动人员Id(操作人)
*/
private String operateStaffId;
/**
* 被调动人员Id
*/
private String operatedStaffId;
/**
* 调动前组织Id
*/
private String oldAgencyId;
/**
* 调动后组织Id
*/
private String agencyId;
/**
* 备注说明
*/
private String remarks;
}

74
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/StaffTransferRecordExcel.java

@ -0,0 +1,74 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Data
public class StaffTransferRecordExcel {
@Excel(name = "ID")
private String id;
@Excel(name = "客户ID")
private String customerId;
@Excel(name = "调动人员Id(操作人)")
private String operateStaffId;
@Excel(name = "被调动人员Id")
private String operatedStaffId;
@Excel(name = "调动前组织Id")
private String oldAgencyId;
@Excel(name = "调动后组织Id")
private String agencyId;
@Excel(name = "备注说明")
private String remarks;
@Excel(name = "删除标识")
private String delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

47
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/StaffTransferRecordRedis.java

@ -0,0 +1,47 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.redis;
import com.epmet.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Component
public class StaffTransferRecordRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

8
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java

@ -205,4 +205,12 @@ public interface CustomerAgencyService extends BaseService<CustomerAgencyEntity>
* @date 2020.08.21 17:31
**/
ExtUserInfoResultDTO extUserInfo(ExtUserInfoResultDTO result);
/**
* @param staffId
* @return
* @Author sun
* @Description 工作端-查询当前人员所属组织及所有下级组织
**/
StaffInAgencyListResultDTO staffInAgencyList(String staffId);
}

10
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerDepartmentService.java

@ -92,4 +92,14 @@ public interface CustomerDepartmentService extends BaseService<CustomerDepartmen
* @date 2020-04-20
*/
void delete(String[] ids);
/**
* 更新部门工作人员关系
*
* @author zhaoqifeng
* @date 2020/8/28 15:20
* @param staffId
* @return void
*/
void updateDepartment(String staffId);
}

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

@ -259,4 +259,13 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
* @date 2020/8/14 9:31 上午
*/
CustomerGridCountResultDTO selectGridCount( CustomerIdFormDTO customerIdFormDTO);
/**
* 更新网格工作人员关系
* @author zhaoqifeng
* @date 2020/8/28 15:36
* @param staffId
* @return void
*/
void updateGrid(String staffId);
}

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

@ -4,6 +4,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
import com.epmet.dto.form.StaffTransferFormDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.result.*;
@ -84,11 +85,22 @@ public interface StaffService {
/**
* 我的基本信息
*
* @author zhaoqifeng
* @date 2020/5/22 16:57
* @param fromDTO
* @return com.epmet.dto.result.MineResultDTO
*/
MineResultDTO mine(StaffInfoFromDTO fromDTO);
/**
* 工作人员调动
* @author zhaoqifeng
* @date 2020/8/27 16:13
* @param tokenDto
* @param fromDTO
* @return void
*/
void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO);
}

95
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffTransferRecordService.java

@ -0,0 +1,95 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.StaffTransferRecordDTO;
import com.epmet.entity.StaffTransferRecordEntity;
import java.util.List;
import java.util.Map;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
public interface StaffTransferRecordService extends BaseService<StaffTransferRecordEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<StaffTransferRecordDTO>
* @author generator
* @date 2020-08-27
*/
PageData<StaffTransferRecordDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<StaffTransferRecordDTO>
* @author generator
* @date 2020-08-27
*/
List<StaffTransferRecordDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return StaffTransferRecordDTO
* @author generator
* @date 2020-08-27
*/
StaffTransferRecordDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-08-27
*/
void save(StaffTransferRecordDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-08-27
*/
void update(StaffTransferRecordDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-08-27
*/
void delete(String[] ids);
}

49
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@ -848,8 +848,12 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
public ExtStaffInfoResultDTO staffInfoExt(ExtStaffInfoResultDTO result) {
//1.查找对应的所属关系,通过最近一次登陆的网格,通过网格查找对应的机关和客户
ExtStaffInfoResultDTO orgInfo =
baseDao.selectAgencyAndGridInfoExt(result.getGridId());
ExtStaffInfoResultDTO orgInfo;
if(StringUtils.isNotBlank(result.getGridId())){
orgInfo = baseDao.selectAgencyAndGridInfoExt(result.getGridId());
}else{
orgInfo = baseDao.selectAgencyInfoWhenGridIdIsNull(result.getUserId());
}
mergeObject(orgInfo,result);
//2.查找客户名称
CustomerDTO customerParam = new CustomerDTO();
@ -881,22 +885,17 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
@Override
public ExtStaffPermissionResultDTO staffPermissionExt(String staffId) {
//1.通过staffId去user服务查询最近一次登陆的agencyId
Result<String> agency =
epmetUserOpenFeignClient.latestAgency(staffId);
if(agency.success() && StringUtils.isNotBlank(agency.getData())){
//2.根据此agencyId查询数据权限
ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getData());
return res;
}else{
logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt,没有找到工作人员最近一次登陆的Agency信息,用户Id:{}",staffId);
CustomerStaffAgencyDTO agency = customerStaffAgencyDao.selectLatestCustomerByStaff(staffId);
if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
logger.error("com.epmet.service.impl.CustomerAgencyServiceImpl.staffPermissionExt,没有找到工作人员所属的机关信息,用户Id:{}",staffId);
ExtStaffPermissionResultDTO emptyResult = new ExtStaffPermissionResultDTO();
checkFieldAndSetDefault(emptyResult);
return emptyResult;
}
ExtStaffPermissionResultDTO res = baseDao.selectAgencyById(agency.getAgencyId());
return res;
}
/**
@ -971,4 +970,28 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
}
}
/**
* @param staffId
* @return
* @Author sun
* @Description 工作端-查询当前人员所属组织及所有下级组织
**/
@Override
public StaffInAgencyListResultDTO staffInAgencyList(String staffId) {
StaffInAgencyListResultDTO resultDTO = new StaffInAgencyListResultDTO();
//1.查询工作人员所属组织信息
AgencyResultDTO agencyList = baseDao.selectAgencyByStaffId(staffId);
if (null == agencyList) {
logger.error(String.format("查询工作人员所属组织信息失败,staffId->%s", staffId));
throw new RenException(CustomerAgencyConstant.SELECT_STAFF_AGENCY_EXCEPTION);
}
resultDTO.setAgencyList(agencyList);
//2.递归查询所有下级组织信息
List<AgencySubResultDTO> subAgencyList = getDepartmentList(("".equals(agencyList.getPids()) ? "" : agencyList.getPids() + ":") + agencyList.getAgencyId());
resultDTO.setSubAgencyList(subAgencyList);
return resultDTO;
}
}

24
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerDepartmentServiceImpl.java

@ -20,11 +20,13 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.CustomerDepartmentDao;
import com.epmet.dto.CustomerDepartmentDTO;
import com.epmet.dto.result.DepartmentListResultDTO;
import com.epmet.entity.CustomerDepartmentEntity;
import com.epmet.redis.CustomerDepartmentRedis;
import com.epmet.service.CustomerDepartmentService;
@ -33,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -101,4 +104,25 @@ public class CustomerDepartmentServiceImpl extends BaseServiceImpl<CustomerDepar
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateDepartment(String staffId) {
//获取工作人员所在部门及部门总人数
List<DepartmentListResultDTO> list = baseDao.listDepartmentListByStaffId(staffId);
if (null != list && list.size() > NumConstant.ZERO) {
List<CustomerDepartmentEntity> entityList = new ArrayList<>();
for (DepartmentListResultDTO dto : list) {
CustomerDepartmentEntity entity = new CustomerDepartmentEntity();
entity.setId(dto.getDepartmentId());
entity.setTotalUser(dto.getTotalUser() - NumConstant.ONE);
entityList.add(entity);
}
//更新部门总人数
updateBatchById(entityList);
//删除工作人员与部门关联
baseDao.deleteStaffDep(staffId);
}
}
}

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

@ -649,4 +649,17 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
return customerGridCount;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateGrid(String staffId) {
List<CustomerGridEntity> gridList = baseDao.selectGridByStaff(staffId);
if(null != gridList && gridList.size() > NumConstant.ZERO) {
gridList.forEach(entity -> {
entity.setTotalUser(entity.getTotalUser() - 1);
});
updateBatchById(gridList);
baseDao.deleteGridStaff(staffId);
}
}
}

91
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@ -1,22 +1,17 @@
package com.epmet.service.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.CustomerAgencyDTO;
import com.epmet.dto.CustomerStaffAgencyDTO;
import com.epmet.dto.CustomerStaffDTO;
import com.epmet.dto.form.StaffInfoFromDTO;
import com.epmet.dto.form.StaffSubmitFromDTO;
import com.epmet.dto.form.StaffsInAgencyFromDTO;
import com.epmet.dto.*;
import com.epmet.dto.form.*;
import com.epmet.dto.result.*;
import com.epmet.entity.CustomerAgencyEntity;
import com.epmet.entity.CustomerStaffAgencyEntity;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.OperCrmFeignClient;
import com.epmet.service.CustomerAgencyService;
import com.epmet.service.CustomerStaffAgencyService;
import com.epmet.service.StaffService;
import com.epmet.feign.*;
import com.epmet.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -40,6 +35,18 @@ public class StaffServiceImpl implements StaffService {
private CustomerAgencyService customerAgencyService;
@Autowired
private CustomerStaffAgencyService customerStaffAgencyService;
@Autowired
private GovProjectOpenFeignClient govProjectOpenFeignClient;
@Autowired
private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient;
@Autowired
private CustomerDepartmentService customerDepartmentService;
@Autowired
private CustomerGridService customerGridService;
@Autowired
private StaffTransferRecordService staffTransferRecordService;
@Autowired
private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
@Override
public Result<StaffsInAgencyResultDTO> getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) {
@ -183,4 +190,66 @@ public class StaffServiceImpl implements StaffService {
}
return result;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO) {
//1.获取工作人员与机关关系
CustomerStaffAgencyDTO staffAgencyDTO = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
String oldAgency = staffAgencyDTO.getAgencyId();
//2.查询是否有未处理项目
ProjectListFromDTO projectFromDTO = new ProjectListFromDTO();
projectFromDTO.setCustomerId(staffAgencyDTO.getCustomerId());
projectFromDTO.setUserId(fromDTO.getStaffId());
projectFromDTO.setPageNo(1);
projectFromDTO.setPageSize(10);
Result<List<PendProjectListResultDTO>> pendResult = govProjectOpenFeignClient.getPendProjectList(projectFromDTO);
if (!pendResult.success()) {
throw new RenException(pendResult.getCode(), pendResult.getMsg());
}
if (null != pendResult.getData() && pendResult.getData().size() > NumConstant.ZERO) {
throw new RenException(EpmetErrorCode.EXIT_PEND_PROJECT.getCode());
}
//3.查询是否有活动未结束
Result<List<ActInfoDTO>> actInfoResult = epmetHeartOpenFeignClient.getPublishedAct(fromDTO.getStaffId());
if (!actInfoResult.success()) {
throw new RenException(actInfoResult.getCode(), actInfoResult.getMsg());
}
if (null != actInfoResult.getData() && actInfoResult.getData().size() > NumConstant.ZERO) {
throw new RenException(EpmetErrorCode.EXIT_PUBLISHED_ACTIVITY.getCode());
}
//4.修改人员所属组织
CustomerStaffAgencyDTO staffAgency = new CustomerStaffAgencyDTO();
staffAgency.setId(staffAgencyDTO.getId());
staffAgency.setAgencyId(fromDTO.getAgencyId());
customerStaffAgencyService.update(staffAgency);
//原来组织总人数减一
CustomerAgencyDTO oldAgencyDTO = customerAgencyService.get(oldAgency);
oldAgencyDTO.setTotalUser(oldAgencyDTO.getTotalUser() - NumConstant.ONE);
customerAgencyService.update(oldAgencyDTO);
//新组织总人数加一
CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(fromDTO.getAgencyId());
newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() - NumConstant.ONE);
customerAgencyService.update(newAgencyDTO);
//5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1
customerDepartmentService.updateDepartment(fromDTO.getStaffId());
customerGridService.updateGrid(fromDTO.getStaffId());
//6.更改工作人员组织角色
StaffRoleDTO staffRoleDTO = new StaffRoleDTO();
staffRoleDTO.setOrgId(fromDTO.getAgencyId());
staffRoleDTO.setStaffId(fromDTO.getStaffId());
Result result = epmetUserOpenFeignClient.changeRoleOrg(staffRoleDTO);
if (!result.success()) {
throw new RenException(result.getCode(), result.getMsg());
}
//7.操作记录表新增调动记录
StaffTransferRecordDTO staffTransferRecordDTO = new StaffTransferRecordDTO();
staffTransferRecordDTO.setCustomerId(tokenDto.getCustomerId());
staffTransferRecordDTO.setOperateStaffId(tokenDto.getUserId());
staffTransferRecordDTO.setOperatedStaffId(fromDTO.getStaffId());
staffTransferRecordDTO.setOldAgencyId(oldAgency);
staffTransferRecordDTO.setAgencyId(fromDTO.getAgencyId());
staffTransferRecordDTO.setRemarks(fromDTO.getRemarks());
staffTransferRecordService.save(staffTransferRecordDTO);
}
}

104
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffTransferRecordServiceImpl.java

@ -0,0 +1,104 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.StaffTransferRecordDao;
import com.epmet.dto.StaffTransferRecordDTO;
import com.epmet.entity.StaffTransferRecordEntity;
import com.epmet.redis.StaffTransferRecordRedis;
import com.epmet.service.StaffTransferRecordService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 工作人员调动记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-08-27
*/
@Service
public class StaffTransferRecordServiceImpl extends BaseServiceImpl<StaffTransferRecordDao, StaffTransferRecordEntity> implements StaffTransferRecordService {
@Autowired
private StaffTransferRecordRedis staffTransferRecordRedis;
@Override
public PageData<StaffTransferRecordDTO> page(Map<String, Object> params) {
IPage<StaffTransferRecordEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, StaffTransferRecordDTO.class);
}
@Override
public List<StaffTransferRecordDTO> list(Map<String, Object> params) {
List<StaffTransferRecordEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, StaffTransferRecordDTO.class);
}
private QueryWrapper<StaffTransferRecordEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<StaffTransferRecordEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public StaffTransferRecordDTO get(String id) {
StaffTransferRecordEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, StaffTransferRecordDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(StaffTransferRecordDTO dto) {
StaffTransferRecordEntity entity = ConvertUtils.sourceToTarget(dto, StaffTransferRecordEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(StaffTransferRecordDTO dto) {
StaffTransferRecordEntity entity = ConvertUtils.sourceToTarget(dto, StaffTransferRecordEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

16
epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.2__staff_transfer_record.sql

@ -0,0 +1,16 @@
CREATE TABLE `staff_transfer_record` (
`ID` varchar(64) NOT NULL COMMENT 'ID',
`CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
`OPERATE_STAFF_ID` varchar(64) NOT NULL COMMENT '调动人员Id(操作人)',
`OPERATED_STAFF_ID` varchar(64) NOT NULL COMMENT '被调动人员Id',
`OLD_AGENCY_ID` varchar(64) NOT NULL COMMENT '调动前组织Id',
`AGENCY_ID` varchar(64) NOT NULL COMMENT '调动后组织Id',
`REMARKS` varchar(255) DEFAULT NULL COMMENT '备注说明',
`DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识',
`REVISION` int(10) NOT NULL COMMENT '乐观锁',
`CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
`CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
`UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
`UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='工作人员调动记录表';

30
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@ -169,6 +169,22 @@
ORDER BY created_time DESC
</select>
<!-- 当没有工作人员最近访问的gridId时查询该用户所属的组织机关信息 -->
<select id="selectAgencyInfoWhenGridIdIsNull" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
SELECT
agency.ID AS agencyId,
agency.ORGANIZATION_NAME AS agencyName,
agency.PIDS AS agencyIdPath,
agency.ALL_PARENT_NAME AS agencyNamePath,
agency.CUSTOMER_ID AS customerId
FROM
CUSTOMER_STAFF_AGENCY staff
LEFT JOIN CUSTOMER_AGENCY agency ON staff.AGENCY_ID = agency.ID AND agency.DEL_FLAG = '0'
WHERE
staff.DEL_FLAG = '0'
AND staff.USER_ID = #{staffId}
</select>
<!-- 查询一个工作人员最近登录的网格以及机关信息 -->
<select id="selectAgencyAndGridInfoExt" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
SELECT
@ -261,4 +277,18 @@
AND agency.PID = #{pid}
</select>
<select id="selectAgencyByStaffId" resultType="com.epmet.dto.result.AgencyResultDTO">
SELECT
ca.id AS "agencyId",
ca.organization_name AS "agencyName",
ca.pids AS "pids"
FROM
customer_agency ca
INNER JOIN customer_staff_agency csa ON ca.id = csa.agency_id
WHERE
ca.del_flag = '0'
AND csa.del_flag = '0'
AND csa.user_id = #{staffId}
</select>
</mapper>

5
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml

@ -2,6 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.CustomerDepartmentDao">
<delete id="deleteStaffDep">
UPDATE customer_staff_department SET DEL_FLAG = '1'
WHERE USER_ID = #{staffId} AND DEL_FLAG = '0'
</delete>
<select id="selectDepartmentListByAgencyId" resultType="com.epmet.dto.result.DepartmentListResultDTO">
SELECT
@ -32,6 +36,7 @@
from customer_staff_department csd
inner join customer_department cd on (csd.DEPARTMENT_ID = cd.ID)
where csd.USER_ID = #{staffId}
and csd.DEL_FLAG = '0'
</select>
<!-- 根据部门id查询customerId -->

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

@ -2,6 +2,10 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.CustomerGridDao">
<delete id="deleteGridStaff">
UPDATE customer_staff_grid SET DEL_FLAG = '1'
WHERE USER_ID = #{staffId} AND DEL_FLAG = '0'
</delete>
<select id="getCustomerGridByGridId" parameterType="com.epmet.dto.form.CustomerGridFormDTO"
resultType="com.epmet.dto.CustomerGridDTO">
SELECT
@ -473,4 +477,17 @@
del_flag = '0'
AND customer_id = #{customerId}
</select>
<select id="selectGridByStaff" resultType="com.epmet.entity.CustomerGridEntity">
SELECT
g.ID,
g.GRID_NAME,
g.TOTAL_USER
FROM
customer_staff_grid sg
INNER JOIN customer_grid g ON ( sg.GRID_ID = g.ID )
WHERE
sg.DEL_FLAG = '0'
AND g.DEL_FLAG = '0'
AND sg.USER_ID = #{staffId}
</select>
</mapper>

8
epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffTransferRecordDao.xml

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.StaffTransferRecordDao">
</mapper>

4
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/ProjectDetailResultDTO.java

@ -48,6 +48,10 @@ public class ProjectDetailResultDTO implements Serializable {
* 处理状态(是否由我处理)
*/
private Boolean processable;
/**
* 是否是转项目节点
*/
private Boolean returnable;
/**
* 当前跟进部门
*/

16
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@ -1,9 +1,16 @@
package com.epmet.feign;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.ProjectListFromDTO;
import com.epmet.dto.result.PendProjectListResultDTO;
import org.springframework.cloud.openfeign.FeignClient;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
@ -13,4 +20,13 @@ import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
*/
@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectOpenFeignClientFallback.class)
public interface GovProjectOpenFeignClient {
/**
* 待处理项目列表
* @author zhaoqifeng
* @date 2020/8/27 16:56
* @param fromDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.PendProjectListResultDTO>>
*/
@PostMapping("gov/project/project/pendprojectlist")
Result<List<PendProjectListResultDTO>> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO);
}

11
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@ -1,8 +1,15 @@
package com.epmet.feign.fallback;
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.form.ProjectListFromDTO;
import com.epmet.dto.result.PendProjectListResultDTO;
import com.epmet.feign.GovProjectOpenFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 本服务对外开放的API,其他服务通过引用此client调用该服务
*
@ -11,4 +18,8 @@ import org.springframework.stereotype.Component;
*/
@Component
public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignClient {
@Override
public Result<List<PendProjectListResultDTO>> getPendProjectList(ProjectListFromDTO fromDTO) {
return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "getPendProjectList", fromDTO);
}
}

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

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

20
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java

@ -17,7 +17,11 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.annotation.RequirePermission;
import com.epmet.commons.tools.enums.RequirePermissionEnum;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@ -27,10 +31,12 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.ProjectDTO;
import com.epmet.dto.form.LatestListFormDTO;
import com.epmet.dto.form.ProjectListFromDTO;
import com.epmet.dto.form.ShiftProjectFormDTO;
import com.epmet.dto.form.ShiftProjectsFromDTO;
import com.epmet.dto.result.IssueProjectResultDTO;
import com.epmet.dto.result.LatestListResultDTO;
import com.epmet.dto.result.PendProjectListResultDTO;
import com.epmet.dto.result.ShiftProjectResultDTO;
import com.epmet.excel.ProjectExcel;
import com.epmet.service.ProjectService;
@ -132,4 +138,18 @@ public class ProjectController {
return new Result<List<LatestListResultDTO>>().ok(projectService.getClosedProjectList(formDTO));
}
/**
* 获取待处理项目列表
* @author zhaoqifeng
* @date 2020/8/27 16:55
* @param fromDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.PendProjectListResultDTO>>
*/
@PostMapping("pendprojectlist")
public Result<List<PendProjectListResultDTO>> getPendProjectList(@RequestBody ProjectListFromDTO fromDTO) {
List<PendProjectListResultDTO> result = projectService.getPendProjectList(fromDTO);
return new Result<List<PendProjectListResultDTO>>().ok(result);
}
}

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

@ -70,4 +70,13 @@ public interface ProjectStaffDao extends BaseDao<ProjectStaffEntity> {
* @Description 查询当前处于项目节点中的切工作未处理的工作人员
**/
List<ProjectStaffDTO> selectProjectTransferStaffList(ProjectStaffDTO dto);
/**
* 获取未处理的转项目节点
* @author zhaoqifeng
* @date 2020/8/27 14:26
* @param dto
* @return java.util.List<java.lang.String>
*/
List<String> selectCreatedProcess(ProjectStaffDTO dto);
}

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

@ -106,6 +106,7 @@ public interface ProjectService extends BaseService<ProjectEntity> {
*/
List<PendProjectListResultDTO> getPendProjectList(ProjectListFromDTO fromDTO);
/**
* 我发起的项目列表
*

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

@ -131,4 +131,13 @@ public interface ProjectStaffService extends BaseService<ProjectStaffEntity> {
* @return java.util.List<java.lang.String>
*/
List<String> getStaffsByProjectId(String projectId);
/**
* 获取未处理的转项目节点
* @author zhaoqifeng
* @date 2020/8/27 14:30
* @param dto
* @return java.util.List<java.lang.String>
*/
List<String> getCreatedProcess(ProjectStaffDTO dto);
}

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

Loading…
Cancel
Save