From 0d54716db35312a0353014c01659f699ee00fd7e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 3 Mar 2021 17:43:19 +0800
Subject: [PATCH] indexstatistics

---
 .../epmet/dto/screencoll/form/CustomerAgencyFormDTO.java | 5 +++--
 .../java/com/epmet/controller/plugins/OfsController.java | 6 +++---
 .../indexcal/impl/IndexCalculateServiceImpl.java         | 9 ++++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
index 0ef8749799..2ef49407e4 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/CustomerAgencyFormDTO.java
@@ -60,7 +60,7 @@ public class CustomerAgencyFormDTO implements Serializable {
     private String level;
 
     /**
-     * 行政地区编码
+     * 行政地区编码，孔村、榆山、锦水以及孔村要有值
      */
     private String areaCode;
 
@@ -75,7 +75,8 @@ public class CustomerAgencyFormDTO implements Serializable {
     private String isDisplay;
 
     /**
-     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     * v2升级：当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     * 孔村、榆山、锦水以及孔村要有值
      */
     private String parentAreaCode;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java
index 09f5942c5c..ca112ac6a9 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/plugins/OfsController.java
@@ -26,7 +26,7 @@ public class OfsController {
      * @param customerId
      * @param formDTO
      * @author yinzuomei
-     * @description 【146】一张清单
+     * @description 【146】一张清单 isFirst=true时,根据customerId先删除后增加
      * @Date 2021/1/22 10:19 
      **/
     @PostMapping("onelist-daily")
@@ -40,7 +40,7 @@ public class OfsController {
      * @param customerId
      * @param formDTO
      * @author yinzuomei
-     * @description 【146】合同监管
+     * @description 【146】合同监管 isFirst=true时,根据customerId先删除后增加
      * @Date 2021/1/22 10:42
      **/
     @PostMapping("contract-daily")
@@ -54,7 +54,7 @@ public class OfsController {
      * @param customerId
      * @param formDTO
      * @author yinzuomei
-     * @description 【146】竞标管理
+     * @description 【146】竞标管理 isFirst=true时,根据customerId先删除后增加
      * @Date 2021/1/22 10:53
      **/
     @PostMapping("bid-daily")
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
index 72e3369716..afcfe24d75 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateServiceImpl.java
@@ -2,12 +2,13 @@ package com.epmet.service.evaluationindex.indexcal.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
-import com.epmet.dto.extract.form.ExtractIndexFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.indexcal.CustomerSubInfoDTO;
 import com.epmet.dto.indexcal.IndexStatisticsFormDTO;
@@ -235,9 +236,11 @@ public class IndexCalculateServiceImpl implements IndexCalculateService {
                 CalculateCommonFormDTO extractFormDTO = new CalculateCommonFormDTO();
                 extractFormDTO.setCustomerId(customerId);
                 extractFormDTO.setMonthId(monthId);
-                this.indexCalculate(extractFormDTO);
+                long start = System.currentTimeMillis();
+                boolean calFlag=this.indexCalculate(extractFormDTO);
+                HttpClientManager.getInstance().sendAlarmMsg(EnvEnum.getCurrentEnv().getName() + "客户Id：" + formDTO.getCustomerId() + ";monthId：" + formDTO.getMonthId() + ",calculateAll全部指标计算完成,是否成功：" + calFlag + "，总耗时：" + (System.currentTimeMillis() - start) / 1000 + "秒");
             });
         });
-        return null;
+        return true;
     }
 }