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

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -2,12 +2,15 @@ package com.yeejoin.equipmanage.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.dto.AnalysisReportLogDto;
 import com.yeejoin.equipmanage.common.utils.*;
 import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.fegin.IotFeign;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
+import com.yeejoin.equipmanage.service.IAnalysisReportLogService;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
 import com.yeejoin.equipmanage.service.IFireFightingSystemService;
 import io.swagger.annotations.Api;
@@ -58,6 +61,12 @@ public class ConfigureController extends AbstractBaseController {
     @Value("${equipment.pressurepump.stop}")
     private String pressurePumpStop;
 
+    @Value("${stationCode}")
+    private String stationCode;
+
+    @Autowired
+    IAnalysisReportLogService iAnalysisReportLogService;
+
     @PersonIdentify
     @RequestMapping(value = "/alarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -846,6 +855,57 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.iotWeekReport(bizOrgCode, startDate, endDate));
     }
+        /*
+        * 每天凌晨0点25分 对当前换流站历史数据进行处理
+        * */
+    @Scheduled(cron = "${jobs.day.cron.old}")
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/iotWeekReporOldData")
+    @ApiOperation(httpMethod = "GET", value = "物联报表 历史数据处理", notes = "物联报表 历史数据处理")
+    public ResponseModel iotWeekReportData(Page page) {
+        List<Integer> reportTypes = Arrays.asList(1, 2, 3);
+        reportTypes.forEach(reportType->{
+            AnalysisReportLogDto dto = new AnalysisReportLogDto();
+            dto.setReportType(reportType);
+            dto.setStationCode(stationCode);
+            IPage<AnalysisReportLogDto> analysisReportLogDtoIPage = iAnalysisReportLogService.iotReportPage(page, dto);
+            List<AnalysisReportLogDto> records = analysisReportLogDtoIPage.getRecords();
+            List<AnalysisReportLogDto> result = records.stream().filter(e -> StringUtils.isEmpty(e.getUrl())).collect(Collectors.toList());
+            if (!ValidationUtil.isEmpty(result)){
+                switch (reportType){
+                    case 0:
+                        result.forEach(e-> {
+                            try {
+                                iFireFightingSystemService.iotDayReport(stationCode, DateUtils.dateFormat(e.getStartDate(),null) ,DateUtils.dateFormat(e.getEndDate(),null) );
+                            } catch (ParseException parseException) {
+                                parseException.printStackTrace();
+                            }
+                        });
+                        break;
+                    case 1:
+                        result.forEach(e-> {
+                            try {
+                                iFireFightingSystemService.iotWeekReport(stationCode, DateUtils.dateFormat(e.getStartDate(),null) ,DateUtils.dateFormat(e.getEndDate(),null) );
+                            } catch (ParseException parseException) {
+                                parseException.printStackTrace();
+                            }
+                        });
+                        break;
+                    case 2:
+                        result.forEach(e-> {
+                            try {
+                                iFireFightingSystemService.iotMonthReport(stationCode, DateUtils.dateFormat(e.getStartDate(),null) ,DateUtils.dateFormat(e.getEndDate(),null) );
+                            } catch (ParseException parseException) {
+                                parseException.printStackTrace();
+                            }
+                        });
+                        break;
+                }
+            }
+        });
+        return CommonResponseUtil.success();
+    }
 
     @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -922,7 +922,7 @@ public class PointController extends AbstractBaseController {
 			String[] person = new String[personlist.size()];
 			if (CollectionUtils.isNotEmpty(personlist)){
 				for (int i = 0; i < personlist.size(); i++) {
-					person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("sequenceNbr")+"@"+personlist.get(i).get("parentName");
+					person[i] = personlist.get(i).get("bizOrgName")+"@"+personlist.get(i).get("amosOrgId")+"@"+personlist.get(i).get("parentName");
 				}
 				downData.add(person);
 			} else {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PointServiceImpl.java

@@ -219,8 +219,7 @@ public class PointServiceImpl implements IPointService {
             // 所在建筑
             if (!ObjectUtils.isEmpty(param.getAreaId())) {
                 String[] area = param.getAreaId().split("@");
-                point.setAreaId(Long.valueOf(area[1]));
-                point.setAreaName(area[0]);
+                point.setRiskSourceId(area[1]);
             }
             //point.setChargePersonId(param.getChargePersonId());
             // point.setDistance(param.getDistance() == null ? 0 :

amos-boot-system-equip/src/main/resources/application-dev.properties

@@ -64,6 +64,7 @@ spring.mqtt.completionTimeout=3000
 jobs.month.cron = 0 5 0 1 * ?
 jobs.day.cron = 0 5 0 * * ?
 jobs.week.cron = 0 5 0 ? * 1
+jobs.day.cron.old = 0 25 0 * * ?
 
 #数据同步开关
 systemctl.sync.switch=false

amos-boot-system-equip/src/main/resources/application.properties

@@ -125,4 +125,4 @@ fxkgtId=1522051112935387138
 management.security.enabled=true
 management.endpoint.health.show-details=always
 spring.security.user.name=admin
-spring.security.user.password=a1234560
+spring.security.user.password=a1234560stationCode=LSHLZ1bZAJU645Pgl7
\ No newline at end of file