Merge remote-tracking branch 'remotes/origin/dev_screen_data_an_2.0' into dev_temp

# Conflicts:
#	epmet-gateway/pom.xml
#	epmet-module/data-report/data-report-server/pom.xml
#	epmet-module/data-statistical/data-statistical-server/pom.xml
#	epmet-module/epmet-common-service/common-service-server/pom.xml
#	epmet-module/epmet-ext/epmet-ext-server/pom.xml
#	epmet-module/epmet-heart/epmet-heart-server/pom.xml
#	epmet-module/epmet-job/epmet-job-server/pom.xml
#	epmet-module/resi-group/resi-group-server/pom.xml

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

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

epmet-gateway/src/main/resources/bootstrap.yml

@@ -444,6 +444,7 @@ epmet:
     - /data/stats/**
     - /epmet/ext/**
     - /epmetuser/customerstaff/customerlist
+
   swaggerUrls:
 
 jwt:

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.43
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.44
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

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.56
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.62
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

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

@@ -68,12 +68,14 @@ public class BatchScoreCalculator {
                 //反正切函数 [-pi/2,pi/2]
                 BigDecimal maxValue = idx.getScoreCalculator().getMaxValue();
                 BigDecimal minValue = idx.getScoreCalculator().getMinValue();
+                BigDecimal minScoreValue = idx.getScoreCalculator().getMinScore();
                 if (maxValue.compareTo(minValue) == 0) {
                     //*((max-min)/ (Math.PI/2))+min
                     //Math.atan(new Double(vo.getSampleValue().toString()))*
                     normalizeValue = new BigDecimal(Math.atan(new Double(getFinalSampleValue(vo.getSampleValue(), threshold).toString())))
                             .multiply(
-                                    (maxValue.subtract(minValue).divide(new BigDecimal(Math.PI / 2), 10, RoundingMode.UNNECESSARY))).add(minValue).setScale(6, RoundingMode.HALF_UP);
+                                    (maxValue.subtract(minValue).divide(new BigDecimal(Math.PI / 2), 10, RoundingMode.UNNECESSARY)))
+                            .add(minScoreValue).setScale(6, RoundingMode.HALF_UP);
                     //
                     if (scoreCalculator.getCorrelation().getCode().equals(Correlation.NEGATIVE)) {
                         normalizeValue = maxValue.subtract(normalizeValue);

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

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

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

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

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

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

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

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

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.66
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.67
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络