Browse Source

Merge branches 'dev' and 'dev_fix_dim' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_fix_dim

dev_shibei_match
wxz 4 years ago
parent
commit
ee7c8038ca
  1. 12
      epmet-auth/pom.xml
  2. 2
      epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java
  3. 2
      epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
  4. 2
      epmet-auth/src/main/resources/bootstrap.yml
  5. 70
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java
  6. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java
  7. 14
      epmet-module/data-aggregator/data-aggregator-server/pom.xml
  8. 12
      epmet-module/data-report/data-report-server/pom.xml
  9. 4
      epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml
  10. 3
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectGridDailyDao.xml
  11. 3
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml
  12. 9
      epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml
  13. 12
      epmet-module/data-statistical/data-statistical-server/pom.xml
  14. 18
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java
  15. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java
  16. 17
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java
  17. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java
  18. 24
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java
  19. 40
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java
  20. 25
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.java
  21. 38
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.java
  22. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
  23. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
  24. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java
  25. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/DeptScoreServiceImpl.java
  26. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
  27. 40
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
  28. 59
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
  29. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
  30. 82
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
  31. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java
  32. 14
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java
  33. 44
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml
  34. 77
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
  35. 46
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml
  36. 46
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml
  37. 82
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml
  38. 105
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml
  39. 118
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml
  40. 19
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml
  41. 156
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml
  42. 88
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml
  43. 80
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml
  44. 97
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml
  45. 20
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml
  46. 2
      epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/MathUtilTest.java
  47. 16
      epmet-module/epmet-common-service/common-service-server/pom.xml
  48. 12
      epmet-module/epmet-ext/epmet-ext-server/pom.xml
  49. 12
      epmet-module/epmet-heart/epmet-heart-server/pom.xml
  50. 12
      epmet-module/epmet-job/epmet-job-server/pom.xml
  51. 12
      epmet-module/epmet-message/epmet-message-server/pom.xml
  52. 12
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  53. 12
      epmet-module/epmet-point/epmet-point-server/pom.xml
  54. 4
      epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java
  55. 12
      epmet-module/epmet-third/epmet-third-server/pom.xml
  56. 9
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java
  57. 2
      epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java
  58. 14
      epmet-module/gov-grid/gov-grid-server/pom.xml
  59. 10
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java
  60. 12
      epmet-module/gov-issue/gov-issue-server/pom.xml
  61. 14
      epmet-module/gov-mine/gov-mine-server/pom.xml
  62. 12
      epmet-module/gov-org/gov-org-server/pom.xml
  63. 6
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
  64. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java
  65. 53
      epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
  66. 14
      epmet-module/gov-project/gov-project-server/pom.xml
  67. 30
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
  68. 14
      epmet-module/gov-voice/gov-voice-server/pom.xml
  69. 12
      epmet-module/oper-access/oper-access-server/pom.xml
  70. 12
      epmet-module/oper-crm/oper-crm-server/pom.xml
  71. 12
      epmet-module/oper-customize/oper-customize-server/pom.xml
  72. 15
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java
  73. 15
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java
  74. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java
  75. 15
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java
  76. 9
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java
  77. 9
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java
  78. 5
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicAttachmentsResultDTO.java
  79. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java
  80. 12
      epmet-module/resi-group/resi-group-server/pom.xml
  81. 29
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  82. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java
  83. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
  84. 18
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  85. 1
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java
  86. 15
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java
  87. 16
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java
  88. 19
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  89. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
  90. 24
      epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql
  91. 8
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
  92. 27
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
  93. 48
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml
  94. 12
      epmet-module/resi-guide/resi-guide-server/pom.xml
  95. 6
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java
  96. 8
      epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java
  97. 14
      epmet-module/resi-hall/resi-hall-server/pom.xml
  98. 14
      epmet-module/resi-home/resi-home-server/pom.xml
  99. 12
      epmet-module/resi-mine/resi-mine-server/pom.xml
  100. 12
      epmet-module/resi-partymember/resi-partymember-server/pom.xml

12
epmet-auth/pom.xml

@ -194,9 +194,9 @@
<gov.wx.ma.secret>e5e72147737cfeb2b0f3a43624cadb3f</gov.wx.ma.secret>-->
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--第三方平台,酒城e通-->
@ -249,9 +249,9 @@
<gov.wx.ma.secret>e5e72147737cfeb2b0f3a43624cadb3f</gov.wx.ma.secret>-->
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--第三方平台,酒城e通-->
@ -299,9 +299,9 @@
<gov.wx.ma.secret>651f02d71ed3f123dfb584b8bf0f4d8b</gov.wx.ma.secret>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--第三方平台,酒城e通-->

2
epmet-auth/src/main/java/com/epmet/service/impl/GovWebServiceImpl.java

@ -73,7 +73,7 @@ public class GovWebServiceImpl implements GovWebService {
form.setMobile(formDTO.getPhone());
Result<GovWebOperLoginResultDTO> result = epmetUserFeignClient.getStaffIdAndPwd(form);
if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
logger.warn("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在");
throw new RenException(EpmetErrorCode.ERR10003.getCode());
}
GovWebOperLoginResultDTO resultDTO = result.getData();

2
epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java

