diff --git a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
index b87e071a50..d4edbb0b56 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/BackDoorController.java
@@ -11,8 +11,8 @@ import java.util.Set;
* @author jianjun liu
* @date 2020-06-04 20:39
**/
-@RestController
-@RequestMapping("opback")
+//@RestController
+//@RequestMapping("opback")
public class BackDoorController {
@Autowired
private CustomerAppWxServiceUtil customerAppWxServiceUtil;
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
index 3a91fdfbf7..e8822ea470 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AgencyDistributionResultDTO.java
@@ -38,6 +38,17 @@ public class AgencyDistributionResultDTO implements Serializable {
*/
private String type;
+ /**
+ * 若果是组织，对应返回screen_customer_agency的 level
+ * 机关级别
+ * 社区级：community，
+ * 乡（镇、街道）级:street,
+ * 区县级: district,
+ * 市级: city
+ * 省级:province
+ */
+ private String agencyLevel;
+
public AgencyDistributionResultDTO() {
this.subAreaMarks = "";
this.subCenterMark = "";
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
index b959cf8ea7..9e941152e4 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/CompartmentResultDTO.java
@@ -31,7 +31,10 @@ public class CompartmentResultDTO implements Serializable {
*/
private String areaMarks = "";
+ @JsonIgnore
+ private String level;
/**
+ * 当前组织的级别
* 机关级别
* 社区级：community，
* 乡（镇、街道）级:street,
@@ -39,8 +42,7 @@ public class CompartmentResultDTO implements Serializable {
* 市级: city
* 省级:province
*/
- @JsonIgnore
- private String level;
+ private String agencyLevel;
/**
* 子级用户分布
diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
index 1946b264cf..fa6f9d7f73 100644
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-report-server:
container_name: data-report-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.52
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.59
ports:
- "8108:8108"
network_mode: host # 使用现有网络
@@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 600M
\ No newline at end of file
+ memory: 600M
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index 95424b4479..d81526df81 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- 0.3.52
+ 0.3.59
data-report-server
@@ -316,4 +316,4 @@
-
\ No newline at end of file
+
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
index 3232cf7793..ff1fdaabd7 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java
@@ -195,7 +195,7 @@ public class AgencyServiceImpl implements AgencyService {
if (null == agencyAreaInfo){
return new CompartmentResultDTO();
}
- if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+ if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
// 当level为"community"时，查询screen_customer_grid表
List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
@@ -213,7 +213,7 @@ public class AgencyServiceImpl implements AgencyService {
if (null == agencyAreaInfo){
return new CompartmentResultDTO();
}
- if (agencyAreaInfo.getLevel().equals(ScreenConstant.COMMUNITY)){
+ if (agencyAreaInfo.getAgencyLevel().equals(ScreenConstant.COMMUNITY)){
// 当level为"community"时，查询screen_customer_grid表
List agencyDistributionResultDTOS = screenCustomerGridDao.selectSubDistribution(compartmentFormDTO.getAgencyId());
agencyAreaInfo.setAgencyDistribution(agencyDistributionResultDTOS);
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
index 01e0a69ac6..596b1e9dd6 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java
@@ -1,5 +1,6 @@
package com.epmet.datareport.service.fact.impl;
+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.exception.RenException;
@@ -12,6 +13,7 @@ import com.epmet.datareport.dao.fact.*;
import com.epmet.datareport.service.fact.FactIndexService;
import com.epmet.evaluationindex.screen.dto.form.*;
import com.epmet.evaluationindex.screen.dto.result.*;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -29,6 +31,7 @@ import java.util.regex.Pattern;
*
* @author sun
*/
+@Slf4j
@Service
@DataSource(DataSourceConstant.EVALUATION_INDEX)
public class FactIndexServiceImpl implements FactIndexService {
@@ -77,12 +80,12 @@ public class FactIndexServiceImpl implements FactIndexService {
}
//4.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
- if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+ if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分数据
list = factIndexAgencyScoreDao.selectAgencyAblityWeightScoreIndex(formDTO);
//社区级
- } else if ("community".equals(agency.getLevel())) {
+ } else if ("community".equals(agency.getAgencyLevel())) {
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexCommunityScoreDao.selectCommunityAblityWeightScore(formDTO);
} else {
@@ -179,11 +182,11 @@ public class FactIndexServiceImpl implements FactIndexService {
}
//3.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
- if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+ if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
resultList = factIndexAgencyScoreDao.selectAgencyWeightScoreList(formDTO);
//社区级
- } else if ("community".equals(agency.getLevel())) {
+ } else if ("community".equals(agency.getAgencyLevel())) {
//3-1.查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
resultList = factIndexCommunityScoreDao.selectCommunityWeightScoreList(formDTO);
} else {
@@ -221,22 +224,25 @@ public class FactIndexServiceImpl implements FactIndexService {
if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
//3.根据组织Id查询组织信息
CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyInfoByAegncyId(formDTO.getOrgId());
+ log.debug("monthScoreList search agency result:{}", JSON.toJSONString(agency));
if (null == agency) {
- //throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+ log.warn(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
return resultList;
}
//4.根据组织级别判断查询哪类数据表
//区县级、乡镇街道级
- if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+ if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexAgencyScoreDao.selectAgencyMonthWeightScoreList(formDTO);
-
+ log.debug("monthScoreList search selectAgencyMonthWeightScoreList result:{}", JSON.toJSONString(list));
//社区级
- } else if ("community".equals(agency.getLevel())) {
+ } else if ("community".equals(agency.getAgencyLevel())) {
//4-1.查询过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
list = factIndexCommunityScoreDao.selectCommunityMonthWeightScoreList(formDTO);
+ log.debug("monthScoreList search selectCommunityMonthWeightScoreList result:{}", JSON.toJSONString(list));
} else {
- //throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+ log.warn(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+ log.debug("monthScoreList search othoer result:{}", JSON.toJSONString(list));
return resultList;
}
//网格层级数据
@@ -246,7 +252,7 @@ public class FactIndexServiceImpl implements FactIndexService {
} else {
throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
}
-
+ log.debug("monthScoreList search result:{}", JSON.toJSONString(list));
//5.封装数据并返回
for (MonthScoreListResultDTO.ScoreListResultDTO l : list) {
if (FactConstant.DJNL.equals(l.getIndexCode())) {
@@ -275,7 +281,7 @@ public class FactIndexServiceImpl implements FactIndexService {
if (null != fwList) {
resultList.add(fw);
}
-
+ log.debug("monthScoreList search return result:{}", JSON.toJSONString(resultList));
return resultList;
}
@@ -298,8 +304,8 @@ public class FactIndexServiceImpl implements FactIndexService {
}
//3.根据组织级别拼接查询条件，判断查询不同数据表
//区县级、乡镇街道级
- if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
- if ("district".equals(agency.getLevel())) {
+ if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
+ if ("district".equals(agency.getAgencyLevel())) {
formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
} else {
formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
@@ -307,7 +313,7 @@ public class FactIndexServiceImpl implements FactIndexService {
resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO);
//社区级
- } else if ("community".equals(agency.getLevel())) {
+ } else if ("community".equals(agency.getAgencyLevel())) {
formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO);
} else {
@@ -366,10 +372,10 @@ public class FactIndexServiceImpl implements FactIndexService {
}
//4.根据组织级别拼接查询条件，判断查询不同数据表
//区县级、乡镇街道级
- if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+ if ("district".equals(agency.getAgencyLevel()) || "street".equals(agency.getAgencyLevel())) {
resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO);
//社区级
- } else if ("community".equals(agency.getLevel())) {
+ } else if ("community".equals(agency.getAgencyLevel())) {
resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO);
} else {
//throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
index 648ed8d9db..9cda990ac0 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml
@@ -155,7 +155,7 @@
-
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
index 9d5338ac65..15702fffc1 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml
@@ -44,7 +44,8 @@
agency_id AS agencyId,
agency_name AS name,
area_marks AS areaMarks,
- level AS level
+ level as level,
+ level as agencyLevel
FROM
screen_customer_agency
WHERE
@@ -60,7 +61,8 @@
agency_name AS subName,
area_marks AS subAreaMarks,
center_mark AS subCenterMark,
- 'agency' AS type
+ 'agency' AS type,
+ level as agencyLevel
FROM
screen_customer_agency
WHERE
@@ -190,7 +192,8 @@
SELECT
agency_id AS agencyId,
agency_name AS name,
- level AS level
+ level AS level,
+ level AS agencyLevel
FROM
screen_customer_agency
WHERE
@@ -212,4 +215,4 @@
AND IS_DISPLAY = 1
AND pid = #{agencyId}
-
\ No newline at end of file
+
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
index 997ad03d98..0262675182 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml
@@ -10,7 +10,8 @@
grid_name AS subName,
area_marks AS subAreaMarks,
center_mark AS subCenterMark,
- 'grid' AS type
+ 'grid' AS type,
+ '' as agencyLevel
FROM
screen_customer_grid
WHERE
diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
index b2bb06ce20..075794d502 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
data-statistical-server:
container_name: data-statistical-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.74
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.79
ports:
- "8108:8108"
network_mode: host # 使用现有网络
@@ -15,4 +15,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 1100M
\ No newline at end of file
+ memory: 1100M
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 0722a58e59..473882d35a 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.74
+ 0.3.79
data-statistical
com.epmet
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
index f26101c3dd..8e9dbd77be 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
@@ -193,66 +193,71 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
List issueTotal = factIssueAgencyMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
List userCountList = factRegUserAgencyMonthlyService.selectAgencyUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
- if (CollectionUtils.isEmpty(issueTotal)) {
- log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
- return;
- }
Map userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
Set agencyIdSet = new HashSet<>();
- issueTotal.forEach(issue -> {
- String agencyId = issue.getAgencyId();
- agencyIdSet.add(agencyId);
- ScreenUserJoinEntity entity = insertMap.get(agencyId);
- entity.setJoinTotal(issue.getIssueIncr());
- GridUserCountResultDTO user = userCountMap.get(agencyId);
- //百人人均议题：统计周期内总的议题数/（注册用户数/100）
- if (!user.getRegTotal().equals(0)) {
- BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal())
- .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP);
- entity.setAvgIssue(avgIssueCount);
- }
- });
-
- List> partition = ListUtils.partition(new ArrayList<>(agencyIdSet), NumConstant.THIRTY);
- partition.forEach(list -> {
- //获取该月 表决的人数
- List voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.AGENCY_ID);
- Map orgMemberCount = new HashMap<>();
- if (!CollectionUtils.isEmpty(issueTotal)) {
- //获取每个网格的应表决人数
- List memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
- if (CollectionUtils.isEmpty(memberCountList)) {
- log.warn("抽取【公众参与-人均议题】，获取应表决人数为空");
- return;
+ if (!CollectionUtils.isEmpty(issueTotal)) {
+ log.error("抽取【公众参与-人均议题】，获取注册用户数为空");
+ issueTotal.forEach(issue -> {
+ String agencyId = issue.getAgencyId();
+ agencyIdSet.add(agencyId);
+ ScreenUserJoinEntity entity = insertMap.get(agencyId);
+ entity.setJoinTotal(issue.getIssueIncr());
+ GridUserCountResultDTO user = userCountMap.get(agencyId);
+ //百人人均议题：统计周期内总的议题数/（注册用户数/100）
+ if (!user.getRegTotal().equals(0)) {
+ BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal())
+ .divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP);
+ entity.setAvgIssue(avgIssueCount);
}
- orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
- }
+ });
+ List> partition = ListUtils.partition(new ArrayList<>(agencyIdSet), NumConstant.THIRTY);
+ partition.forEach(list -> {
+ //获取该月 表决的人数
+ List voteCountList = factOriginIssueLogDailyService.getVoteCount(formDTO.getCustomerId(), formDTO.getMonthId(), ProjectConstant.AGENCY_ID);
+ Map orgMemberCount = new HashMap<>();
+ if (!CollectionUtils.isEmpty(issueTotal)) {
+ //获取每个网格的应表决人数
+ List memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
+ if (CollectionUtils.isEmpty(memberCountList)) {
+ log.warn("抽取【公众参与-人均议题】，获取应表决人数为空");
+ return;
+ }
+ orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
+ }
+
+ //百人平均参与度：每个议题的实际参与数/应参与数 的平均值：（每个议题的实际参与数/应参与数）的和）/被表决的议题数
- //百人平均参与度：每个议题的实际参与数/应参与数 的平均值：（每个议题的实际参与数/应参与数）的和）/被表决的议题数
+ //遍历实际参与人数
+ Map> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId));
+ for (Map.Entry> entry : voteMap.entrySet()) {
+ String orgId = entry.getKey();
+ ScreenUserJoinEntity entity = insertMap.get(orgId);
+ List issueList = entry.getValue();
+ BigDecimal bigDecimal = new BigDecimal(0);
+ BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());
+ for (IssueVoteUserCountResultDTO vote : issueList) {
+ Integer memberCount = orgMemberCount.get(orgId);
+ if (memberCount == null) {
+ //memberCount = 0;
+ continue;
+ }
- //遍历实际参与人数
- Map> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId));
- for (Map.Entry> entry : voteMap.entrySet()) {
- String orgId = entry.getKey();
- ScreenUserJoinEntity entity = insertMap.get(orgId);
- List issueList = entry.getValue();
- BigDecimal bigDecimal = new BigDecimal(0);
- BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());
- for (IssueVoteUserCountResultDTO vote : issueList) {
- Integer memberCount = orgMemberCount.get(orgId);
- if (memberCount == null) {
- memberCount = 0;
+ bigDecimal = bigDecimal.add(new BigDecimal(vote.getVoteCount() / (memberCount * 1.0)));
+ }
+ if (votedByIssueCount.intValue() != 0) {
+ entity.setAvgJoin(bigDecimal.divide(votedByIssueCount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
}
- bigDecimal = bigDecimal.add(new BigDecimal(vote.getVoteCount() / (memberCount * 1.0)));
- }
- if (votedByIssueCount.intValue() != 0) {
- entity.setAvgJoin(bigDecimal.divide(votedByIssueCount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(NumConstant.ONE_HUNDRED)));
}
- }
- });
+ });
+ }
screenUserJoinService.deleteAndInsertBatch(formDTO, new ArrayList<>(insertMap.values()));
}
+ public static void main(String[] args) {
+ BigDecimal bigDecimal = new BigDecimal(0);
+ bigDecimal = bigDecimal.add(new BigDecimal(0 / (1 * 1.0)));
+ }
+
private void buildUserJoinEntity(ExtractScreenFormDTO formDTO, Object org, Map result) {
DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(DateUtils.stringToDate(formDTO.getMonthId(), DateUtils.DATE_PATTERN_YYYYMM));
ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(dimIdBean, ScreenUserJoinEntity.class);
diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
index 20f6b2eaf7..c58715456a 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml
@@ -3,7 +3,7 @@ services:
epmet-oss-server:
container_name: epmet-oss-server-prod
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.27
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.28
ports:
- "8083:8083"
network_mode: host # 使用现有网络
@@ -16,4 +16,4 @@ services:
resources:
limits:
cpus: '0.1'
- memory: 600M
\ No newline at end of file
+ memory: 600M
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 3bc02a0c5d..a29c4474cc 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.27
+ 0.3.28
com.epmet
epmet-oss
diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
index a9822255d8..f8d0f80e18 100644
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-access-server:
container_name: gov-access-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.44
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.45
ports:
- "8099:8099"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml
index 450ed4d4c3..cb78960c44 100644
--- a/epmet-module/gov-access/gov-access-server/pom.xml
+++ b/epmet-module/gov-access/gov-access-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.44
+ 0.3.45
gov-access
com.epmet
diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
index d7fc01b54d..18bc535f46 100644
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-issue-server:
container_name: gov-issue-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.57
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.58
ports:
- "8101:8101"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml
index 710f0ab5fc..56cb2ab666 100644
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@@ -2,7 +2,7 @@
- 0.3.57
+ 0.3.58
gov-issue
com.epmet
diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
index 56506be48a..a42028726b 100644
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
gov-org-server:
container_name: gov-org-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.96
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.97
ports:
- "8092:8092"
network_mode: host # 使用现有网络
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 0ff256df4a..aa5fe041a6 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.96
+ 0.3.97
com.epmet
gov-org
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
index 7815ad35ea..053f95b4b8 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
resi-group-server:
container_name: resi-group-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.76
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.81
ports:
- "8095:8095"
network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index cd2971d2e1..84a771af59 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.76
+ 0.3.81
com.epmet
resi-group
diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
index 5da752ddc1..6cbbbfe1c4 100644
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
services:
epmet-user-server:
container_name: epmet-user-server-prod
- image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.137
+ image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.138
ports:
- "8087:8087"
network_mode: host # 不会创建新的网络
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 57707aec01..d3d04f835d 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -2,7 +2,7 @@
4.0.0
- 0.3.137
+ 0.3.138
com.epmet
epmet-user