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

5 years ago · 0ce9680fd9
9 changed files with 19 additions and 18 deletions
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-report-server:
    container_name: data-report-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.12
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-report-server:0.3.13
    ports:
      - "8109:8109"
    network_mode: host # 使用现有网络
--- 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">

-    <version>0.3.12</version>
+    <version>0.3.13</version>
    <artifactId>data-report-server</artifactId>

    <parent>
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java
@ -97,9 +97,9 @@ public class GroupDataServiceImpl implements GroupDataService {
            List<GridGroupPeopleResultDTO> value = everyGroup.getValue();
            String key = everyGroup.getKey();
            List<GridGroupPeopleResultDTO> groupPeopleSorted = value.stream().sorted(Comparator.comparing(GridGroupPeopleResultDTO::getGroupCount).reversed()).collect(Collectors.toList());
-            Integer groupPeopleMedian = groupPeopleSorted.size() % 2 == 0 ?
-                    (groupPeopleSorted.get(groupPeopleSorted.size() / 2 - 1).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount()) / 2 :
-                    groupPeopleSorted.get(groupPeopleSorted.size() / 2).getGroupCount();
+            Integer groupPeopleMedian = groupPeopleSorted.size() % NumConstant.TWO == NumConstant.ZERO ?
+                    (groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO - NumConstant.ONE).getGroupCount() + groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount()) / NumConstant.TWO :
+                    groupPeopleSorted.get(groupPeopleSorted.size() / NumConstant.TWO).getGroupCount();
            result.forEach(grid -> {
                if (key.equals(grid.getGridId())){
                    grid.setGroupMedian(groupPeopleMedian);//中位数
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java
@ -14,6 +14,7 @@ import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
 import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
+import oracle.sql.NUMBER;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@ -155,7 +156,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
            if (allGrid.size() != NumConstant.ZERO) {
                // 1. 机关下有多少网格
                List<GridIdListByCustomerResultDTO> customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId);
-                AtomicReference<Integer> gridSize = new AtomicReference<>(0);
+                AtomicReference<Integer> gridSize = new AtomicReference<>(NumConstant.ZERO);
                if (customerGridIdList.size() != NumConstant.ZERO) {
                    customerGridIdList.forEach(gridId -> {
                        allGrid.forEach(allAgencyGrid -> {
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
@ -177,9 +177,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		if (statsDate == null) {
 			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
 		} else {
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
 		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		int pageNo = 1;
@ -234,9 +234,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		if (statsDate == null) {
 			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
 		} else {
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
 		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		int pageNo = 1;
@ -262,9 +262,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		if (statsDate == null) {
 			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
 		} else {
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
 		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		int pageNo = 1;
@ -297,9 +297,9 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和
 		if (statsDate == null) {
 			//当天的凌晨时间 即为今天之前的数据
-			statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(DateUtils.addDateDays(new Date(), -1), DateUtils.DATE_PATTERN);
 		} else {
-			statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN);
+			statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
 		}
 		DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate);
 		int pageNo = 1;
--- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-issue-server:
    container_name: gov-issue-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.45
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.46
    ports:
      - "8101:8101"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-issue/gov-issue-server/pom.xml
+++ b/epmet-module/gov-issue/gov-issue-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.45</version>
+    <version>0.3.46</version>
    <parent>
        <artifactId>gov-issue</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-project-server:
    container_name: gov-project-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.30
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.31
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-project/gov-project-server/pom.xml
+++ b/epmet-module/gov-project/gov-project-server/pom.xml
@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.30</version>
+    <version>0.3.31</version>
    <parent>
        <artifactId>gov-project</artifactId>
        <groupId>com.epmet</groupId>