@ -167,7 +167,7 @@ public class SsoServiceImpl implements SsoService {
//test end
if (!result.success() || null == result.getData() || null == result.getData().getUserId()) {
logger.error("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
logger.warn("根据手机号查询PC工作端登陆人员信息失败,返回10003账号不存在,param:{}", JSON.toJSONString(form));
throw new RenException(EpmetErrorCode.ERR10003.getCode());
}

2
epmet-auth/src/main/resources/bootstrap.yml

@ -145,7 +145,7 @@ thirdplat:
appkey: @thirdplat.jcet.g.appkey@
appsecret: @thirdplat.jcet.g.appsecret@
pyld:
domain: https://epmet-ext1-py.elinkservice.cn/platform
domain: https://epmet-ext1.pingyin.gov.cn/platform
appId: 7a5aec009ba4eba8e254ee64fe3775e1
appKey: 14faef9af508d1c253b720ea5a43f9de
appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595

70
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/KongCunCustomerEnvEnum.java

@ -0,0 +1,70 @@
package com.epmet.commons.tools.enums;
import com.epmet.commons.tools.utils.SpringContextUtils;
import org.springframework.core.env.Environment;
/**
* 系统环境变量枚举类
* dev|test|prod
*
* @author jianjun liu
* @date 2020-07-03 11:14
**/
public enum KongCunCustomerEnvEnum {
/**
* 环境变量枚举
*/
DEV("dev", "开发环境", "613cc61a6b8ce4c70d21bd413dac72cc"),
TEST("test", "体验环境", "b272625617e53620b2b3cbc65d1ecbbb"),
PROD("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80"),
UN_KNOWN("prod", "生产环境", "6f203e30de1a65aab7e69c058826cd80")
;
private String code;
private String name;
private String customerId;
KongCunCustomerEnvEnum(String code, String name, String customerId) {
this.code = code;
this.name = name;
this.customerId = customerId;
}
public static KongCunCustomerEnvEnum getEnum(String code) {
KongCunCustomerEnvEnum[] values = KongCunCustomerEnvEnum.values();
for (KongCunCustomerEnvEnum value : values) {
if (value.getCode().equals(code)) {
return value;
}
}
return KongCunCustomerEnvEnum.UN_KNOWN;
}
public static KongCunCustomerEnvEnum getCurrentEnv(){
try {
Environment environment = SpringContextUtils.getBean(Environment.class);
String[] activeProfiles = environment.getActiveProfiles();
if (activeProfiles.length > 0) {
return getEnum(activeProfiles[0]);
}
} catch (Exception e) {
e.printStackTrace();
}
return KongCunCustomerEnvEnum.UN_KNOWN;
}
public String getCode() {
return code;
}
public String getName() {
return name;
}
public String getCustomerId(){
return customerId;
}
}

4
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DingdingMsgSender.java

@ -33,8 +33,8 @@ public class DingdingMsgSender {
private final Logger logger = LoggerFactory.getLogger(DingdingMsgSender.class);
//如果不设置则为 开发环境机器人地址
private static final String webHook = "https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c";
private static final String secret = "SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19";
private static final String webHook = "https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4";
private static final String secret = "SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd";
/**
* 默认10
*/

14
epmet-module/data-aggregator/data-aggregator-server/pom.xml

@ -176,8 +176,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -257,8 +257,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -338,8 +338,8 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -424,4 +424,4 @@
</properties>
</profile>
</profiles>
</project>
</project>

12
epmet-module/data-report/data-report-server/pom.xml

@ -172,8 +172,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -224,8 +224,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -276,8 +276,8 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>

4
epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@ -28,10 +28,10 @@
ROUND(fact.score,1) AS "indexTotalOriginScore",
fact.WEIGHT AS "indexTotalSupWeight",
ROUND(self.self_score*fact.WEIGHT, 1) AS "agencyScore",
self.self_score AS selfOriginScore,
ROUND(self.self_score,1) AS selfOriginScore,
self.SELF_WEIGHT AS agencyWeight,
ROUND(self.sub_score*fact.WEIGHT, 1) AS "subAgencyScore",
self.sub_score AS subOriginScore,
ROUND(self.sub_score,1) AS subOriginScore,
self.SUB_WEIGHT AS subAgencyWeight
FROM
fact_index_agency_score fact

3
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectGridDailyDao.xml

@ -4,6 +4,7 @@
<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenProjectGridDailyDao">
<!-- 下级网格的效率(解决率)列表 -->
<!-- 排序 +0 是把100排在99上边,不写 '+0'会出现 29 ,28 ,100 -->
<select id="queryGridEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
SELECT
m.CUSTOMER_ID AS customerId,
@ -20,7 +21,7 @@
m.DEL_FLAG = '0'
AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
AND M.DATE_ID=#{dateId}
order by resolvedRatio desc
order by resolvedRatio+0 desc
</select>
<select id="selectLastDateId" resultType="java.lang.String">

3
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectOrgDailyDao.xml

@ -29,6 +29,7 @@
</select>
<!-- 下级组织的效率(解决率)列表 -->
<!-- 排序 +0 是把100排在99上边,不写 '+0'会出现 29 ,28 ,100 -->
<select id="queryEfficiencyAnalysis" parameterType="map" resultType="com.epmet.dto.result.screen.EfficiencyAnalysisResultDTO">
SELECT
m.CUSTOMER_ID AS customerId,
@ -51,6 +52,6 @@
order by t1.DATE_ID desc
limit 1
)and m.CUSTOMER_ID=#{customerId}
order by resolvedRatio desc
order by resolvedRatio+0 desc
</select>
</mapper>

9
epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPublicPartiTotalDataDao.xml

@ -35,6 +35,7 @@
<!-- 查询公众参与各类总数 -->
<!-- 2021-05-26,按照要求,根据注册人数排序 -->
<select id="selectPublicPartiTotalByAreaCode" resultType="com.epmet.evaluationindex.screen.dto.result.PublicPartiRankResultDTO">
SELECT
totalData.ORG_NAME AS NAME,
@ -54,13 +55,7 @@
WHERE
totalData.DEL_FLAG = '0'
AND agency.PARENT_AREA_CODE=#{areaCode}
ORDER BY
(totalData.REG_USER_TOTAL + totalData.JOIN_USER_TOTAL + totalData.TOPIC_TOTAL + totalData.ISSUE_TOTAL + totalData.PROJECT_TOTAL) DESC,
totalData.REG_USER_TOTAL desc,
totalData.JOIN_USER_TOTAL desc,
totalData.TOPIC_TOTAL desc,
totalData.ISSUE_TOTAL desc,
totalData.PROJECT_TOTAL desc
ORDER BY totalData.REG_USER_TOTAL desc
</select>

12
epmet-module/data-statistical/data-statistical-server/pom.xml

@ -252,8 +252,8 @@
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
@ -371,8 +371,8 @@
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
@ -489,8 +489,8 @@
<thread.pool.queue-capacity>10</thread.pool.queue-capacity>
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>

18
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/PingYinConstant.java

@ -0,0 +1,18 @@
package com.epmet.constant;
/**
* @Author zxc
* @DateTime 2021/5/29 9:04 上午
* @DESC
*/
public interface PingYinConstant {
String KONG_CUN_AGENCY_ID = "1234085031077498881";
String KONG_CUN_CUSTOMER_ID = "2fe0065f70ca0e23ce4c26fca5f1d933";
String JIN_SHUI_AGENCY_ID = "1215437824174608386";
String JIN_SHUI__CUSTOMER_ID = "f5ff0770f409981c73adda6ae35143ef";
String YU_SHAN_AGENCY_ID = "";
String YU_SHAN_CUSTOMER_ID = "a4bbf298d8e427844038cee466f022ef";
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java

@ -81,6 +81,8 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
* @date 2020/8/31 1:51 下午
*/
List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvg(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("dataType")String dataType);
List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgNew(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("dataType")String dataType,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 区下级街道得分平均值 存在下级客户
@ -92,6 +94,7 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
* @date 2021/1/18 上午9:09
*/
List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgExistsSub(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgExistsSubNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
List<SubAgencyScoreAvgResultDTO> selectAgencyScoreAvgByOrgIds(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("orgIds")List<String> orgIds);

17
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java

@ -86,7 +86,8 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
* @author zxc
* @date 2020/8/31 1:51 下午
*/
List<SubCommunityAvgResultDTO> selectSubCommAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
List<SubCommunityAvgResultDTO> selectSubCommAvgScoreNew(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 街道下级所有社区得分平均值 存在下级客户
@ -96,9 +97,21 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
* @author zxc
* @date 2021/1/15 下午3:19
*/
List<SubCommunityAvgResultDTO> selectSubCommAvgScoreExistSub(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
List<SubCommunityAvgResultDTO> selectSubCommAvgScoreExistSubNotSelf(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode);
/**
* @Description 街道下级社区平均分
* @Param monthId
* @Param indexCode
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/29 9:28 上午
*/
List<SubCommunityAvgResultDTO> selectSubCommAvgScoreExistSubNotSelfNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("areaCode")String areaCode,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* 根据入参查询 查询社区id
* @param customerId

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/DeptScoreDao.java

@ -67,6 +67,7 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
* @date 2020/9/4 10:53 上午
*/
List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvg(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvgNew(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 所有直属部门治理能力平均值 存在下级客户
@ -78,6 +79,7 @@ public interface DeptScoreDao extends BaseDao<DeptScoreEntity> {
*/
List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvgExistsSub(@Param("areaCode")String areaCode, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvgExistsSubNotSelf(@Param("areaCode")String areaCode, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
List<SubAgencyScoreAvgResultDTO> selectGovernDeptScoreAvgExistsSubNotSelfNew(@Param("areaCode")String areaCode, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @return int

24
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/GridScoreDao.java

@ -78,6 +78,18 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
*/
List<SubGridAvgResultDTO> selectSubGridAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
/**
* @Description 社区-community下级三大能力平均值
* @Param customerId
* @Param monthId
* @Param indexCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/31 9:34 上午
*/
List<SubGridAvgResultDTO> selectSubGridAvgScoreNew(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 所有网格的平均值
* @Param monthId
@ -88,6 +100,18 @@ public interface GridScoreDao extends BaseDao<GridScoreEntity> {
*/
List<SubGridAvgResultDTO> selectSubGridAvgScoreByAreaCode(@Param("monthId")String monthId, @Param("indexCode")String indexCode, @Param("areaCode")String areaCode);
/**
* @Description 社区-community三能能力平均值
* @Param monthId
* @Param indexCode
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/31 9:19 上午
*/
List<SubGridAvgResultDTO> selectSubGridAvgScoreByAreaCodeNew(@Param("monthId")String monthId, @Param("indexCode")String indexCode, @Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* 根据入参查询 网格相关分值记录
* @param customerId

40
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.java

@ -66,6 +66,8 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
* @date 2020/8/26 1:40 下午
*/
List<Map<String,Object>> selectCommunityGovernAbility(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
List<Map<String,Object>> selectCommunityGovernAbilityNew(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 社区治理能力各个参数查询被吹哨次数办结项目数项目响应度超期项目率街道办结项目的处理效率level为street时存在办结项目率办结项目满意度存在下级客户时
@ -76,6 +78,30 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
*/
List<Map<String,Object>> selectCommunityGovernAbilityExistsSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
List<Map<String,Object>> selectCommunityGovernAbilityExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("level")String level);
/**
* @Description 社区治理能力六个五级指标
* @Param monthId
* @Param areaCode
* @Param level
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/29 9:22 上午
*/
List<Map<String,Object>> selectCommunityGovernAbilityExistsSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("level")String level,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 治理能力的六个五级指标
* @Param monthId
* @Param areaCode
* @Param level
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/29 9:18 上午
*/
List<Map<String,Object>> selectStreetGovernAbilityExistsSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("level")String level,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
/**
* @Description 孔村单独查询
* @Param monthId
@ -83,7 +109,19 @@ public interface FactIndexGovrnAblityOrgMonthlyDao extends BaseDao<FactIndexGovr
* @author zxc
* @date 2021/3/11 下午5:21
*/
List<Map<String,Object>> selectCommunityGovernAbilityIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
List<Map<String,Object>> selectCommunityGovernAbilityIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("customerId")String customerId);
/**
* @Description 孔村治理能力六个五级指标查询
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @Param customerId
* @author zxc
* @date 2021/5/29 9:26 上午
*/
List<Map<String,Object>> selectCommunityGovernAbilityIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
/**
* 根据组织类型删除数据

25
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.java

@ -77,6 +77,8 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
* @date 2020/8/26 10:49 上午
*/
List<Map<String,Object>> selectPublishArticleCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
List<Map<String,Object>> selectPublishArticleCountMapNew(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 查询社区下的发文数 Map 存在下级客户
@ -86,8 +88,20 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
* @date 2021/1/15 下午3:31
*/
List<Map<String,Object>> selectPublishArticleCountMapExistSubStreet(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
List<Map<String,Object>> selectPublishArticleCountMapExistSubStreetNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
List<Map<String,Object>> selectPublishArticleCountMapExistSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
/**
* @Description 街道级发文数量
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/29 3:10 下午
*/
List<Map<String,Object>> selectPublishArticleCountMapExistSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 查询社区下的发文数 Map根据areaCode
* @Param customerId
@ -99,6 +113,17 @@ public interface FactIndexPartyAblityOrgMonthlyDao extends BaseDao<FactIndexPart
List<Map<String,Object>> selectPublishArticleCountMapbyAreaCode(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
List<Map<String,Object>> selectPublishArticleCountMapbyAreaCodeNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
/**
* @Description 社区-community发文数量
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/31 9:19 上午
*/
List<Map<String,Object>> selectPublishArticleCountMapbyAreaCodeNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* 根据组织类型删除数据
* @author zhaoqifeng

38
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.java

@ -78,6 +78,8 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
* @date 2020/9/2 2:09 下午
*/
List<Map<String,Object>> selectActivityCountMap(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level);
List<Map<String,Object>> selectActivityCountMapNew(@Param("customerId")String customerId, @Param("monthId")String monthId,@Param("level")String level,
@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* @Description 社区活动组织次数 存在下级客户
@ -87,9 +89,43 @@ public interface FactIndexServiceAblityOrgMonthlyDao extends BaseDao<FactIndexSe
* @date 2021/1/15 下午1:53
*/
List<Map<String,Object>> selectActivityCountMapExistsSub(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
List<Map<String,Object>> selectActivityCountMapIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
/**
* @Description 街道级 活动组织次数查询
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/29 9:36 上午
*/
List<Map<String,Object>> selectActivityCountMapExistsSubNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
List<Map<String,Object>> selectActivityCountMapIsKongCun(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("customerId")String customerId);
/**
* @Description 孔村活动组织次数
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @Param customerId
* @author zxc
* @date 2021/5/29 9:37 上午
*/
List<Map<String,Object>> selectActivityCountMapIsKongCunNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId,@Param("customerId")String customerId);
List<Map<String,Object>> selectActivityCountMapExistsSubNotSelf(@Param("monthId")String monthId,@Param("areaCode")String areaCode);
/**
* @Description 社区-community活动组织次数
* @Param monthId
* @Param areaCode
* @Param quarterId
* @Param yearId
* @author zxc
* @date 2021/5/31 9:21 上午
*/
List<Map<String,Object>> selectActivityCountMapExistsSubNotSelfNew(@Param("monthId")String monthId,@Param("areaCode")String areaCode,@Param("quarterId")String quarterId,@Param("yearId")String yearId);
/**
* 根据组织类型删除数据
* @author zhaoqifeng

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@ -200,6 +200,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
String agencyId = issue.getAgencyId();
agencyIdSet.add(agencyId);
ScreenUserJoinEntity entity = insertMap.get(agencyId);
//todo 这里为什么会没有
if (entity == null){
return;
}
entity.setJoinTotal(issue.getIssueIncr());
GridUserCountResultDTO user = userCountMap.get(agencyId);
//百人人均议题:统计周期内总的议题数/(注册用户数/100)

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@ -118,7 +118,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
if (!CollectionUtils.isEmpty(customerIds)) {
customerIds.forEach(customerId -> {
if (StringUtils.isNotBlank(formDTO.getStartMonth()) && StringUtils.isNotBlank(formDTO.getEndMonth())) {
List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartDate(), formDTO.getEndDate());
List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartMonth(), formDTO.getEndMonth());
daysBetween.forEach(monthId -> {
extractMonthly(customerId, monthId);
});

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@ -219,6 +219,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
List<Map<String, Object>> list = null;
groupIndexDetailsMap.keySet().forEach(indexCode -> deleteOldData(formDTO, indexCode));
do {
//以党员userId为单位 获取数量
list = factIndexPartyAblityCpcMonthlyDao.getCountByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(),(pageNo - 1) * pageSize, pageSize,
formDTO.getCustomerAreaCode(),formDTO.getSubCustomerIds());
if (!CollectionUtils.isEmpty(list)) {
@ -304,7 +305,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
}
log.info("计算的参数:{}", JSON.toJSONString(indexMap));
HashMap<String, CalculateResult> result = calculateScore(indexMap);
log.info("计算的结果:{}", result);
log.info("计算的结果:{}", JSON.toJSONString(result));
//处理结果
if (CollectionUtils.isEmpty(result)) {

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

@ -116,7 +116,6 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
}
private void calculateSelfSubScore(CalculateCommonFormDTO formDTO) {
//todo 指标添加缓存
List<IndexGroupDetailEntity> indexList = indexGroupDetailService.getDetailListByParentCode(formDTO.getCustomerId(),
IndexCodeEnum.QU_ZHI_BU_MEN.getCode());
if (CollectionUtils.isEmpty(indexList)) {
@ -143,7 +142,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
Map<String, BigDecimal> weightMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
} else {
@ -153,7 +152,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
});
Map<String, DeptSelfSubScoreEntity> insertMap = new HashMap<>();
subScore.forEach(score -> {
String key = score.getAgencyId().concat(index.getIndexCode());
String key = score.getDeptId().concat(index.getIndexCode());
DeptSelfSubScoreEntity scoreEntity = insertMap.get(key);
if (scoreEntity == null) {
scoreEntity = ConvertUtils.sourceToTarget(score, DeptSelfSubScoreEntity.class);
@ -182,7 +181,7 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
public void deleteAndInsertSelfSubScore(CalculateCommonFormDTO formDTO, String indexCode, Map<String, DeptSelfSubScoreEntity> insertMap) {
int effectRow = 0;
do {
deptSelfSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode);
effectRow = deptSelfSubScoreDao.deleteByMonthId(formDTO.getCustomerId(), formDTO.getMonthId(), indexCode);
} while (effectRow > 0);
deptSelfSubScoreDao.insertBatch(new ArrayList<>(insertMap.values()));
@ -465,4 +464,4 @@ public class DeptScoreServiceImpl extends BaseServiceImpl<DeptScoreDao, DeptScor
return map;
}
}
}

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@ -132,7 +132,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
Map<String, BigDecimal> weightMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
} else {
@ -192,9 +192,11 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
log.error("calculateGridDangJian customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
throw new RenException("客户【网格相关:党建能力】指标权重信息不存在");
}
//查询总记录数
//查询总记录数:如果网格内没有产生业务数据,fact_index_party_ablity_grid_monthly为空,改为以screen_customer_grid为主表
//举例:有10个网格,只有2个网格在指标表里面有记录,实际total应该还是为10. 并且那8个指标值赋值为0
int total = factIndexPartyAblityGridMonthlyDao.selectCount(formDTO);
if (NumConstant.ZERO == total) {
log.warn(String.format("customerId=%s,monthId=%s,没有找到screen_customer_grid记录", formDTO.getCustomerId(), formDTO.getMonthId()));
log.warn(String.format("customerId=%s,monthId=%s,没有上传网格相关-党建能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));
return;
}
@ -214,6 +216,7 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
for (int pageNo = 1; pageNo <= totalPage; pageNo++) {
int pageIndex = (pageNo - NumConstant.ONE) * IndexCalConstant.PAGE_SIZE;
//前10条
//这块逻辑也要改为以screen_customer_grid表为主表,没有五级指标值的网格,赋值为0
List<Map<String, Object>> recordList = queryListPartyAblityGrid(new PageQueryGridFormDTO(formDTO.getCustomerId(),
formDTO.getMonthId(),
pageIndex,
@ -603,7 +606,8 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
log.error("calculateGridZhiLi customerId:{} have not any indexGroupDetail", formDTO.getCustomerId());
throw new RenException("客户【网格相关:治理能力】指标权重信息不存在");
}
//查询总记录数
//查询总记录数:如果网格内没有产生业务数据,fact_index_govrn_ablity_grid_monthly为空,改为以screen_customer_grid为主表
//举例:有10个网格,只有2个网格在指标表里面有记录,实际total应该还是为10. 并且那8个指标值赋值为0
int total = factIndexGovrnAblityGridMonthlyDao.selectCount(formDTO);
if (NumConstant.ZERO == total) {
log.warn(String.format("customerId%s,monthId%s,没有上传网格相关-治理能力-五级指标数据", formDTO.getCustomerId(), formDTO.getMonthId()));

40
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java

@ -165,7 +165,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
Map<String, BigDecimal> weightMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
} else {
@ -223,12 +223,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//下属所有网格的党建能力平均值
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode().equals(detail.getIndexCode())) {
List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScoreNew(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
log.warn(IndexCalConstant.GRID_PARTY_AVG_NULL);
} else {
@ -248,7 +250,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
}
} else {
// 社区名义发文数量
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapNew(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(publishArticleCountList)) {
log.warn(IndexCalConstant.COMMUNITY_PUBLISH_ARTICLE_LIST_NULL);
} else {
@ -298,11 +300,13 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScoreNew(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.warn("社区下级治理能力平均分集合为空");
}else{
@ -322,7 +326,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
}
} else {
// 治理能力的六个五级指标
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityNew(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(communityGovernAbility)){
log.warn(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
}else{
@ -370,12 +374,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode().equals(indexCode)) {
List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScoreNew(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridServiceAvg)) {
log.warn("查询社区下级所有网格服务能力得分平均值集合为空");
} else {
@ -394,7 +400,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
});
}
} else {
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL);
// 活动组织次数
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapNew(customerId, monthId,IndexCalConstant.COMMUNITY_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(communityActivityCountList)) {
log.warn(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
}else{
@ -604,12 +611,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(form.getMonthId());
String yearId = DateUtils.getYearId(form.getMonthId());
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//下属所有网格的党建能力平均值
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.XIA_SHU_SUO_YOU_WGDDJNLPJZ.getCode().equals(detail.getIndexCode())) {
List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCode(form.getMonthId(),IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubGridAvgResultDTO> subGridPartyAvgScore = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCodeNew(form.getMonthId(),IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
log.warn(IndexCalConstant.GRID_PARTY_AVG_NULL);
} else {
@ -629,7 +638,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
}
} else {
// 社区名义发文数量
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapbyAreaCodeNotSelf( form.getMonthId(),form.getCustomerAreaCode());
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapbyAreaCodeNotSelfNew( form.getMonthId(),form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(publishArticleCountList)) {
log.warn(IndexCalConstant.COMMUNITY_PUBLISH_ARTICLE_LIST_NULL);
} else {
@ -678,12 +687,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(form.getMonthId());
String yearId = DateUtils.getYearId(form.getMonthId());
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
// 社区下属所有网格治理能力汇总(平均值)
if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCode(form.getMonthId(),IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCodeNew(form.getMonthId(),IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.warn("社区下级治理能力平均分集合为空");
}else{
@ -703,7 +714,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
}
} else {
// 治理能力的六个五级指标
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelf(form.getMonthId(),form.getCustomerAreaCode(), ScreenConstant.COMMUNITY);
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelfNew(form.getMonthId(),form.getCustomerAreaCode(), ScreenConstant.COMMUNITY,quarterId,yearId);
if (CollectionUtils.isEmpty(communityGovernAbility)){
log.warn(IndexCalConstant.COMMUNITY_GOVERN_ABILITY_NULL);
}else{
@ -751,12 +762,14 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(form.getMonthId());
String yearId = DateUtils.getYearId(form.getMonthId());
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode().equals(indexCode)) {
List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCode(form.getMonthId(),IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScoreByAreaCodeNew(form.getMonthId(),IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridServiceAvg)) {
log.warn("查询社区下级所有网格服务能力得分平均值集合为空");
} else {
@ -775,7 +788,8 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
});
}
} else {
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSubNotSelf(form.getMonthId(),form.getCustomerAreaCode());
// 活动组织次数
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSubNotSelfNew(form.getMonthId(),form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(communityActivityCountList)) {
log.warn(IndexCalConstant.COMMUNITY_SERVICE_ABILITY_NULL);
}else{

59
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@ -163,7 +163,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
Map<String, BigDecimal> weightMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
} else {
@ -220,12 +220,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//党建能力平均值
indexDetailList.forEach(detail -> {
if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgNew(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,quarterId,yearId);
log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@ -235,11 +237,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
subPartyAvgList.forEach(party -> {
List<SampleValue> index1SampleValues = new ArrayList<>();
party.forEach(c -> {
if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
SampleValue s = new SampleValue(c.getParentId(), c.getScore());
index1SampleValues.add(s);
}
pid.put(c.getAgencyId(), c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s);
});
BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@ -248,7 +248,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
}
} else {
// 区名义发文数量
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId,IndexCalConstant.DISTRICT_LEVEL);
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapNew(customerId, monthId,IndexCalConstant.DISTRICT_LEVEL,quarterId,yearId);
log.info("publishArticleCountList:::"+publishArticleCountList.toString());
if (CollectionUtils.isEmpty(publishArticleCountList)) {
log.warn(IndexCalConstant.DISTRICT_PUBLISH_ARTICLE_LIST_NULL);
@ -299,11 +299,13 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgNew(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,quarterId,yearId);
log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
for (int i = 0; i < districtGovernAvgList.size(); i++) {
if (districtGovernAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@ -318,11 +320,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
governAvg.forEach(avg -> {
List<SampleValue> index1SampleValues = new ArrayList<>();
avg.forEach(c -> {
if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
SampleValue s = new SampleValue(c.getParentId(), c.getScore());
index1SampleValues.add(s);
}
pid.put(c.getAgencyId(), c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s);
});
BigDecimalScoreCalculator sc = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc);
@ -330,7 +330,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
});
}
} else if (IndexCodeEnum.SUO_YOU_ZHI_SHU_BMZLNLPJZ.getCode().equals(detail.getIndexCode())){
List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvgNew(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),quarterId,yearId);
log.info("deptScoreAvgList:::"+deptScoreAvgList.toString());
for (int i = 0; i < deptScoreAvgList.size(); i++) {
if (deptScoreAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@ -380,12 +380,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgNew(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL,quarterId,yearId);
log.info("subStreetAvgList:::"+subStreetAvgList.toString());
for (int i = 0; i < subStreetAvgList.size(); i++) {
if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@ -401,11 +403,9 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
BigDecimalScoreCalculator sc1 = new BigDecimalScoreCalculator(maxAndMinBigDecimal.getMin(), maxAndMinBigDecimal.getMax(), ScoreConstants.MIN_SCORE, ScoreConstants.MAX_SCORE, Correlation.getCorrelation(detail.getCorrelation()));
List<SampleValue> index1SampleValues = new ArrayList<>();
serviceAvg.forEach(c -> {
if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
SampleValue s = new SampleValue(c.getParentId(), c.getScore());
index1SampleValues.add(s);
}
pid.put(c.getAgencyId(), c.getParentId());
SampleValue s = new SampleValue(c.getAgencyId(), c.getScore());
index1SampleValues.add(s);
});
IndexInputVO index1VO = new IndexInputVO(detail.getIndexCode(), detail.getAllParentIndexCode(), index1SampleValues, detail.getThreshold(), detail.getWeight(), IndexCodeEnum.isAvgIndex(detail.getIndexCode()), sc1);
indexInputVOS.add(index1VO);
@ -609,12 +609,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//党建能力平均值
indexDetailList.forEach(detail -> {
if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubAgencyScoreAvgResultDTO> subGridPartyAvgScore = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
log.info("subGridPartyAvgScore:::"+subGridPartyAvgScore.toString());
if (CollectionUtils.isEmpty(subGridPartyAvgScore)) {
log.warn(IndexCalConstant.DISTRICT_PARTY_AVG_NULL);
@ -641,7 +643,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
}
} else {
// 区名义发文数量
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSubNotSelf(monthId,form.getCustomerAreaCode());
List<Map<String, Object>> publishArticleCountList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSubNotSelfNew(monthId,form.getCustomerAreaCode(),quarterId,yearId);
log.info("publishArticleCountList:::"+publishArticleCountList.toString());
if (CollectionUtils.isEmpty(publishArticleCountList)) {
log.warn(IndexCalConstant.DISTRICT_PUBLISH_ARTICLE_LIST_NULL);
@ -693,11 +695,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
// 治理能力平均值
List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
log.info("districtGovernAvgList:::"+districtGovernAvgList.toString());
for (int i = 0; i < districtGovernAvgList.size(); i++) {
if (districtGovernAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@ -728,7 +733,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
});
}
} else if (IndexCodeEnum.SUO_YOU_ZHI_SHU_BMZLNLPJZ.getCode().equals(detail.getIndexCode())){
List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvgExistsSubNotSelf(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubAgencyScoreAvgResultDTO> deptScoreAvgList = deptScoreDao.selectGovernDeptScoreAvgExistsSubNotSelfNew(form.getCustomerAreaCode(),monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),quarterId,yearId);
log.info("deptScoreAvgList:::"+deptScoreAvgList.toString());
for (int i = 0; i < deptScoreAvgList.size(); i++) {
if (deptScoreAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){
@ -779,12 +784,14 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode());
List<SubAgencyScoreAvgResultDTO> subStreetAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSubNew(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
log.info("subStreetAvgList:::"+subStreetAvgList.toString());
for (int i = 0; i < subStreetAvgList.size(); i++) {
if (subStreetAvgList.get(i).getAgencyId().equals(NumConstant.ZERO_STR)){

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java

@ -135,7 +135,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
start = System.currentTimeMillis();
try {
flag = gridCorreLationService.calculateGridCorreLation(formDTO);
log.info("客户Id:{}【网格相关】计算完毕,总耗时:{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
log.info("客户Id:{}【网格相关】计算完毕,总耗时:{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
} catch (Exception e) {
log.error("indexCalculate calculateGridCorreLation exception", e);
}
@ -143,7 +143,7 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
start = System.currentTimeMillis();
try {
flag = indexCalculateCommunityService.calCommunityAll(formDTO);
log.info("客户Id:{}【社区相关】计算完毕,总耗时:{}秒,result:{},result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
log.info("客户Id:{}【社区相关】计算完毕,总耗时:{}秒,result:{}", customerId, (System.currentTimeMillis() - start) / 1000, flag);
} catch (Exception e) {
log.error("indexCalculate calCommunityAll exception", e);
}

82
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java

@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
import com.epmet.commons.dynamic.datasource.annotation.DataSource;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.enums.KongCunCustomerEnvEnum;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.DateUtils;
@ -167,7 +168,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
Map<String, BigDecimal> weightMap = new HashMap<>();
selfSubIndexList.forEach(o -> {
//找出自身 和下级的指标
if (o.getAllIndexCodePath().indexOf(ProjectConstant.XIA_JI) > -1) {
if (o.getAllIndexCodePath().contains(ProjectConstant.XIA_JI)) {
selfSubParentMap.get(ProjectConstant.XIA_JI).add(o.getIndexCode());
weightMap.put(ProjectConstant.XIA_JI, weightMap.getOrDefault(ProjectConstant.XIA_JI, new BigDecimal(0)).add(o.getWeight()));
} else {
@ -225,12 +226,14 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//下属所有社区的党建能力平均值
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode());
List<SubCommunityAvgResultDTO> subCommPartyAvgScore = communityScoreDao.selectSubCommAvgScoreNew(customerId, monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
log.warn(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
} else if (subCommPartyAvgScore.size() > NumConstant.ZERO) {
@ -251,7 +254,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
}
} else {
// 街道名义发文数量
List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMap(customerId, monthId, IndexCalConstant.STREET_LEVEL);
List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapNew(customerId, monthId, IndexCalConstant.STREET_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(mapList)) {
log.warn(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
} else {
@ -300,11 +303,13 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScoreNew(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.warn("查询街道下属所有社区治理能力汇总为空");
}else if (subGridGovernAvg.size() > NumConstant.ZERO) {
@ -324,7 +329,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
}
} else {
// 治理能力的六个五级指标
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbility(customerId, monthId,IndexCalConstant.STREET_LEVEL);
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityNew(customerId, monthId,IndexCalConstant.STREET_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(communityGovernAbility)){
log.warn(IndexCalConstant.STREET_GOVERN_ABILITY_NULL);
}else{
@ -372,12 +377,14 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScoreNew(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(subCommServiceAvg)) {
log.warn("查询街道下属社区服务能力得分平均值为空");
} else if (subCommServiceAvg.size() > NumConstant.ZERO) {
@ -396,7 +403,8 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
});
}
} else {
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMap(customerId, monthId,IndexCalConstant.STREET_LEVEL);
// 活动组织次数
List<Map<String, Object>> communityActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapNew(customerId, monthId,IndexCalConstant.STREET_LEVEL,quarterId,yearId);
if (CollectionUtils.isEmpty(communityActivityCountList)) {
log.warn(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
}else{
@ -610,12 +618,16 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
//下属所有社区的党建能力平均值
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode());
// 下属所有社区的党建能力平均值
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelfNew(monthId,IndexCodeEnum.DANG_JIAN_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
// 数据处理
List<SubCommunityAvgResultDTO> subCommPartyAvgScore = disposeSubAvg(dispose, form);
if (CollectionUtils.isEmpty(subCommPartyAvgScore)) {
log.warn(IndexCalConstant.COMMUNITY_PARTY_AVG_NULL);
@ -638,7 +650,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
}
} else {
// 街道名义发文数量
List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSubStreet(monthId,form.getCustomerAreaCode());
List<Map<String, Object>> mapList = factIndexPartyAblityOrgMonthlyDao.selectPublishArticleCountMapExistSubStreetNew(monthId,form.getCustomerAreaCode(),quarterId,yearId);
if (CollectionUtils.isEmpty(mapList)) {
log.warn(IndexCalConstant.STREET_PUBLISH_ARTICLE_LIST_NULL);
} else {
@ -688,11 +700,15 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
// 查询areaCode扫出所有社区级别的数据
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelfNew(monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
// 孔村数据处理
List<SubCommunityAvgResultDTO> subGridGovernAvg = disposeSubAvg(dispose,form);
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.warn("查询街道下属所有社区治理能力汇总为空");
@ -763,12 +779,16 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
log.error(IndexCalConstant.INDEX_DETAIL_LIST_NULL);
return true;
}
String quarterId = DateUtils.getQuarterId(monthId);
String yearId = DateUtils.getYearId(monthId);
List<IndexInputVO> indexInputVOS = new ArrayList<>();
Map<String, String> pid = new HashMap<>();
detailListByParentCode.forEach(detail -> {
String indexCode = detail.getIndexCode();
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelf(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode());
// 街道服务能力平均值
List<SubCommunityAvgResultDTO> dispose = communityScoreDao.selectSubCommAvgScoreExistSubNotSelfNew(monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode(),form.getCustomerAreaCode(),quarterId,yearId);
// 孔村数据处理
List<SubCommunityAvgResultDTO> subCommServiceAvg = disposeSubAvg(dispose,form);
if (CollectionUtils.isEmpty(subCommServiceAvg)) {
log.warn("查询街道下属社区服务能力得分平均值为空");
@ -789,6 +809,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
});
}
} else {
// 活动组织次数
List<Map<String, Object>> communityActivityCountList = disposeActivityCount(form);
if (CollectionUtils.isEmpty(communityActivityCountList)) {
log.warn(IndexCalConstant.STREET_SERVICE_ABILITY_NULL);
@ -869,6 +890,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
}
public List<SubCommunityAvgResultDTO> disposeSubAvg(List<SubCommunityAvgResultDTO> avgScore, CalculateCommonFormDTO formDTO){
// 查询处parentAreaCode = xx的组织
List<ScreenProjectOrgDailyDTO> orgIds = customerAgencyDao.selectAgencyByParentAreaCode(formDTO.getCustomerAreaCode());
List<SubCommunityAvgResultDTO> subAvgScores = new ArrayList<>();
orgIds.forEach(org -> {
@ -876,6 +898,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
s.setAgencyId(org.getOrgId());
subAvgScores.add(s);
});
// 把除去孔村镇的数据赋值,孔村在下边单独处理
subAvgScores.forEach(subScore -> {
if (!CollectionUtils.isEmpty(avgScore)){
avgScore.forEach(avg -> {
@ -887,16 +910,19 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
}
});
Map<Boolean, List<SubCommunityAvgResultDTO>> groupByStatus = avgScore.stream().collect(Collectors.groupingBy(SubCommunityAvgResultDTO::getScoreStatus));
// 孔村的党总支 数据
List<SubCommunityAvgResultDTO> subAvgResultDTOS = groupByStatus.get(false);
if (!CollectionUtils.isEmpty(subAvgResultDTOS)){
AtomicReference<BigDecimal> finalScore = new AtomicReference<>(new BigDecimal(NumConstant.ZERO));
subAvgResultDTOS.forEach(sub -> {
// 党总支的数据相加
finalScore.set(finalScore.get().add(sub.getScore()));
});
// 党总支数据求平均值
BigDecimal divide = finalScore.get().divide(new BigDecimal(subAvgResultDTOS.size()),NumConstant.SIX,BigDecimal.ROUND_HALF_UP);
subAvgScores.forEach(s -> {
// 孔村单独处理
if (s.getAgencyId().equals("1234085031077498881")){
if (s.getAgencyId().equals(PingYinConstant.KONG_CUN_AGENCY_ID)){
s.setScore(divide);
}
});
@ -904,13 +930,23 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
return subAvgScores;
}
/**
* @Description 治理能力的六个五级指标
* @Param formDTO
* @author zxc
* @date 2021/5/29 9:18 上午
*/
public List<Map<String, Object>> disposeFiveLevel(CalculateCommonFormDTO formDTO){
String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
String yearId = DateUtils.getYearId(formDTO.getMonthId());
List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityExistsSubNotSelf(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), ScreenConstant.STREET);
List<Map<String, Object>> kongCunGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityIsKongCun(formDTO.getMonthId(),formDTO.getCustomerAreaCode());
// 治理能力的六个五级指标【街道】
List<Map<String, Object>> communityGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectStreetGovernAbilityExistsSubNotSelfNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), ScreenConstant.STREET,quarterId,yearId,PingYinConstant.KONG_CUN_CUSTOMER_ID);
// 孔村数据单独查
List<Map<String, Object>> kongCunGovernAbility = factIndexGovrnAblityOrgMonthlyDao.selectCommunityGovernAbilityIsKongCunNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(), quarterId,yearId,PingYinConstant.KONG_CUN_CUSTOMER_ID);
if (!CollectionUtils.isEmpty(kongCunGovernAbility)){
kongCunGovernAbility.forEach(k -> {
k.put("AGENCY_ID",k.get("PARENT_ID"));
k.put("AGENCY_ID",k.get("AGENCY_ID"));
k.put("PARENT_ID",NumConstant.ZERO_STR);
});
}
@ -923,13 +959,23 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
return result;
}
/**
* @Description 活动组织次数街道
* @Param formDTO
* @author zxc
* @date 2021/5/29 9:31 上午
*/
public List<Map<String, Object>> disposeActivityCount(CalculateCommonFormDTO formDTO){
String quarterId = DateUtils.getQuarterId(formDTO.getMonthId());
String yearId = DateUtils.getYearId(formDTO.getMonthId());
List<Map<String, Object>> result = new ArrayList<>();
List<Map<String, Object>> ActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSub(formDTO.getMonthId(),formDTO.getCustomerAreaCode());
List<Map<String, Object>> kongCunActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapIsKongCun(formDTO.getMonthId(),formDTO.getCustomerAreaCode());
// 街道级 活动组织次数查询
List<Map<String, Object>> ActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapExistsSubNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(),quarterId,yearId,PingYinConstant.KONG_CUN_CUSTOMER_ID);
// 孔村活动组织次数
List<Map<String, Object>> kongCunActivityCountList = factIndexServiceAblityOrgMonthlyDao.selectActivityCountMapIsKongCunNew(formDTO.getMonthId(),formDTO.getCustomerAreaCode(),quarterId,yearId,PingYinConstant.KONG_CUN_CUSTOMER_ID);
if (!CollectionUtils.isEmpty(kongCunActivityCountList)){
kongCunActivityCountList.forEach(k -> {
k.put("AGENCY_ID",k.get("PARENT_ID"));
k.put("AGENCY_ID",k.get("AGENCY_ID"));
k.put("PARENT_ID",NumConstant.ZERO_STR);
});
}

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

@ -86,7 +86,7 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao
if (list.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) {
ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
ScreenUserJoinEntity lastJoinEntity = null;
if (i > lastMonthJoinList.size()){
if (i >= lastMonthJoinList.size()){
lastJoinEntity = new ScreenUserJoinEntity();
lastJoinEntity.setJoinTotal(NumConstant.ZERO);
lastJoinEntity.setAvgIssue(NumConstant.ZERO_DECIMAL);

14
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/support/normalizing/batch/BatchScoreCalculator.java

@ -80,13 +80,19 @@ public class BatchScoreCalculator {
.multiply(
(maxScoreValue.subtract(minScoreValue).divide(new BigDecimal(Math.PI / 2), 10, RoundingMode.HALF_UP)))
.add(minScoreValue).setScale(6, RoundingMode.HALF_UP);
//
if (scoreCalculator.getCorrelation().getCode().equals(Correlation.NEGATIVE)) {
normalizeValue = maxScoreValue.subtract(normalizeValue);
}
} else {
normalizeValue = scoreCalculator.normalize(getFinalSampleValue(vo.getSampleValue(), threshold));
}
//如果是负相关 则用100-归一后的值为最大值减
if (Correlation.NEGATIVE.getCode().equals(scoreCalculator.getCorrelation().getCode())) {
normalizeValue = maxScoreValue.subtract(normalizeValue);
}
}
//如果归一后的值小于0 则置为0
if (normalizeValue.compareTo(NumConstant.ZERO_DECIMAL)<=-1){
normalizeValue = NumConstant.ZERO_DECIMAL;
}
BigDecimal score = normalizeValue.multiply(weight).setScale(6, RoundingMode.HALF_UP);
CalculateResult result = scoreCountOfSamples.get(sampleId);

44
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml

@ -221,4 +221,48 @@
OR fias.INDEX_CODE = "dangjiannengli"
OR fias.INDEX_CODE = "fuwunengli")
</select>
<select id="selectAgencyScoreAvgNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
SELECT
sca.agency_id,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
sca.customer_id,
sca.pid AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_agency_score fics ON
(fics.PARENT_AGENCY_ID = sca.AGENCY_ID
AND fics.del_flag = '0'
AND fics.customer_id = #{customerId}
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}
AND fics.DATA_TYPE = #{dataType}
)
WHERE sca.DEL_FLAG = 0
AND sca.level = 'district'
AND sca.customer_id = #{customerId}
GROUP BY sca.AGENCY_ID
</select>
<select id="selectAgencyScoreAvgExistsSubNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
SELECT
sca.agency_id AS agencyId,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
sca.customer_id AS customerId,
(SELECT AGENCY_ID FROM screen_customer_agency WHERE AREA_CODE = #{areaCode} AND DEL_FLAG = 0) AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_agency_score fics ON
(fics.agency_id = sca.agency_id
AND fics.del_flag = '0'
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode})
WHERE sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE = #{areaCode}
GROUP BY parentId
</select>
</mapper>

77
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@ -67,27 +67,26 @@
OR INDEX_CODE = "fuwunengli")
</select>
<!-- 街道下级所有社区服务能力得分平均值 -->
<select id="selectSubCommAvgScore" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
<select id="selectSubCommAvgScoreNew" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
SELECT
fics.PARENT_AGENCY_ID AS agencyId,
fics.month_id,
fics.quarter_id,
fics.year_id,
ROUND(AVG( fics.score ),6) AS score,
fics.customer_id,
sca.AGENCY_ID AS agencyId,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
sca.customer_id,
sca.pid AS parentId
FROM
fact_index_community_score fics
LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.PARENT_AGENCY_ID
WHERE
fics.del_flag = '0'
AND sca.DEL_FLAG = 0
AND sca.level = 'street'
AND fics.customer_id = #{customerId}
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}
GROUP BY fics.parent_agency_id
FROM screen_customer_agency sca
LEFT JOIN fact_index_community_score fics
ON (fics.PARENT_AGENCY_ID = sca.AGENCY_ID
AND fics.del_flag = '0'
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = 0
AND sca.level = 'street'
AND sca.customer_id = #{customerId}
GROUP BY sca.AGENCY_ID
</select>
<select id="selectListCommunityScore" resultType="com.epmet.dto.screen.FactIndexCommunityScoreDTO">
@ -148,28 +147,30 @@
OR cs.INDEX_CODE = "fuwunengli")
</select>
<!-- 街道下级所有社区得分平均值 存在下级客户 -->
<select id="selectSubCommAvgScoreExistSub" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
<!-- 街道下社区平均数 -->
<select id="selectSubCommAvgScoreExistSubNotSelfNew" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
SELECT
fics.PARENT_AGENCY_ID AS agencyId,
fics.month_id,
fics.quarter_id,
fics.year_id,
ROUND(AVG( fics.score ),6) AS score,
fics.customer_id,
sca.AGENCY_ID AS agencyId,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(ROUND(AVG( fics.score ),6),0) AS score,
sca.customer_id,
sca.pid AS parentId
FROM
fact_index_community_score fics
LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = fics.PARENT_AGENCY_ID
WHERE
fics.del_flag = '0'
AND sca.DEL_FLAG = 0
FROM screen_customer_agency sca
LEFT JOIN fact_index_community_score fics ON
( sca.AGENCY_ID = fics.AGENCY_ID
AND fics.del_flag = '0'
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = 0
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}
GROUP BY fics.parent_agency_id
AND sca.`LEVEL` = 'community'
GROUP BY parentId
</select>
<select id="selectSubCommAvgScoreExistSubNotSelf" resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
<select id="selectSubCommAvgScoreExistSubNotSelf"
resultType="com.epmet.dto.indexcal.SubCommunityAvgResultDTO">
SELECT
fics.PARENT_AGENCY_ID AS agencyId,
fics.month_id,
@ -184,7 +185,7 @@
WHERE
fics.del_flag = '0'
AND sca.DEL_FLAG = 0
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.`LEVEL` = 'community'
AND fics.month_id = #{monthId}
AND fics.index_code = #{indexCode}

46
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml

@ -194,4 +194,50 @@
AND fidc.index_code = #{indexCode}
GROUP BY fidc.agency_id
</select>
<select id="selectGovernDeptScoreAvgNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
SELECT
sca.agency_id,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(AVG( fidc.score ),0) AS score,
sca.customer_id,
sca.pid AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_dept_score fidc ON
(fidc.AGENCY_ID = sca.AGENCY_ID
AND fidc.del_flag = '0'
AND fidc.IS_TOTAL = '0'
AND fidc.customer_id = #{customerId}
AND fidc.month_id = #{monthId}
AND fidc.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = '0'
AND sca.level = 'district'
AND sca.customer_id = #{customerId}
GROUP BY sca.agency_id
</select>
<select id="selectGovernDeptScoreAvgExistsSubNotSelfNew" resultType="com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO">
SELECT
sca.agency_id,
#{monthId} AS monthId,
#{quarterId} AS quarterId,
#{yearId} AS yearId,
IFNULL(AVG( fidc.score ),0) AS score,
sca.customer_id,
sca.pid AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_dept_score fidc ON
(sca.AGENCY_ID = fidc.AGENCY_ID
AND fidc.del_flag = '0'
AND fidc.IS_TOTAL = '0'
AND fidc.month_id = #{monthId}
AND fidc.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = '0'
AND sca.AREA_CODE = #{areaCode}
GROUP BY sca.agency_id
</select>
</mapper>

46
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml

@ -202,4 +202,50 @@
GROUP BY figc.agency_id
</select>
<!-- 【社区-community】下级三大能力平均值 -->
<select id="selectSubGridAvgScoreNew" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
SELECT
sca.agency_id AS agencyId,
#{monthId} as monthId,
#{quarterId} as quarterId,
#{yearId} as yearId,
IFNULL(ROUND(AVG( figc.score ),6),0) AS score,
sca.customer_id as customerId,
sca.pid AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_grid_score figc ON
(figc.AGENCY_ID = sca.AGENCY_ID
AND figc.del_flag = '0'
AND figc.customer_id = #{customerId}
AND figc.month_id = #{monthId}
AND figc.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = '0'
AND sca.level = 'community'
AND sca.customer_id = #{customerId}
GROUP BY sca.agency_id
</select>
<select id="selectSubGridAvgScoreByAreaCodeNew" resultType="com.epmet.dto.screen.result.SubGridAvgResultDTO">
SELECT
sca.agency_id AS agencyId,
#{monthId} as monthId,
#{quarterId} as quarterId,
#{yearId} as yearId,
IFNULL(ROUND(AVG( figc.score ),6),0) AS score,
sca.customer_id as customerId,
sca.pid AS parentId
FROM screen_customer_agency sca
LEFT JOIN fact_index_grid_score figc ON
(sca.AGENCY_ID = figc.AGENCY_ID
AND figc.del_flag = '0'
AND figc.month_id = #{monthId}
AND figc.index_code = #{indexCode}
)
WHERE sca.DEL_FLAG = 0
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.`LEVEL` = 'community'
GROUP BY sca.agency_id
</select>
</mapper>

82
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityDeptMonthlyDao.xml

@ -98,24 +98,16 @@
<!-- 查询(治理能力-区直部门相关数据 )当前月共上传了多少条记录 -->
<select id="selectCount" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.lang.Integer">
SELECT
count( 1 ) AS total
count( SCD.DEPT_ID ) AS total
FROM
fact_index_govrn_ablity_dept_monthly m
inner join screen_customer_dept scd
on(
m.DEPT_ID=scd.DEPT_ID
and scd.DEL_FLAG='0'
and scd.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
AND m.MONTH_ID=#{monthId}
screen_customer_dept scd
WHERE scd.DEL_FLAG='0'
and scd.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scd.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scd.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
@ -124,21 +116,18 @@
<!-- 计算最大最小值 -->
<select id="selectExtremeValue" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.util.Map">
SELECT
m.CUSTOMER_ID,
m.DEPT_ID,
m.MONTH_ID,
MIN(m.TRANSFERED_COUNT) as TRANSFERED_COUNT_MIN,
MAX(m.TRANSFERED_COUNT) as TRANSFERED_COUNT_MAX,
MIN(m.CLOSED_PROJECT_COUNT) as CLOSED_PROJECT_COUNT_MIN,
MAX(m.CLOSED_PROJECT_COUNT) as CLOSED_PROJECT_COUNT_MAX,
MIN(m.RESP_PROJECT_RATIO) as RESP_PROJECT_RATIO_MIN,
MAX(m.RESP_PROJECT_RATIO) as RESP_PROJECT_RATIO_MAX,
MIN(m.HANDLE_PROJECT_RATIO) as HANDLE_PROJECT_RATIO_MIN,
MAX(m.HANDLE_PROJECT_RATIO) as HANDLE_PROJECT_RATIO_MAX,
MIN(M.CLOSED_PROJECT_RATIO) as CLOSED_PROJECT_RATIO_MIN,
MAX(M.CLOSED_PROJECT_RATIO) as CLOSED_PROJECT_RATIO_MAX,
MIN(M.SATISFACTION_RATIO) as SATISFACTION_RATIO_MIN,
MAX(M.SATISFACTION_RATIO) as SATISFACTION_RATIO_MAX
IFNULL(MIN(m.TRANSFERED_COUNT),0) as TRANSFERED_COUNT_MIN,
IFNULL(MAX(m.TRANSFERED_COUNT),0) as TRANSFERED_COUNT_MAX,
IFNULL(MIN(m.CLOSED_PROJECT_COUNT),0) as CLOSED_PROJECT_COUNT_MIN,
IFNULL(MAX(m.CLOSED_PROJECT_COUNT),0) as CLOSED_PROJECT_COUNT_MAX,
IFNULL(MIN(m.RESP_PROJECT_RATIO),0) as RESP_PROJECT_RATIO_MIN,
IFNULL(MAX(m.RESP_PROJECT_RATIO),0) as RESP_PROJECT_RATIO_MAX,
IFNULL(MIN(m.HANDLE_PROJECT_RATIO),0) as HANDLE_PROJECT_RATIO_MIN,
IFNULL(MAX(m.HANDLE_PROJECT_RATIO),0) as HANDLE_PROJECT_RATIO_MAX,
IFNULL(MIN(M.CLOSED_PROJECT_RATIO),0) as CLOSED_PROJECT_RATIO_MIN,
IFNULL(MAX(M.CLOSED_PROJECT_RATIO),0) as CLOSED_PROJECT_RATIO_MAX,
IFNULL(MIN(M.SATISFACTION_RATIO),0) as SATISFACTION_RATIO_MIN,
IFNULL(MAX(M.SATISFACTION_RATIO),0) as SATISFACTION_RATIO_MAX
FROM
fact_index_govrn_ablity_dept_monthly m
inner join screen_customer_dept scd
@ -155,7 +144,6 @@
and scd.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scd.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
@ -164,38 +152,36 @@
<!-- 分页查询事实记录 -->
<select id="selectListByMonthId" parameterType="map" resultType="java.util.Map">
SELECT
m.CUSTOMER_ID,
m.AGENCY_ID,
m.DEPT_ID,
m.MONTH_ID,
m.TRANSFERED_COUNT,
m.CLOSED_PROJECT_COUNT,
m.RESP_PROJECT_RATIO,
m.HANDLE_PROJECT_RATIO,
m.CLOSED_PROJECT_RATIO,
SATISFACTION_RATIO
scd.CUSTOMER_ID,
scd.PARENT_AGENCY_ID AS AGENCY_ID,
scd.DEPT_ID,
#{monthId} AS MONTH_ID,
IFNULL(m.TRANSFERED_COUNT,0) AS TRANSFERED_COUNT,
IFNULL(m.CLOSED_PROJECT_COUNT,0) AS CLOSED_PROJECT_COUNT,
IFNULL(m.RESP_PROJECT_RATIO,0) AS RESP_PROJECT_RATIO,
IFNULL(m.HANDLE_PROJECT_RATIO,0) AS HANDLE_PROJECT_RATIO,
IFNULL(m.CLOSED_PROJECT_RATIO,0) AS CLOSED_PROJECT_RATIO,
IFNULL(M.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO
FROM
fact_index_govrn_ablity_dept_monthly m
inner join screen_customer_dept scd
screen_customer_dept scd
LEFT join fact_index_govrn_ablity_dept_monthly m
on(
m.DEPT_ID=scd.DEPT_ID
and scd.DEL_FLAG='0'
and scd.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
scd.DEPT_ID=m.DEPT_ID
AND m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
)
WHERE scd.DEL_FLAG='0'
and scd.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scd.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scd.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
ORDER BY
m.DEPT_ID ASC
scd.DEPT_ID ASC
LIMIT #{offset},#{pageSize}
</select>

105
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

@ -100,80 +100,73 @@
<!-- 当前客户下,所有网格的治理能力相关五级指标 -->
<select id="selectListGovrnAblityGrid" parameterType="com.epmet.dto.indexcal.PageQueryGridFormDTO" resultType="java.util.HashMap">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
m.ISSUE_TOTAL,
m.AVG_ISSUE_COUNT,
m.ISSUE_TO_PROJECT_RATIO,
m.PROJECT_TOTAL,
m.SELF_SOLVE_PROJECT_COUNT,
m.RESOLVE_PROJECT_COUNT,
m.TRANSFER_RIGHT_RATIO,
m.SATISFACTION_RATIO
scg.CUSTOMER_ID,
scg.GRID_ID,
#{monthId} as MONTH_ID,
IFNULL(m.ISSUE_TOTAL,0) AS ISSUE_TOTAL,
IFNULL(m.AVG_ISSUE_COUNT,0) AS AVG_ISSUE_COUNT,
IFNULL(m.ISSUE_TO_PROJECT_RATIO,0) AS ISSUE_TO_PROJECT_RATIO,
IFNULL(m.PROJECT_TOTAL,0) AS PROJECT_TOTAL,
IFNULL(m.SELF_SOLVE_PROJECT_COUNT,0) AS SELF_SOLVE_PROJECT_COUNT,
IFNULL(m.RESOLVE_PROJECT_COUNT,0) AS RESOLVE_PROJECT_COUNT,
IFNULL(m.TRANSFER_RIGHT_RATIO,0) AS TRANSFER_RIGHT_RATIO,
IFNULL(m.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO
FROM
fact_index_govrn_ablity_grid_monthly m
inner join screen_customer_grid scg
screen_customer_grid scg
LEFT join fact_index_govrn_ablity_grid_monthly m
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
scg.GRID_ID=m.GRID_ID
and m.DEL_FLAG = '0'
and m.MONTH_ID=#{monthId}
)
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
and m.CUSTOMER_ID=#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
order by m.GRID_ID asc
order by scg.GRID_ID asc
LIMIT #{pageIndex}, #{pageSize}
</select>
<!-- 查询治理能力,网格相关,各五级指标最大值,最小值 -->
<select id="selectGovrnAblityGridMinAndMax" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.util.Map">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
MIN(m.ISSUE_TOTAL) AS ISSUE_TOTAL_MIN,
MAX(m.ISSUE_TOTAL) AS ISSUE_TOTAL_MAX,
MIN(m.AVG_ISSUE_COUNT) AS AVG_ISSUE_COUNT_MIN,
MAX(m.AVG_ISSUE_COUNT) AS AVG_ISSUE_COUNT_MAX,
MIN(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MIN,
MAX(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MAX,
MIN(m.PROJECT_TOTAL) AS PROJECT_TOTAL_MIN,
MAX(m.PROJECT_TOTAL) AS PROJECT_TOTAL_MAX,
MIN(m.SELF_SOLVE_PROJECT_COUNT) AS SELF_SOLVE_PROJECT_COUNT_MIN,
MAX(m.SELF_SOLVE_PROJECT_COUNT) AS SELF_SOLVE_PROJECT_COUNT_MAX,
MIN(m.RESOLVE_PROJECT_COUNT) AS RESOLVE_PROJECT_COUNT_MIN,
MAX(m.RESOLVE_PROJECT_COUNT) AS RESOLVE_PROJECT_COUNT_MAX,
MIN(m.TRANSFER_RIGHT_RATIO) AS TRANSFER_RIGHT_RATIO_MIN,
MAX(m.TRANSFER_RIGHT_RATIO) AS TRANSFER_RIGHT_RATIO_MAX,
MIN(m.SATISFACTION_RATIO) AS SATISFACTION_RATIO_MIN,
MAX(m.SATISFACTION_RATIO) AS SATISFACTION_RATIO_MAX
IFNULL(MIN(m.ISSUE_TOTAL),0) AS ISSUE_TOTAL_MIN,
IFNULL(MAX(m.ISSUE_TOTAL),0) AS ISSUE_TOTAL_MAX,
IFNULL(MIN(m.AVG_ISSUE_COUNT),0) AS AVG_ISSUE_COUNT_MIN,
IFNULL(MAX(m.AVG_ISSUE_COUNT),0) AS AVG_ISSUE_COUNT_MAX,
IFNULL(MIN(m.ISSUE_TO_PROJECT_RATIO),0) AS ISSUE_TO_PROJECT_RATIO_MIN,
IFNULL(MAX(m.ISSUE_TO_PROJECT_RATIO),0) AS ISSUE_TO_PROJECT_RATIO_MAX,
IFNULL(MIN(m.PROJECT_TOTAL),0) AS PROJECT_TOTAL_MIN,
IFNULL(MAX(m.PROJECT_TOTAL),0) AS PROJECT_TOTAL_MAX,
IFNULL(MIN(m.SELF_SOLVE_PROJECT_COUNT),0) AS SELF_SOLVE_PROJECT_COUNT_MIN,
IFNULL(MAX(m.SELF_SOLVE_PROJECT_COUNT),0) AS SELF_SOLVE_PROJECT_COUNT_MAX,
IFNULL(MIN(m.RESOLVE_PROJECT_COUNT),0) AS RESOLVE_PROJECT_COUNT_MIN,
IFNULL(MAX(m.RESOLVE_PROJECT_COUNT),0) AS RESOLVE_PROJECT_COUNT_MAX,
IFNULL(MIN(m.TRANSFER_RIGHT_RATIO),0) AS TRANSFER_RIGHT_RATIO_MIN,
IFNULL(MAX(m.TRANSFER_RIGHT_RATIO),0) AS TRANSFER_RIGHT_RATIO_MAX,
IFNULL(MIN(m.SATISFACTION_RATIO),0) AS SATISFACTION_RATIO_MIN,
IFNULL(MAX(m.SATISFACTION_RATIO),0) AS SATISFACTION_RATIO_MAX
FROM
fact_index_govrn_ablity_grid_monthly m
inner join screen_customer_grid scg
screen_customer_grid scg
left join fact_index_govrn_ablity_grid_monthly m
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
scg.GRID_ID=m.GRID_ID
and m.DEL_FLAG = '0'
and m.MONTH_ID=#{monthId}
)
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
and m.CUSTOMER_ID=#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
@ -181,24 +174,16 @@
<select id="selectCount" resultType="java.lang.Integer" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO">
SELECT
count( 1 ) AS total
count( scg.GRID_ID ) AS total
FROM
fact_index_govrn_ablity_grid_monthly m
inner join screen_customer_grid scg
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
screen_customer_grid scg
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
AND m.MONTH_ID=#{monthId}
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>

118
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityOrgMonthlyDao.xml

@ -135,6 +135,35 @@
AND customer_id = #{customerId}
AND month_id = #{monthId}
</select>
<select id="selectCommunityGovernAbilityNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(om.TRANSFERED_COUNT,0) AS TRANSFERED_COUNT,
IFNULL(om.CLOSED_PROJECT_COUNT,0) AS CLOSED_PROJECT_COUNT,
IFNULL(om.RESP_PROJECT_RATIO,0) AS RESP_PROJECT_RATIO,
IFNULL(om.OVERDUE_PROJECT_RATIO,0) AS OVERDUE_PROJECT_RATIO,
IFNULL(om.CLOSED_PROJECT_RATIO,0) AS CLOSED_PROJECT_RATIO,
IFNULL(om.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
IFNULL(om.HANDLE_PROJECT_RATIO,0) AS HANDLE_PROJECT_RATIO
FROM screen_customer_agency sca
LEFT JOIN fact_index_govrn_ablity_org_monthly om ON
(om.AGENCY_ID = sca.AGENCY_ID
AND om.del_flag = '0'
AND om.data_type = #{level}
AND om.customer_id = #{customerId}
AND om.month_id = #{monthId}
)
WHERE
sca.del_flag = '0'
AND sca.`LEVEL` = #{level}
AND sca.customer_id = #{customerId}
</select>
<select id="selectOrgByCustomer" resultType="com.epmet.entity.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyEntity">
SELECT
AGENCY_ID,
@ -199,6 +228,34 @@
AND gm.PARENT_ID = '0'
</select>
<!-- 【社区】治理能力六个五级指标 -->
<select id="selectCommunityGovernAbilityExistsSubNotSelfNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(gm.TRANSFERED_COUNT,0) AS TRANSFERED_COUNT,
IFNULL(gm.CLOSED_PROJECT_COUNT,0) AS CLOSED_PROJECT_COUNT,
IFNULL(gm.RESP_PROJECT_RATIO,0) AS RESP_PROJECT_RATIO,
IFNULL(gm.OVERDUE_PROJECT_RATIO,0) AS OVERDUE_PROJECT_RATIO,
IFNULL(gm.CLOSED_PROJECT_RATIO,0) AS CLOSED_PROJECT_RATIO,
IFNULL(gm.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
IFNULL(gm.HANDLE_PROJECT_RATIO,0) AS HANDLE_PROJECT_RATIO
FROM screen_customer_agency sca
LEFT JOIN fact_index_govrn_ablity_org_monthly gm ON
(sca.AGENCY_ID = gm.AGENCY_ID
AND gm.del_flag = '0'
AND gm.month_id = #{monthId}
AND gm.DATA_TYPE = #{level}
AND gm.PARENT_ID = '0'
)
WHERE sca.DEL_FLAG = '0'
AND sca.AREA_CODE LIKE CONCAT('370124','%')
AND sca.`LEVEL` = #{level}
</select>
<!-- 孔村单独查询 -->
<select id="selectCommunityGovernAbilityIsKongCun" resultType="java.util.Map">
SELECT
@ -222,8 +279,65 @@
gm.del_flag = '0'
AND gm.month_id = #{monthId}
AND gm.DATA_TYPE = 'street'
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.AREA_CODE != #{areaCode}
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.CUSTOMER_ID = #{customerId}
AND gm.PARENT_ID != '0'
</select>
<!-- 孔村治理能力六个五级指标查询 -->
<select id="selectCommunityGovernAbilityIsKongCunNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.pid AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(ROUND(SUM(gm.TRANSFERED_COUNT),6),0) AS TRANSFERED_COUNT,
IFNULL(ROUND(SUM(gm.CLOSED_PROJECT_COUNT),6),0) AS CLOSED_PROJECT_COUNT,
IFNULL(ROUND(AVG(gm.RESP_PROJECT_RATIO),6),0) AS RESP_PROJECT_RATIO,
IFNULL(ROUND(AVG(gm.OVERDUE_PROJECT_RATIO),6),0) AS OVERDUE_PROJECT_RATIO,
IFNULL(ROUND(AVG(gm.CLOSED_PROJECT_RATIO),6),0) AS CLOSED_PROJECT_RATIO,
IFNULL(ROUND(AVG(gm.SATISFACTION_RATIO),6),0) AS SATISFACTION_RATIO,
IFNULL(ROUND(AVG(gm.HANDLE_PROJECT_RATIO),6),0) AS HANDLE_PROJECT_RATIO
FROM screen_customer_agency sca
LEFT JOIN fact_index_govrn_ablity_org_monthly gm ON
(gm.AGENCY_ID = sca.AGENCY_ID
AND gm.del_flag = '0'
AND gm.month_id = #{monthId}
AND gm.DATA_TYPE = 'street'
AND gm.PARENT_ID != '0'
)
WHERE sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.CUSTOMER_ID = #{customerId}
AND sca.PID = '0'
</select>
<!-- 【street】治理能力的六个五级指标 -->
<select id="selectStreetGovernAbilityExistsSubNotSelfNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(gm.TRANSFERED_COUNT,0) AS TRANSFERED_COUNT,
IFNULL(gm.CLOSED_PROJECT_COUNT,0) AS CLOSED_PROJECT_COUNT,
IFNULL(gm.RESP_PROJECT_RATIO,0) AS RESP_PROJECT_RATIO,
IFNULL(gm.OVERDUE_PROJECT_RATIO,0) AS OVERDUE_PROJECT_RATIO,
IFNULL(gm.CLOSED_PROJECT_RATIO,0) AS CLOSED_PROJECT_RATIO,
IFNULL(gm.SATISFACTION_RATIO,0) AS SATISFACTION_RATIO,
IFNULL(gm.HANDLE_PROJECT_RATIO,0) AS HANDLE_PROJECT_RATIO
FROM screen_customer_agency sca
LEFT JOIN fact_index_govrn_ablity_org_monthly gm ON
(sca.AGENCY_ID = gm.AGENCY_ID
AND gm.del_flag = '0'
AND gm.month_id = #{monthId}
AND gm.DATA_TYPE = #{level}
AND gm.PARENT_ID = '0'
)
WHERE sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE =#{areaCode}
AND sca.CUSTOMER_ID != #{customerId}
</select>
</mapper>

19
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityCpcMonthlyDao.xml

@ -120,15 +120,15 @@
cpc.QUARTER_ID,
cpc.YEAR_ID,
cpc.USER_ID,
cpc.CREATE_TOPIC_COUNT,
cpc.JOIN_TOPIC_COUNT,
cpc.SHIFT_ISSUE_COUNT,
cpc.SHIFT_PROJECT_COUNT,
cpc.JOIN_THREE_MEETS_COUNT,
cpc.GROUP_USER_COUNT,
cpc.GROUP_TOPIC_COUNT,
cpc.TOPIC_TO_ISSUE_RATIO,
cpc.GROUP_ACTIVE_USER_COUNT
SUM(cpc.CREATE_TOPIC_COUNT) CREATE_TOPIC_COUNT,
SUM(cpc.JOIN_TOPIC_COUNT) JOIN_TOPIC_COUNT,
SUM(cpc.SHIFT_ISSUE_COUNT) SHIFT_ISSUE_COUNT,
SUM(cpc.SHIFT_PROJECT_COUNT) SHIFT_PROJECT_COUNT,
SUM(cpc.JOIN_THREE_MEETS_COUNT) JOIN_THREE_MEETS_COUNT,
SUM(cpc.GROUP_USER_COUNT) GROUP_USER_COUNT,
SUM(cpc.GROUP_TOPIC_COUNT) GROUP_TOPIC_COUNT,
SUM(cpc.TOPIC_TO_ISSUE_RATIO) TOPIC_TO_ISSUE_RATIO,
SUM(cpc.GROUP_ACTIVE_USER_COUNT) GROUP_ACTIVE_USER_COUNT
FROM
fact_index_party_ablity_cpc_monthly cpc
inner join screen_customer_grid scg
@ -148,6 +148,7 @@
and scg.CUSTOMER_ID=#{customerId,jdbcType=VARCHAR}
</otherwise>
</choose>
GROUP BY cpc.USER_ID
LIMIT #{offset},#{pageSize}
</select>

156
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityGridMonthlyDao.xml

@ -105,98 +105,92 @@
</insert>
<!-- 这块逻辑也要改为以screen_customer_grid表为主表,没有五级指标值的网格,赋值为0 -->
<!-- 当前客户下,所有网格的党建能力相关五级指标 -->
<select id="selectListPartyAblityGrid" parameterType="com.epmet.dto.indexcal.PageQueryGridFormDTO" resultType="java.util.HashMap">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
m.USER_COUNT,
m.PARTY_COUNT,
m.ACTIVE_USER_COUNT,
m.ACTIVE_PARTY_COUNT,
m.PARTY_AVG_TOPIC_COUNT,
m.USER_AVG_TOPIC_COUNT,
m.PARTY_AVG_SHIFT_PROJECT_COUNT,
m.USER_AVG_SHIFT_PROJECT_COUNT,
m.CREATE_GROUP_PARTY_COUNT,
m.PUBLISH_ARTICLE_COUNT,
m.ISSUE_TO_PROJECT_RATIO,
m.CREATE_THREE_MEETS_COUNT,
m.JOIN_THREE_MEETS_COUNT
scg.CUSTOMER_ID,
scg.GRID_ID,
#{monthId} as MONTH_ID,
IFNULL(m.USER_COUNT,0) AS USER_COUNT,
IFNULL(m.PARTY_COUNT,0) AS PARTY_COUNT,
IFNULL(m.ACTIVE_USER_COUNT,0) AS ACTIVE_USER_COUNT,
IFNULL(m.ACTIVE_PARTY_COUNT,0) AS ACTIVE_PARTY_COUNT,
IFNULL(m.PARTY_AVG_TOPIC_COUNT,0) AS PARTY_AVG_TOPIC_COUNT,
IFNULL(m.USER_AVG_TOPIC_COUNT,0) AS USER_AVG_TOPIC_COUNT,
IFNULL(m.PARTY_AVG_SHIFT_PROJECT_COUNT,0) AS PARTY_AVG_SHIFT_PROJECT_COUNT,
IFNULL(m.USER_AVG_SHIFT_PROJECT_COUNT,0) AS USER_AVG_SHIFT_PROJECT_COUNT,
IFNULL(m.CREATE_GROUP_PARTY_COUNT,0) AS CREATE_GROUP_PARTY_COUNT,
IFNULL(m.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
IFNULL(m.ISSUE_TO_PROJECT_RATIO,0) AS ISSUE_TO_PROJECT_RATIO,
IFNULL(m.CREATE_THREE_MEETS_COUNT,0) AS CREATE_THREE_MEETS_COUNT,
IFNULL(m.JOIN_THREE_MEETS_COUNT,0) AS JOIN_THREE_MEETS_COUNT
FROM
fact_index_party_ablity_grid_monthly m
inner join screen_customer_grid scg
screen_customer_grid scg
left join fact_index_party_ablity_grid_monthly m
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
scg.GRID_ID=m.GRID_ID
AND m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
)
WHERE
m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
order by m.GRID_ID asc
order by scg.GRID_ID asc
LIMIT #{pageIndex}, #{pageSize}
</select>
<!-- 查询党建能力,网格相关,各五级指标最大值,最小值 -->
<select id="selectPartyAblityGridMinAndMax" resultType="java.util.Map" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
MIN(m.USER_COUNT) AS USER_COUNT_MIN,
MAX(m.USER_COUNT) AS USER_COUNT_MAX,
MIN(m.PARTY_COUNT) AS PARTY_COUNT_MIN,
MAX(m.PARTY_COUNT) AS PARTY_COUNT_MAX,
MIN(m.ACTIVE_USER_COUNT) AS ACTIVE_USER_COUNT_MIN,
MAX(m.ACTIVE_USER_COUNT) AS ACTIVE_USER_COUNT_MAX,
MIN(m.ACTIVE_PARTY_COUNT) AS ACTIVE_PARTY_COUNT_MIN,
MAX(m.ACTIVE_PARTY_COUNT) AS ACTIVE_PARTY_COUNT_MAX,
MIN(m.PARTY_AVG_TOPIC_COUNT) AS PARTY_AVG_TOPIC_COUNT_MIN,
MAX(m.PARTY_AVG_TOPIC_COUNT) AS PARTY_AVG_TOPIC_COUNT_MAX,
MIN(m.USER_AVG_TOPIC_COUNT) AS USER_AVG_TOPIC_COUNT_MIN,
MAX(m.USER_AVG_TOPIC_COUNT) AS USER_AVG_TOPIC_COUNT_MAX,
MIN(m.PARTY_AVG_SHIFT_PROJECT_COUNT) AS PARTY_AVG_SHIFT_PROJECT_COUNT_MIN,
MAX(m.PARTY_AVG_SHIFT_PROJECT_COUNT) AS PARTY_AVG_SHIFT_PROJECT_COUNT_MAX,
MIN(m.USER_AVG_SHIFT_PROJECT_COUNT) AS USER_AVG_SHIFT_PROJECT_COUNT_MIN,
MAX(m.USER_AVG_SHIFT_PROJECT_COUNT) AS USER_AVG_SHIFT_PROJECT_COUNT_MAX,
MIN(m.CREATE_GROUP_PARTY_COUNT) AS CREATE_GROUP_PARTY_COUNT_MIN,
MAX(m.CREATE_GROUP_PARTY_COUNT) AS CREATE_GROUP_PARTY_COUNT_MAX,
MIN(m.PUBLISH_ARTICLE_COUNT) AS PUBLISH_ARTICLE_COUNT_MIN,
MAX(m.PUBLISH_ARTICLE_COUNT) AS PUBLISH_ARTICLE_COUNT_MAX,
MIN(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MIN,
MAX(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MAX,
MIN(m.CREATE_THREE_MEETS_COUNT) AS CREATE_THREE_MEETS_COUNT_MIN,
MAX(m.CREATE_THREE_MEETS_COUNT) AS CREATE_THREE_MEETS_COUNT_MAX,
MIN(m.JOIN_THREE_MEETS_COUNT) AS JOIN_THREE_MEETS_COUNT_MIN,
MAX(m.JOIN_THREE_MEETS_COUNT) AS JOIN_THREE_MEETS_COUNT_MAX
IFNULL(MIN(m.USER_COUNT),0) AS USER_COUNT_MIN,
IFNULL(MAX(m.USER_COUNT),0) AS USER_COUNT_MAX,
IFNULL(MIN(m.PARTY_COUNT),0) AS PARTY_COUNT_MIN,
IFNULL(MAX(m.PARTY_COUNT),0) AS PARTY_COUNT_MAX,
IFNULL(MIN(m.ACTIVE_USER_COUNT),0) AS ACTIVE_USER_COUNT_MIN,
IFNULL(MAX(m.ACTIVE_USER_COUNT),0) AS ACTIVE_USER_COUNT_MAX,
IFNULL(MIN(m.ACTIVE_PARTY_COUNT),0) AS ACTIVE_PARTY_COUNT_MIN,
IFNULL(MAX(m.ACTIVE_PARTY_COUNT),0) AS ACTIVE_PARTY_COUNT_MAX,
IFNULL(MIN(m.PARTY_AVG_TOPIC_COUNT),0) AS PARTY_AVG_TOPIC_COUNT_MIN,
IFNULL(MAX(m.PARTY_AVG_TOPIC_COUNT),0) AS PARTY_AVG_TOPIC_COUNT_MAX,
IFNULL(MIN(m.USER_AVG_TOPIC_COUNT),0) AS USER_AVG_TOPIC_COUNT_MIN,
IFNULL(MAX(m.USER_AVG_TOPIC_COUNT),0) AS USER_AVG_TOPIC_COUNT_MAX,
IFNULL(MIN(m.PARTY_AVG_SHIFT_PROJECT_COUNT),0) AS PARTY_AVG_SHIFT_PROJECT_COUNT_MIN,
IFNULL(MAX(m.PARTY_AVG_SHIFT_PROJECT_COUNT),0) AS PARTY_AVG_SHIFT_PROJECT_COUNT_MAX,
IFNULL(MIN(m.USER_AVG_SHIFT_PROJECT_COUNT),0) AS USER_AVG_SHIFT_PROJECT_COUNT_MIN,
IFNULL(MAX(m.USER_AVG_SHIFT_PROJECT_COUNT),0) AS USER_AVG_SHIFT_PROJECT_COUNT_MAX,
IFNULL(MIN(m.CREATE_GROUP_PARTY_COUNT),0) AS CREATE_GROUP_PARTY_COUNT_MIN,
IFNULL(MAX(m.CREATE_GROUP_PARTY_COUNT),0) AS CREATE_GROUP_PARTY_COUNT_MAX,
IFNULL(MIN(m.PUBLISH_ARTICLE_COUNT),0) AS PUBLISH_ARTICLE_COUNT_MIN,
IFNULL(MAX(m.PUBLISH_ARTICLE_COUNT),0) AS PUBLISH_ARTICLE_COUNT_MAX,
IFNULL(MIN(m.ISSUE_TO_PROJECT_RATIO),0) AS ISSUE_TO_PROJECT_RATIO_MIN,
IFNULL(MAX(m.ISSUE_TO_PROJECT_RATIO),0) AS ISSUE_TO_PROJECT_RATIO_MAX,
IFNULL(MIN(m.CREATE_THREE_MEETS_COUNT),0) AS CREATE_THREE_MEETS_COUNT_MIN,
IFNULL(MAX(m.CREATE_THREE_MEETS_COUNT),0) AS CREATE_THREE_MEETS_COUNT_MAX,
IFNULL(MIN(m.JOIN_THREE_MEETS_COUNT),0) AS JOIN_THREE_MEETS_COUNT_MIN,
IFNULL(MAX(m.JOIN_THREE_MEETS_COUNT),0) AS JOIN_THREE_MEETS_COUNT_MAX
FROM
fact_index_party_ablity_grid_monthly m
inner join screen_customer_grid scg
screen_customer_grid scg
LEFT join fact_index_party_ablity_grid_monthly m
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
scg.GRID_ID=m.GRID_ID
AND m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
)
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
@ -204,28 +198,20 @@
<!-- 查询 党建能力-网格相关事实表 这个月共上传记录数 -->
<select id="selectCount" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.lang.Integer">
SELECT
count(1) as total
SELECT
count(scg.GRID_ID) as total
FROM
fact_index_party_ablity_grid_monthly m
inner join screen_customer_grid scg
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
screen_customer_grid scg
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
</select>
<!-- 场景:客户这个月只上传了一个网格的事实记录 -->

88
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexPartyAblityOrgMonthlyDao.xml

@ -112,6 +112,29 @@
AND month_id = #{monthId}
</select>
<select id="selectPublishArticleCountMapNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
ifnull(om.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_party_ablity_org_monthly om ON
(om.AGENCY_ID = sca.AGENCY_ID
AND om.del_flag = '0'
AND om.data_type = #{level}
AND om.customer_id = #{customerId}
AND om.month_id = #{monthId}
)
WHERE
sca.DEL_FLAG = 0
AND sca.CUSTOMER_ID = #{customerId}
AND sca.`LEVEL` = #{level}
</select>
<!-- 查询社区下的发文数 Map【根据areaCode】 -->
<select id="selectPublishArticleCountMapbyAreaCode" resultType="java.util.Map">
SELECT
@ -149,6 +172,27 @@
AND sca.PARENT_AREA_CODE = #{areaCode}
AND pm.month_id = #{monthId}
</select>
<select id="selectPublishArticleCountMapExistSubStreetNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.pid AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(pm.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_party_ablity_org_monthly pm ON
(sca.AGENCY_ID = pm.AGENCY_ID
AND pm.del_flag = '0'
AND pm.month_id = #{monthId}
)
WHERE
sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE = #{areaCode}
</select>
<select id="selectPublishArticleCountMapExistSubNotSelf" resultType="java.util.Map">
SELECT
pm.AGENCY_ID,
@ -166,6 +210,28 @@
AND sca.AREA_CODE = #{areaCode}
AND pm.month_id = #{monthId}
</select>
<!-- 街道级发文数量 -->
<select id="selectPublishArticleCountMapExistSubNotSelfNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.pid AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(pm.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_party_ablity_org_monthly pm ON
(sca.AGENCY_ID = pm.AGENCY_ID
AND pm.del_flag = '0'
AND pm.month_id = #{monthId}
)
WHERE sca.DEL_FLAG = '0'
AND sca.AREA_CODE = #{areaCode}
</select>
<select id="selectPublishArticleCountMapbyAreaCodeNotSelf" resultType="java.util.Map">
SELECT
fm.AGENCY_ID,
@ -186,4 +252,26 @@
AND sca.AREA_CODE != #{areaCode}
</select>
<select id="selectPublishArticleCountMapbyAreaCodeNotSelfNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.pid AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(fm.PUBLISH_ARTICLE_COUNT,0) AS PUBLISH_ARTICLE_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_party_ablity_org_monthly fm ON
(sca.AGENCY_ID = fm.AGENCY_ID
AND fm.del_flag = '0'
AND fm.month_id = #{monthId}
AND fm.DATA_TYPE = 'community'
)
WHERE sca.DEL_FLAG = '0'
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.`LEVEL` = 'community'
AND sca.UP_TO_CAL = 'yes'
</select>
</mapper>

80
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityGridMonthlyDao.xml

@ -81,51 +81,59 @@
<!-- 当前客户下,所有网格的治理能力相关五级指标 -->
<select id="selectListServiceAblityGrid" parameterType="com.epmet.dto.indexcal.PageQueryGridFormDTO" resultType="java.util.HashMap">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
m.ACTIVITY_COUNT,
m.VOLUNTEER_RATIO,
m.PARTY_VOLUNTEER_RATIO
scg.CUSTOMER_ID,
scg.GRID_ID,
#{monthId} AS MONTH_ID,
IFNULL( m.ACTIVITY_COUNT, 0 ) AS ACTIVITY_COUNT,
IFNULL( m.VOLUNTEER_RATIO, 0 ) AS VOLUNTEER_RATIO,
IFNULL( m.PARTY_VOLUNTEER_RATIO, 0 ) AS PARTY_VOLUNTEER_RATIO
FROM
fact_index_service_ablity_grid_monthly m
WHERE
m.DEL_FLAG = '0'
and m.CUSTOMER_ID=#{customerId}
and m.MONTH_ID=#{monthId}
order by m.GRID_ID asc
screen_customer_grid scg
LEFT JOIN fact_index_service_ablity_grid_monthly m
ON ( scg.GRID_ID = m.GRID_ID
AND m.DEL_FLAG = '0'
AND m.MONTH_ID = #{monthId}
)
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
ORDER BY
scg.GRID_ID ASC
LIMIT #{pageIndex}, #{pageSize}
</select>
<!-- 查询 服务能力,网格相关,各五级指标最大值,最小值 -->
<select id="selectServiceAblityGridMinAndMax" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.util.Map">
SELECT
m.CUSTOMER_ID,
m.GRID_ID,
m.MONTH_ID,
MIN(m.ACTIVITY_COUNT) AS ACTIVITY_COUNT_MIN,
MAX(m.ACTIVITY_COUNT) AS ACTIVITY_COUNT_MAX,
MIN(m.VOLUNTEER_RATIO) AS VOLUNTEER_RATIO_MIN,
MAX(m.VOLUNTEER_RATIO) AS VOLUNTEER_RATIO_MAX,
MIN(m.PARTY_VOLUNTEER_RATIO) AS PARTY_VOLUNTEER_RATIO_MIN,
MAX(m.PARTY_VOLUNTEER_RATIO) AS PARTY_VOLUNTEER_RATIO_MAX
IFNULL(MIN(m.ACTIVITY_COUNT),0) AS ACTIVITY_COUNT_MIN,
IFNULL(MAX(m.ACTIVITY_COUNT),0) AS ACTIVITY_COUNT_MAX,
IFNULL(MIN(m.VOLUNTEER_RATIO),0) AS VOLUNTEER_RATIO_MIN,
IFNULL(MAX(m.VOLUNTEER_RATIO),0) AS VOLUNTEER_RATIO_MAX,
IFNULL(MIN(m.PARTY_VOLUNTEER_RATIO),0) AS PARTY_VOLUNTEER_RATIO_MIN,
IFNULL(MAX(m.PARTY_VOLUNTEER_RATIO),0) AS PARTY_VOLUNTEER_RATIO_MAX
FROM
fact_index_service_ablity_grid_monthly m
inner join screen_customer_grid scg
screen_customer_grid scg
left join fact_index_service_ablity_grid_monthly m
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
scg.GRID_ID=m.GRID_ID
and m.DEL_FLAG = '0'
and m.MONTH_ID=#{monthId}
)
WHERE
m.DEL_FLAG = '0'
and m.MONTH_ID=#{monthId}
scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
and m.CUSTOMER_ID=#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>
@ -134,24 +142,16 @@
<!-- 查询(服务能力-网格相关事实表)共上传记录数 -->
<select id="selectCount" parameterType="com.epmet.dto.indexcal.CalculateCommonFormDTO" resultType="java.lang.Integer">
SELECT
count(1) as total
count(scg.GRID_ID) as total
FROM
fact_index_service_ablity_grid_monthly m
inner join screen_customer_grid scg
on(
m.GRID_ID=scg.GRID_ID
and scg.DEL_FLAG='0'
screen_customer_grid scg
WHERE scg.DEL_FLAG='0'
and scg.UP_TO_CAL='yes'
)
WHERE
m.DEL_FLAG = '0'
AND m.MONTH_ID =#{monthId}
<choose>
<when test="null!=subCustomerIds and subCustomerIds.size()>0">
and scg.AREA_CODE LIKE concat( #{customerAreaCode}, '%')
</when>
<otherwise>
AND m.CUSTOMER_ID =#{customerId}
and scg.CUSTOMER_ID=#{customerId}
</otherwise>
</choose>

97
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexServiceAblityOrgMonthlyDao.xml

@ -112,6 +112,29 @@
AND month_id = #{monthId}
</select>
<select id="selectActivityCountMapNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(om.ACTIVITY_COUNT,0) AS ACTIVITY_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_service_ablity_org_monthly om ON
(om.AGENCY_ID = sca.AGENCY_ID
AND om.del_flag = '0'
AND om.data_type = #{level}
AND om.customer_id = #{customerId}
AND om.month_id = #{monthId}
)
WHERE
sca.del_flag = 0
AND sca.`LEVEL` = #{level}
AND sca.CUSTOMER_ID = #{customerId}
</select>
<!-- 社区活动组织次数 存在下级客户 -->
<select id="selectActivityCountMapExistsSub" resultType="java.util.Map">
SELECT
@ -128,8 +151,7 @@
WHERE
sm.del_flag = '0'
AND sm.DATA_TYPE = 'street'
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.AREA_CODE != #{areaCode}
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sm.month_id = #{monthId}
AND sm.PARENT_ID = '0'
</select>
@ -167,9 +189,76 @@
WHERE
sm.del_flag = '0'
AND sm.DATA_TYPE = 'street'
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.AREA_CODE != #{areaCode}
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.CUSTOMER_ID = #{customerId}
AND sm.month_id = #{monthId}
AND sm.PARENT_ID != '0'
</select>
<!-- 街道级 活动组织次数查询 -->
<select id="selectActivityCountMapExistsSubNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(sm.ACTIVITY_COUNT,0) AS ACTIVITY_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_service_ablity_org_monthly sm ON
(sm.AGENCY_ID = sca.AGENCY_ID
AND sm.del_flag = '0'
AND sm.DATA_TYPE = 'street'
AND sm.month_id = #{monthId}
AND sm.PARENT_ID = '0'
)
WHERE sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.CUSTOMER_ID != #{customerId}
</select>
<!-- 孔村活动组织次数 -->
<select id="selectActivityCountMapIsKongCunNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(SUM(sm.ACTIVITY_COUNT),0) AS ACTIVITY_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_service_ablity_org_monthly sm ON
(sca.AGENCY_ID = sm.AGENCY_ID
AND sm.del_flag = '0'
AND sm.DATA_TYPE = 'street'
AND sm.month_id = #{monthId}
AND sm.PARENT_ID != '0'
)
WHERE sca.DEL_FLAG = '0'
AND sca.PARENT_AREA_CODE = #{areaCode}
AND sca.CUSTOMER_ID = #{customerId}
</select>
<select id="selectActivityCountMapExistsSubNotSelfNew" resultType="java.util.Map">
SELECT
sca.AGENCY_ID,
sca.PID AS PARENT_ID,
#{monthId} AS MONTH_ID,
#{quarterId} AS QUARTER_ID,
#{yearId} AS YEAR_ID,
IFNULL(sm.ACTIVITY_COUNT,0) AS ACTIVITY_COUNT,
sca.CUSTOMER_ID
FROM screen_customer_agency sca
LEFT JOIN fact_index_service_ablity_org_monthly sm ON
(sca.AGENCY_ID = sm.AGENCY_ID
AND sm.del_flag = '0'
AND sm.DATA_TYPE = 'community'
AND sm.month_id = #{monthId}
)
WHERE sca.DEL_FLAG = '0'
AND sca.AREA_CODE LIKE CONCAT(#{areaCode},'%')
AND sca.`LEVEL` = 'community'
</select>
</mapper>

20
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/group/GroupDataDao.xml

@ -26,12 +26,12 @@
COUNT(rgm.id) AS gridGroupPeopleTotal
FROM
resi_group rg
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
WHERE
rg.DEL_FLAG = 0
AND rg.state = #{state}
AND rg.customer_id = #{customerId}
AND rgm.status != #{status}
AND (rgm.status = 'approved' OR rgm.status = 'silent')
AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
GROUP BY rg.grid_id
</select>
@ -45,12 +45,12 @@
COUNT( rgm.id ) AS groupCount
FROM
resi_group rg
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
WHERE
rg.DEL_FLAG = 0
AND rg.state = #{state}
AND rg.customer_id = #{customerId}
AND rgm.STATUS != #{status}
AND (rgm.status = 'approved' OR rgm.status = 'silent')
AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
GROUP BY
rgm.resi_group_id
@ -94,12 +94,12 @@
COUNT(rgm.id) AS gridGroupPeopleTotal
FROM
resi_group rg
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
WHERE
rg.DEL_FLAG = 0
AND rg.state = 'approved'
AND rg.customer_id = #{customerId}
AND rgm.status != 'removed'
AND (rgm.status = 'approved' OR rgm.status = 'silent')
AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
GROUP BY rg.grid_id
</select>
@ -112,12 +112,12 @@
COUNT( rgm.id ) AS groupCount
FROM
resi_group rg
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
WHERE
rg.DEL_FLAG = 0
AND rg.state = 'approved'
AND rg.customer_id = #{customerId}
AND rgm.STATUS != 'removed'
AND (rgm.status = 'approved' OR rgm.status = 'silent')
AND DATE_FORMAT(rgm.created_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
GROUP BY
rgm.resi_group_id
@ -145,12 +145,12 @@
COUNT( rgm.id ) AS groupCount
FROM
resi_group rg
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id
LEFT JOIN resi_group_member rgm ON rgm.resi_group_id = rg.id AND rgm.DEL_FLAG = 0
WHERE
rg.DEL_FLAG = 0
AND rg.state = 'approved'
AND rg.grid_id = #{gridId}
AND rgm.STATUS != 'removed'
AND (rgm.status = 'approved' OR rgm.status = 'silent')
GROUP BY
rgm.resi_group_id
</foreach>

2
epmet-module/data-statistical/data-statistical-server/src/test/java/com/epmet/stats/test/normalizing/MathUtilTest.java

@ -5,7 +5,7 @@ import java.math.RoundingMode;
public class MathUtilTest {
public static void main(String[] args) {
//值 域:(-π/2,π/2) ->(60,100)
//值 域:[-π/2,π/2] ->[60,100]
double tan = Math.atan(4);
double tan2 = Math.atan(1);
double tan3 = Math.atan(8);

16
epmet-module/epmet-common-service/common-service-server/pom.xml

@ -133,9 +133,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -179,9 +179,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -223,9 +223,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -264,9 +264,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

12
epmet-module/epmet-ext/epmet-ext-server/pom.xml

@ -220,9 +220,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -259,9 +259,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -298,9 +298,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

@ -142,8 +142,8 @@
<elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
<elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -183,8 +183,8 @@
<elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
<elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -224,8 +224,8 @@
<elink.mq.appId>20200804181646184507453a2e9aab76edc550405f80920af</elink.mq.appId>
<elink.mq.token>96d788191a10ff57a125157183413004</elink.mq.token>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>

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

@ -139,8 +139,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -174,8 +174,8 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -209,8 +209,8 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>

12
epmet-module/epmet-message/epmet-message-server/pom.xml

@ -187,9 +187,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -235,9 +235,9 @@
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -283,9 +283,9 @@
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->

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

@ -146,9 +146,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -184,9 +184,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -222,9 +222,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

12
epmet-module/epmet-point/epmet-point-server/pom.xml

@ -153,8 +153,8 @@
<thread.pool.queue-capacity>10</thread.pool.queue-capacity>
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -194,8 +194,8 @@
<thread.pool.queue-capacity>10</thread.pool.queue-capacity>
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>
@ -235,8 +235,8 @@
<thread.pool.queue-capacity>10</thread.pool.queue-capacity>
<thread.pool.keep-alive>30</thread.pool.keep-alive>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
</properties>
</profile>
<profile>

4
epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java

@ -6,7 +6,6 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
import com.epmet.commons.tools.enums.EventEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.service.UserPointActionLogService;
import dto.form.SendPointFormDTO;
@ -75,7 +74,6 @@ public class MqPointCallbackController {
}
List<BasePointEventMsg> formList = JSON.parseArray(mqMsg.getMsg(), BasePointEventMsg.class);
try {
//TODO 调用调整积分方法去给用户加减积分 userPointActionLogService.
formList.forEach(obj -> {
userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),obj);
});
@ -103,9 +101,7 @@ public class MqPointCallbackController {
return new Result<Boolean>().ok(true);
}
List<BasePointEventMsg> formList = JSON.parseArray(mqMsg.getMsg(), BasePointEventMsg.class);
//BasePointEventMsg formDTO = ConvertUtils.sourceToTarget(mqMsg.getMsg(), BasePointEventMsg.class);
try {
//TODO 调用调整积分方法去给用户加减积分 userPointActionLogService.
formList.forEach(obj -> {
userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj);
});

12
epmet-module/epmet-third/epmet-third-server/pom.xml

@ -197,9 +197,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -235,9 +235,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -273,9 +273,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

@ -779,6 +779,15 @@ public class CodeServiceImpl implements CodeService {
dto.setCreateTime(DateUtils.formatTimestamp(temp.getCreateTime(), DateUtils.DATE_TIME_PATTERN));
resultList.add(dto);
});
//按时间降序
if (resultList.size() > NumConstant.ZERO) {
Collections.sort(resultList, new Comparator<TemplateDraftListResultDTO>() {
@Override
public int compare(TemplateDraftListResultDTO o1, TemplateDraftListResultDTO o2) {
return o2.getCreateTime().compareTo(o1.getCreateTime());
}
});
}
return resultList;
}

2
epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@ -41,6 +41,7 @@ public class WxLoginServiceImpl implements WxLoginService {
@Override
public UserWechatDTO resiAndWorkLogin(String appId, String wxCode, String customerId, String clientType) {
//1.获取用户openid和session_key
logger.info(String.format("wxcode获取微信用户信息,接口入参appId:[%s];wxCode:[%s];customerId:[%s];clientType:[%s]", appId, wxCode, customerId, clientType));
Map<String, Object> map = new HashMap<>();
map.put("appid", appId);
map.put("js_code", wxCode);
@ -62,6 +63,7 @@ public class WxLoginServiceImpl implements WxLoginService {
UserWechatDTO dto = new UserWechatDTO();
dto.setWxOpenId(openid);
dto.setSessionKey(sessionKey);
logger.info("wxcode获取微信用户信息,接口返参UserWechatDTO->" + dto);
/*//2.换取用户基本信息
//小程序access_token

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

@ -120,9 +120,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -152,9 +152,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -184,9 +184,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -226,4 +226,4 @@
</profiles>
</project>
</project>

10
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java

@ -43,4 +43,14 @@ public class GovTopicOfIssueInfoResultDTO implements Serializable {
* 话题发表人电话
* */
private String topicPublisherMobile;
/**
* 话题所属小组id
*/
private String groupId;
/**
* 话题所属小组名称
*/
private String groupName;
}

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

@ -171,8 +171,8 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
@ -211,8 +211,8 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
@ -251,8 +251,8 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
<rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
</properties>

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

@ -138,9 +138,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -168,9 +168,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -198,9 +198,9 @@
<nacos.ip/>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -234,4 +234,4 @@
</profile>
</profiles>
</project>
</project>

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

@ -164,9 +164,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -206,9 +206,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -249,9 +249,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->

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

@ -620,7 +620,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
formDTO.setPageNo((formDTO.getPageNo() - 1) * formDTO.getPageSize());
//地区编码如何是00结尾的则查询当前地区数据(实际业务不会存在,因为地区必须选到区县级)
if (areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
if (StringUtils.isNotBlank(areaCode) && areaCode.endsWith(ModuleConstant.LAST_TWO_LETTER_OF_FORMATIVE_CITY_CODE)) {
//城市 - 查全部
formDTO.setAreaCode(areaCode.substring(0, areaCode.length() - 2));
List<PublicCustomerGridForStrangerResultDTO> gridList = baseDao.selectThirdGridByCityLike(formDTO);
@ -631,13 +631,13 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
//行政区 - 指定行政区在前,所属城市下其余行政区在后
Map<String, Object> map = new HashMap<>();
map.put("customerId", formDTO.getCustomerId());
//地区码格式 六位 [abcxyz]
/*//地区码格式 六位 [abcxyz]
//ab代表省
map.put("areaCode", areaCode);
//cx代表市
map.put("cityCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.TWO));
//yz代表区
map.put("provinceCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.FOUR));
map.put("provinceCode", areaCode.substring(NumConstant.ZERO, areaCode.length() - NumConstant.FOUR));*/
map.put("pageSize", formDTO.getPageSize());
map.put("pageNo", formDTO.getPageNo());

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

@ -233,7 +233,7 @@ public class StaffServiceImpl implements StaffService {
customerAgencyService.update(oldAgencyDTO);
//新组织总人数加一
CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(fromDTO.getAgencyId());
newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() - NumConstant.ONE);
newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() + NumConstant.ONE);
customerAgencyService.update(newAgencyDTO);
//5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1
customerDepartmentService.updateDepartment(fromDTO.getStaffId());

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

@ -338,7 +338,7 @@
LEFT JOIN customer_agency ca ON ca.id = cg.pid
WHERE
cg.id = #{gridId}
AND cg.del_flag = 0
<!-- AND cg.del_flag = 0 --><!-- 网格被删除时,首次在该网格注册的居民就找不到了所属网格,暂时关闭这个查询条件,避免缓存中user的showname和组成员member的usershowname出现空值 -->
</select>
<select id="selectGridList" resultType="com.epmet.dto.result.GridListResultDTO">
@ -428,10 +428,10 @@
) agency ON grid.PID = agency.ID
WHERE
grid.del_flag = 0
AND
grid.area_code LIKE CONCAT(#{areaCode},'%')
AND
grid.customer_id = #{customerId}
<if test='areaCode != "" and areaCode != null'>
AND grid.area_code LIKE CONCAT(#{areaCode},'%')
</if>
AND grid.customer_id = #{customerId}
ORDER BY
grid.customer_id,
CONVERT ( gridName USING gbk ) ASC
@ -443,7 +443,6 @@
SELECT
c.*
FROM
(
(
SELECT
a.id AS grid_id,
@ -468,45 +467,9 @@
) agency ON a.PID = agency.ID
WHERE
a.del_flag = 0
AND a.area_code = #{areaCode}
AND a.customer_id = #{customerId}
ORDER BY
CONVERT ( gridName USING gbk ) ASC
LIMIT 0,999999999999
)
UNION
(
SELECT
b.id AS grid_id,
b.customer_id,
concat(agency.fullname , '-' ,b.grid_name) as gridName
FROM
CUSTOMER_GRID b
LEFT JOIN (
SELECT
a1.id,
CASE
WHEN a2.ORGANIZATION_NAME IS NULL THEN
a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
END AS fullname
FROM
customer_agency a1
LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
AND a1.del_flag = '0'
WHERE
a1.del_flag = '0'
AND a1.customer_id = #{customerId}
) agency ON b.PID = agency.ID
WHERE
b.del_flag = 0
AND b.customer_id = #{customerId}
AND b.area_code LIKE CONCAT(#{cityCode},'%')
AND <![CDATA[ b.area_code <> #{areaCode}]]>
ORDER BY
b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
LIMIT 0,999999999999
)
) AS c
AND a.customer_id = #{customerId}
) AS c
ORDER BY CONVERT ( gridName USING gbk ) ASC
LIMIT #{pageNo}, #{pageSize}
</select>

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

@ -171,9 +171,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -210,9 +210,9 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -249,9 +249,9 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -294,4 +294,4 @@
</profile>
</profiles>
</project>
</project>

30
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@ -719,20 +719,22 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
// 项目评价初始化信息插入
// 应评价数 = 话题创建者 + 议题发起者 + 议题表决人 【去重】
// 议题发起者 和 议题表决人 和 话题创建者 查询
Result<List<String>> canEvaluateProjectCount = govIssueOpenFeignClient.canEvaluateProjectCount(projectEntity.getOriginId());
if (!canEvaluateProjectCount.success()){
throw new RenException("【查询项目应评价人数失败】,【"+canEvaluateProjectCount.getMsg()+"】");
}
List<String> userIds = canEvaluateProjectCount.getData();
ProjectSatisfactionStatisticsEntity entity1 = new ProjectSatisfactionStatisticsEntity();
entity1.setShouldEvaluateCount(userIds.size());
entity1.setCustomerId(projectEntity.getCustomerId());
entity1.setProjectId(fromDTO.getProjectId());
entity1.setBadCount(NumConstant.ZERO);
entity1.setGoodCount(NumConstant.ZERO);
entity1.setPerfectCount(NumConstant.ZERO);
// 新添一条记录
statisticsDao.insert(entity1);
if (projectEntity.getOrigin().equals(ProjectConstant.ISSUE)) {
Result<List<String>> canEvaluateProjectCount = govIssueOpenFeignClient.canEvaluateProjectCount(projectEntity.getOriginId());
if (!canEvaluateProjectCount.success()) {
throw new RenException("【查询项目应评价人数失败】,【" + canEvaluateProjectCount.getMsg() + "】");
}
List<String> userIds = canEvaluateProjectCount.getData();
ProjectSatisfactionStatisticsEntity entity1 = new ProjectSatisfactionStatisticsEntity();
entity1.setShouldEvaluateCount(userIds.size());
entity1.setCustomerId(projectEntity.getCustomerId());
entity1.setProjectId(fromDTO.getProjectId());
entity1.setBadCount(NumConstant.ZERO);
entity1.setGoodCount(NumConstant.ZERO);
entity1.setPerfectCount(NumConstant.ZERO);
// 新添一条记录
statisticsDao.insert(entity1);
}
}
@Override

14
epmet-module/gov-voice/gov-voice-server/pom.xml

@ -134,9 +134,9 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -173,9 +173,9 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -212,9 +212,9 @@
<openapi.scan.server.url>https://epmet-dev.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -258,4 +258,4 @@
</profiles>
</project>
</project>

12
epmet-module/oper-access/oper-access-server/pom.xml

@ -121,9 +121,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -159,9 +159,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -197,9 +197,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

@ -166,9 +166,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -204,9 +204,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -242,9 +242,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

@ -132,9 +132,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -174,9 +174,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -216,9 +216,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->

15
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/ResiTopicDTO.java

@ -88,6 +88,21 @@ public class ResiTopicDTO implements Serializable {
*/
private String dimension;
/**
* 定位地址
* */
private String locateAddress;
/**
* 定位经度
* */
private String locateLongitude;
/**
* 定位纬度
* */
private String locateDimension;
/**
* 删除标记 0未删除1已删除
*/

15
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicDraftDTO.java

@ -103,6 +103,21 @@ public class TopicDraftDTO implements Serializable {
*/
private String dimension;
/**
* 定位地址
* */
private String locateAddress;
/**
* 定位经度
* */
private String locateLongitude;
/**
* 定位纬度
* */
private String locateDimension;
/**
* 发布成功后的话题id
*/

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/TopicInfoDTO.java

@ -45,4 +45,14 @@ public class TopicInfoDTO implements Serializable {
*/
private String groupType;
/**
* 话题所属小组id
*/
private String groupId;
/**
* 话题所属小组名称
*/
private String groupName;
}

15
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CreateTopicFormDTO.java

@ -44,6 +44,21 @@ public class CreateTopicFormDTO implements Serializable {
@NotBlank(message = "地址信息不能为空")
private String address;
/**
* 经度
* */
private String locateLongitude;
/**
* 纬度
* */
private String locateDimension;
/**
* 地址
* */
private String locateAddress;
/**
* 省份
* */

9
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/DraftDetailResultDTO.java

@ -42,6 +42,15 @@ public class DraftDetailResultDTO implements Serializable {
* 发布地址
*/
private String releaseAddress;
/**
* 经度
*/
private String longitude;
/**
* 维度
*/
private String dimension;
/**
* 驳回理由
*/

9
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java

@ -65,4 +65,13 @@ public class GovTopicIssueInfoResultDTO implements Serializable {
*/
private String belongsGridName;
/**
* 话题所属小组id
*/
private String groupId;
/**
* 话题所属小组名称
*/
private String groupName;
}

5
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicAttachmentsResultDTO.java

@ -24,6 +24,11 @@ public class ResiTopicAttachmentsResultDTO implements Serializable {
private String groupId;
/**
* 话题所属小组名称
*/
private String groupName;
private Date createdTime;
private List<String> photoList;

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicIncludeIssueDetailResultDTO.java

@ -41,6 +41,16 @@ public class ResiTopicIncludeIssueDetailResultDTO implements Serializable {
* */
private String releaseAddress;
/**
* 经度
*/
private String longitude;
/**
* 维度
*/
private String dimension;
/**
* 话题内容
* */

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

@ -193,9 +193,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
@ -249,9 +249,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->
<rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
@ -302,9 +302,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
<!--rocketmq-->

29
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -598,22 +598,35 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
public Result agreeApplyGroup(AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
//1、更新组的状态
ResiGroupDTO resiGroupDTO = this.get(agreeApplyGroupFormDTO.getGroupId());
if (null == resiGroupDTO) {
throw new RenException("小组信息不存在");
}
if (GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
logger.warn("当前小组已审核通过,groupId=" + agreeApplyGroupFormDTO.getGroupId());
return new Result();
}
resiGroupDTO.setState(GroupStateConstant.GROUP_APPROVED);
this.update(resiGroupDTO);
//2、更新组的申请记录改为已通过
ResiGroupOperationDTO resiGroupOperation = resiGroupOperationDao.selectGroupApplyRecord(agreeApplyGroupFormDTO.getGroupId());
resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
resiGroupOperationService.update(resiGroupOperation);
if (null != resiGroupOperation) {
resiGroupOperation.setState(GroupStateConstant.GROUP_APPROVED);
resiGroupOperation.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
resiGroupOperationService.update(resiGroupOperation);
}
//3、将群主在群成员的状态改为已通过
ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectLeaderMember(agreeApplyGroupFormDTO.getGroupId());
resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
resiGroupMemberService.update(resiGroupMemberDTO);
if (null != resiGroupMemberDTO) {
resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
resiGroupMemberService.update(resiGroupMemberDTO);
}
//4、更新群主的出入群记录改为已通过
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationDao.selectLeaderRecord(agreeApplyGroupFormDTO.getGroupId());
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
groupMemeberOperationService.update(groupMemeberOperationDTO);
if (null != groupMemeberOperationDTO) {
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
groupMemeberOperationDTO.setOperateUserId(agreeApplyGroupFormDTO.getUserId());
groupMemeberOperationService.update(groupMemeberOperationDTO);
}
//4-1.2020.11.17 sun 添加小组审核通过后生成小组的二维码图片逻辑 start
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
@Override

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java

@ -252,4 +252,14 @@ public interface ResiGroupMemberService extends BaseService<ResiGroupMemberEntit
* @Date 2021/4/19 19:14
**/
List<ResiGroupMemberDTO> getMemberList(String groupId);
/**
* 查询小组人员信息
* @author zhaoqifeng
* @date 2021/5/8 15:17
* @param groupId
* @param userId
* @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
*/
ResiGroupMemberDTO getMemberInfo(String groupId, String userId);
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@ -247,8 +247,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
throw new RenException("没有找到邀请人Id");
}
//查询是否在群内
ResiGroupMemberDTO groupMember = resiGroupMemberDao.selectGroupMemberInfo(groupId, param.getUserId());
if (null != groupMember && !MemberStateConstant.REMOVED.equals(groupMember.getStatus())) {
ResiGroupMemberDTO groupMember = memberService.getMemberInfo(groupId, param.getUserId());
if (null != groupMember && MemberStateConstant.APPROVED.equals(groupMember.getStatus())) {
log.info("已经在群内,直接返回成功,但是不发送积分事件");
result.setStatus("entered");
return result;
@ -341,7 +341,7 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
}
}
if(StringUtils.isNotBlank(inviter)){
if(StringUtils.isNotBlank(inviter) && null == groupMember){
CommonGridIdFormDTO dataFilterParam = new CommonGridIdFormDTO();
dataFilterParam.setGridId(resiGroupDTO.getGridId());
@ -397,15 +397,15 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
//直接加入群成员关系表
//如果是之前被移除的,则修改resi_group_member记录
ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
ResiGroupMemberDTO resiGroupMember = resiGroupMemberDao.selectGroupMemberInfo(groupId, param.getUserId());
if (null != resiGroupMember) {
resiGroupMemberDTO.setId(resiGroupMember.getId());
if (null != groupMember) {
resiGroupMemberDTO.setId(groupMember.getId());
}
resiGroupMemberDTO.setCustomerUserId(groupMemeberOperation.getCustomerUserId());
resiGroupMemberDTO.setResiGroupId(groupMemeberOperation.getGroupId());
resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
resiGroupMemberDTO.setEnterGroupType(groupMemeberOperation.getEnterGroupType());
resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
resiGroupMemberDTO.setDelFlag(NumConstant.ZERO_STR);
resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
memberService.saveOrUpdate(resiGroupMemberDTO);
//修改群统计值

18
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@ -383,6 +383,24 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
return baseDao.getMemberList(groupId);
}
/**
* 查询小组人员信息
*
* @param groupId
* @param userId
* @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
* @author zhaoqifeng
* @date 2021/5/8 15:17
*/
@Override
public ResiGroupMemberDTO getMemberInfo(String groupId, String userId) {
QueryWrapper<ResiGroupMemberEntity> wrapper = new QueryWrapper<>();
wrapper.eq("RESI_GROUP_ID", groupId)
.eq("CUSTOMER_USER_ID", userId);
ResiGroupMemberEntity entity = baseDao.selectOne(wrapper);
return ConvertUtils.sourceToTarget(entity, ResiGroupMemberDTO.class);
}
/**
* @param groupMemberListFormDTO
* @return com.epmet.commons.tools.utils.Result

1
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java

@ -161,6 +161,7 @@ public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecor
reafdRecord.setNoticeId(notice.getId());
reafdRecord.setUserId(formDTO.getUserId());
reafdRecord.setReadFlag(ReadFlagConstant.READ);
reafdRecord.setViewDetail(ReadFlagConstant.READ);
insert(reafdRecord);
} else {
//4.根据是否过期判断已存在记录且是已读状态不在修改

15
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicEntity.java

@ -90,6 +90,21 @@ public class ResiTopicEntity extends BaseEpmetEntity {
*/
private String dimension;
/**
* 定位地址
* */
private String locateAddress;
/**
* 定位经度
* */
private String locateLongitude;
/**
* 定位纬度
* */
private String locateDimension;
/**
* 议题Id
*/

16
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/TopicDraftEntity.java

@ -103,6 +103,22 @@ public class TopicDraftEntity extends BaseEpmetEntity {
*/
private String dimension;
/**
* 定位地址
* */
private String locateAddress;
/**
* 定位经度
* */
private String locateLongitude;
/**
* 定位纬度
* */
private String locateDimension;
/**
* 发布成功后的话题id
*/

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

@ -2500,13 +2500,18 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
result.setUserRole(leaderFlag);
ResiGroupEntity resiGroup = resiGroupDao.selectById(groupId);
result.setGroupType(resiGroup.getGroupType());
if (leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)){
// 当前人员是组长,显示通知按钮
result.setNoticeBut(true);
}
if (result.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH) && leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)){
// 当前组为支部组且当前人是组长,显示活动按钮
result.setActBut(true);
if (StringUtils.isEmpty(leaderFlag)){
result.setNoticeBut(false);
result.setActBut(false);
}else {
if (leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)) {
// 当前人员是组长,显示通知按钮
result.setNoticeBut(true);
}
if (result.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH) && leaderFlag.equals(ModuleConstant.GROUP_MEMBER_FLAG)) {
// 当前组为支部组且当前人是组长,显示活动按钮
result.setActBut(true);
}
}
Integer unRead = resiGroupDao.selectUserUnRead(groupId, userId);
if (unRead > NumConstant.ZERO){

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

@ -871,7 +871,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
}
topic.setCreatedBy(tokenDto.getUserId());
topic.setStatus(TopicConstant.PUBLISHMENT);
resiTopicDao.insertOne(topic);
resiTopicDao.insert(topic);
if(StringUtils.isBlank(topic.getId())){
//没有返回主键
log.error(ModuleConstant.NO_PRIMARY_KEY_RETURNED);

24
epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.24__topic_locate.sql

@ -0,0 +1,24 @@
ALTER TABLE `resi_topic`
ADD COLUMN `LOCATE_ADDRESS` varchar(255) NULL COMMENT '定位地址' AFTER `DIMENSION`,
ADD COLUMN `LOCATE_LONGITUDE` varchar(32) NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
ADD COLUMN `LOCATE_DIMENSION` varchar(32) NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
ALTER TABLE `topic_draft`
ADD COLUMN `LOCATE_ADDRESS` varchar(255) NULL COMMENT '定位地址' AFTER `DIMENSION`,
ADD COLUMN `LOCATE_LONGITUDE` varchar(32) NULL COMMENT '定位经度' AFTER `LOCATE_ADDRESS`,
ADD COLUMN `LOCATE_DIMENSION` varchar(32) NULL COMMENT '定位维度' AFTER `LOCATE_LONGITUDE`;
ALTER TABLE `resi_group_member`
MODIFY COLUMN `STATUS` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '状态:( 审核通过 - approved、 已禁言 - silent、被移出群 - removed 【组长建组为under_auditting,建组审核不通过为rejected】)' AFTER `GROUP_INVITATION_ID`;
UPDATE resi_topic a
INNER JOIN resi_topic b ON a.ID = b.ID
SET a.LOCATE_ADDRESS = b.ADDRESS,
a.LOCATE_LONGITUDE = b.LONGITUDE,
a.LOCATE_DIMENSION = b.DIMENSION;
UPDATE topic_draft a
INNER JOIN topic_draft b ON a.ID = b.ID
SET a.LOCATE_ADDRESS = b.ADDRESS,
a.LOCATE_LONGITUDE = b.LONGITUDE,
a.LOCATE_DIMENSION = b.DIMENSION;

8
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -544,7 +544,7 @@
WHERE
rgas.IS_ARRIVE = 1
AND DATE_SUB(CURDATE(), INTERVAL 3 DAY) &lt;= date(rgas.CREATED_TIME)
AND DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt;= date(rgas.ARRIVE_TIME)
ORDER BY
rgas.ARRIVE_TIME DESC
</select>
@ -573,7 +573,7 @@
<!-- 查询 话题、通知、活动最近10条数据 -->
<select id="selectLatestTen" resultType="com.epmet.resi.group.dto.topic.result.LatestTenResultDTO">
SELECT id,userId,releaseTime,content,status,issueId,contentType,firstPhoto,isChanged FROM
SELECT id,userId,releaseTime,content,status,issueId,contentType,firstPhoto,isExpirat,isChanged FROM
((SELECT
t.ID,
t.CREATED_BY AS userId,
@ -701,7 +701,7 @@
GROUP_ACT_ID = #{id}
</foreach>
)
AND `VIEW_DETAIL` = 'un_read'
AND READ_FLAG = 'un_read'
AND GROUP_ID = #{groupId}
GROUP BY GROUP_ACT_ID
)
@ -716,7 +716,7 @@
NOTICE_ID = #{id}
</foreach>
)
AND `VIEW_DETAIL` = 'un_read'
AND READ_FLAG = 'un_read'
AND GROUP_ID = #{groupId}
GROUP BY NOTICE_ID
)

27
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@ -97,18 +97,21 @@
<select id="getMembersCountInGrid" resultType="integer">
SELECT
COUNT( DISTINCT member.CUSTOMER_USER_ID )
FROM
RESI_GROUP groupp
INNER JOIN RESI_GROUP_MEMBER member
ON (member.RESI_GROUP_ID = groupp.ID
AND member.DEL_FLAG = '0'
AND member.STATUS not in( 'removed','exit')
COUNT(
DISTINCT
CUSTOMER_USER_ID
)
WHERE
FROM
RESI_GROUP groupp
INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR
member.STATUS = 'silent')
WHERE
groupp.DEL_FLAG = '0'
AND groupp.GRID_ID = #{gridId}
AND groupp.STATE = 'approved'
AND
groupp.GRID_ID = #{gridId}
AND
groupp.STATE = 'approved'
</select>
<select id="getMembersCountInGrids" resultType="com.epmet.resi.group.dto.member.result.VotableCountResultDTO">
@ -120,7 +123,8 @@
) as votableCount
FROM
RESI_GROUP groupp
LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND member.STATUS <![CDATA[<>]]> 'removed'
LEFT JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR
member.STATUS = 'silent')
WHERE
groupp.DEL_FLAG = '0'
AND
@ -161,6 +165,7 @@
AND CUSTOMER_USER_ID = #{userId}
AND RESI_GROUP_ID = #{groupId}
AND `STATUS` != 'removed'
AND `STATUS` != 'exit'
</select>
<!-- 修改群成员关系数据状态 -->

48
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@ -382,7 +382,9 @@
rt.topic_content AS topicContent,
rt.created_by AS publishedUser,
UNIX_TIMESTAMP(rt.created_time) AS publishedTime,
rg.group_type AS groupType
rg.group_type AS groupType,
rg.id as groupId,
rg.GROUP_NAME as groupName
FROM
resi_topic rt
LEFT JOIN resi_group rg ON rt.group_id = rg.id
@ -414,6 +416,7 @@
<result property="topicContent" column="TOPIC_CONTENT"/>
<result property="createdBy" column="CREATED_BY" />
<result property="groupId" column="GROUP_ID" />
<result property="groupName" column="groupName" />
<result property="createdTime" column="CREATED_TIME" />
<collection property="photoList" ofType="java.lang.String">
<constructor>
@ -424,29 +427,26 @@
<!-- 查询话题和附件信息 -->
<select id="selectTopicAndAttachments" resultMap="govTopicIssueInfoResultMap">
SELECT
topic.ID AS TOPIC_ID,
topic.TOPIC_CONTENT ,
topic.CREATED_BY ,
topic.GROUP_ID ,
topic.CREATED_TIME ,
attachment.ATTACHMENT_URL
FROM
resi_topic topic
LEFT JOIN
resi_topic_attachment attachment
ON
topic.ID = attachment.TOPIC_ID
AND
attachment.DEL_FLAG = '0'
AND
attachment.ATTACHMENT_TYPE = 'image'
WHERE
topic.DEL_FLAG = '0'
AND
topic.ID = #{topicId}
ORDER BY
attachment.SORT ASC
SELECT
topic.ID AS TOPIC_ID,
topic.TOPIC_CONTENT,
topic.CREATED_BY,
topic.GROUP_ID,
rg.GROUP_NAME as groupName,
topic.CREATED_TIME,
attachment.ATTACHMENT_URL
FROM
resi_topic topic
left join resi_group rg
on(topic.GROUP_ID=rg.id and rg.DEL_FLAG='0')
LEFT JOIN resi_topic_attachment attachment ON topic.ID = attachment.TOPIC_ID
AND attachment.DEL_FLAG = '0'
AND attachment.ATTACHMENT_TYPE = 'image'
WHERE
topic.DEL_FLAG = '0'
AND topic.ID = #{topicId}
ORDER BY
attachment.SORT ASC
</select>
<!-- 校验本人是不是话题发起人 -->

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

@ -142,9 +142,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -180,9 +180,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -218,9 +218,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

6
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/service/impl/StrangerAccessRecordServiceImpl.java

@ -24,14 +24,12 @@ import com.epmet.dto.form.*;
import com.epmet.dto.result.CustomerGridForStrangerResultDTO;
import com.epmet.dto.result.HomeDesignByCustomerResultDTO;
import com.epmet.dto.result.PublicCustomerGridForStrangerResultDTO;
import com.epmet.dto.result.PublicCustomerResultDTO;
import com.epmet.entity.StrangerAccessRecordEntity;
import com.epmet.feign.EpmetUserFeignClient;
import com.epmet.feign.GovOrgFeignClient;
import com.epmet.feign.OperCustomizeFeignClient;
import com.epmet.service.StrangerAccessRecordService;
import com.epmet.utils.ModuleConstant;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -267,8 +265,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl<StrangerAcc
formDTO.getSelectedAreaCode() : formDTO.getAreaCode());
//分页参数设置
third.setPageNo(null == formDTO.getPageNo() ? ModuleConstant.MIN_CURRENT_PAGE_NO : formDTO.getPageNo());
//third.setPageSize(formDTO.getPageSize());
third.setPageSize(200);
third.setPageSize(formDTO.getPageSize());
// third.setPageSize(200);
//2.调用gov-org服务,查询客户网格列表数据
Result<List<PublicCustomerGridForStrangerResultDTO>> queryResult = govOrgFeignClient.queryCustomerGridList(third);

8
epmet-module/resi-hall/resi-hall-client/src/main/java/com/epmet/dto/TopicInfoDTO.java

@ -45,5 +45,13 @@ public class TopicInfoDTO implements Serializable {
*/
private String groupType;
/**
* 话题所属小组id
*/
private String groupId;
/**
* 话题所属小组名称
*/
private String groupName;
}

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

@ -106,9 +106,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -138,9 +138,9 @@
<spring.flyway.enabled>false</spring.flyway.enabled>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -170,9 +170,9 @@
<spring.flyway.enabled>true</spring.flyway.enabled>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -207,4 +207,4 @@
</properties>
</profile>
</profiles>
</project>
</project>

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

@ -118,9 +118,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -148,9 +148,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -178,9 +178,9 @@
<nacos.ip/>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -214,4 +214,4 @@
</profiles>
</project>
</project>

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

@ -147,9 +147,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -176,9 +176,9 @@
<nacos.ip/>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -205,9 +205,9 @@
<nacos.ip/>
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

@ -149,9 +149,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -188,9 +188,9 @@
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>
@ -227,9 +227,9 @@
<!--测试钉钉 机器人地址-->
<dingTalk.robot.webHook>
https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c
https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4
</dingTalk.robot.webHook>
<dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd
</dingTalk.robot.secret>
</properties>
</profile>

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

Loading…
Cancel
Save