Merge remote-tracking branch 'origin/dev_import' into dev_import

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/DataAggregatorFeignClient.java → epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java

@@ -1,17 +1,17 @@
-package com.epmet.feign;
+package com.epmet.dataaggre.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.impl.DataAggregatorFeignClientClientFallBackFactory;
+import com.epmet.dataaggre.feign.impl.DataAggregatorOpenFeignClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallback = DataAggregatorFeignClientClientFallBackFactory.class)
+@FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory = DataAggregatorOpenFeignClientFallbackFactory.class)
-// @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallback= DataAggregatorFeignClientClientFallBackFactory.class,url = "localhost:8114")
+// @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory= DataAggregatorOpenFeignClientFallbackFactory.class,url = "localhost:8114")
-public interface DataAggregatorFeignClient {
+public interface DataAggregatorOpenFeignClient {
 
     /**
      * 定时任务导出网格活跃统计表

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/impl/DataAggregatorFeignClientClientFallBackFactory.java → epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java

@@ -1,16 +1,12 @@
-package com.epmet.feign.impl;
+package com.epmet.dataaggre.feign.impl;
-
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.DataAggregatorFeignClient;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
-import org.springframework.stereotype.Component;
-
-@Component
-public class DataAggregatorFeignClientClientFallBackFactory implements DataAggregatorFeignClient {
 
+public class DataAggregatorOpenFeignClientFallback implements DataAggregatorOpenFeignClient {
     /**
      * 定时任务导出网格活跃统计表
      * @param form

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallbackFactory.java

@@ -0,0 +1,17 @@
+package com.epmet.dataaggre.feign.impl;
+
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DataAggregatorOpenFeignClientFallbackFactory implements FallbackFactory<DataAggregatorOpenFeignClient> {
+    private DataAggregatorOpenFeignClientFallback fallback = new DataAggregatorOpenFeignClientFallback();
+
+    @Override
+    public DataAggregatorOpenFeignClient create(Throwable throwable) {
+        return null;
+    }
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -771,7 +771,7 @@ public class GovOrgServiceImpl implements GovOrgService {
 
             //小雷哥手机号：18660295251，
             OapiRobotSendRequest.At at = new OapiRobotSendRequest.At();
-            at.setAtMobiles(Arrays.asList("18660295251","15764229697"));
+            at.setAtMobiles(Arrays.asList("18660295251"));
             at.setIsAtAll(false);
             dingTalkTextMsg.setAt(at);
 
@@ -780,7 +780,7 @@ public class GovOrgServiceImpl implements GovOrgService {
             text.setContent("网格活跃度统计: \n" +
                     "起止时间: " + formDTO.getStartTime().concat(StrConstant.UNDER_LINE).concat(formDTO.getEndTime()) + "\n" +
                     "文件下载地址: " + uploadResult.getData().getUrl() + "\n"+
-                    "请查收@18660295251@15764229697");
+                    "请查收@18660295251");
             dingTalkTextMsg.setText(text);
             HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(dingTalkTextMsg), url, secret);
         }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/controller/DemoController.java

@@ -12,7 +12,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.DataAggregatorFeignClient;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -32,7 +32,7 @@ public class DemoController {
 	@Autowired
 	private DataStatisticalOpenFeignClient client;
 	@Autowired
-	private DataAggregatorFeignClient dataAggregatorFeignClient;
+	private DataAggregatorOpenFeignClient dataAggregatorFeignClient;
 
 	@GetMapping("testAlarm")
 	public void testAlarm() {

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ExportGridLiveResTask.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO;
-import com.epmet.feign.DataAggregatorFeignClient;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,7 +12,9 @@ import org.springframework.stereotype.Component;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
 
 
 /**
@@ -23,7 +25,7 @@ import java.util.*;
 public class ExportGridLiveResTask implements ITask {
 
     @Autowired
-    private DataAggregatorFeignClient dataAggregatorFeignClient;
+    private DataAggregatorOpenFeignClient dataAggregatorFeignClient;
 
     @Override
     public void run(String params) {

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -223,7 +223,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
@@ -237,7 +239,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(neighborHoodGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -256,7 +260,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -268,7 +274,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -309,7 +317,9 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -387,6 +397,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                     String s = neighborHoodService.orgGeneralImport(errorInfos, BuildingErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -270,7 +270,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             // 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
             if ((!buildingGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName()) && buildingGeneralDTO.getBuildingName().equals(dto.getBuildingName()))
@@ -286,7 +288,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(buildingGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -322,7 +326,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
-                throw new EpmetException("查询网格失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
             if ((!gridInfo.getGridName().equals(dto.getGridName()) && neighborHoodGeneralDTO.getNeighborHoodName().equals(dto.getNeighborHoodName())) ||
@@ -336,7 +342,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(neighborHoodGeneralDTO.getAgencyId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -355,7 +363,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -367,7 +377,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -408,7 +420,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -541,6 +555,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     String s = neighborHoodService.orgGeneralImport(errorInfos, HouseErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -207,7 +207,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
         gridName = null == gridName ? icBuildingDao.selectGridNameById(formDTO.getOrgId()) : gridName;
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
-            throw new EpmetException("查询网格失败...");
+            nums.add(num);
+            disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+            return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
         if (dto.getGridName().compareTo(gridName) != 0 || (!dto.getAgencyName().equals(gridInfo.getAgencyName()) && dto.getGridName().equals(gridName))){
@@ -219,7 +221,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             dto.setAgencyId(gridInfo.getPid());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -259,7 +263,9 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             dto.setAgencyId(formDTO.getOrgId());
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
-                throw new EpmetException("查询组织信息失败...");
+                nums.add(num);
+                disposeErrorMsg(info,ImportErrorMsgConstants.NEIGHBOR_HOOD_ERROR);
+                return;
             }
             dto.setPid(agencyInfo.getPid());
             dto.setPids(agencyInfo.getPids());
@@ -343,6 +349,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                     String s = neighborHoodService.orgGeneralImport(errorInfos, NeighborHoodErrorInfoModel.class);
                     input.setResultDescFilePath(s);
                 } catch (IOException e) {
+                    epmetCommonServiceOpenFeignClient.finishImportTask(input);
                     e.printStackTrace();
                 }
             }