分析诊断代码调整

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/AnalyseController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -11,6 +13,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,37 +32,73 @@ public class AnalyseController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-风机", notes = "工况测点区间划分-风机")
     @GetMapping(value = "/getFanConditionVariablesByTime")
-    public ResponseModel<String> getFanConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getFanConditionVariablesByTime(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
         return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "工况测点区间划分-光伏", notes = "工况测点区间划分-光伏")
     @GetMapping(value = "/getPvConditionVariablesByTime")
-    public ResponseModel<String> getPvConditionVariablesByTime(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getPvConditionVariablesByTime(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+       if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+           Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+           Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+           startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+           endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+       }
         return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
     @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse")
-    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
         return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyseThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "相关性分析-风机", notes = "相关性分析-风机")
     @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse")
-    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
         return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyseThread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "中心值计算-风机", notes = "中心值计算-风机")
     @GetMapping(value = "/getFanConditionVariablesByTimeAnalyse1")
-    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getFanConditionVariablesByTimeAnalyse1(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
         return ResponseHelper.buildResponse(commonServiceImpl.getFanConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "中心值计算-光伏", notes = "中心值计算-光伏")
     @GetMapping(value = "/getPvConditionVariablesByTimeAnalyse1")
-    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse1(@RequestParam String startTime, @RequestParam String endTime) {
+    public ResponseModel<String> getPvConditionVariablesByTimeAnalyse1(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime) {
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
         return ResponseHelper.buildResponse(commonServiceImpl.getPvConditionVariablesByTimeAnalyse1Thread(startTime, endTime));
     }
 
@@ -67,6 +106,12 @@ public class AnalyseController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取influxdb数据", notes = "获取influxdb数据")
     @GetMapping(value = "/getInfluxdbDataByConditon")
     public ResponseModel<Map<String, Object>> getInfluxdbDataByConditon(@RequestParam String stationType, @RequestParam String pointId, @RequestParam String startTime, @RequestParam String endTime) {
-       return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType,pointId,startTime, endTime)) ;
+        if (StringUtils.isEmpty(startTime) && StringUtils.isEmpty(endTime) ){
+            Date currentDayStartTime = DateUtils.getCurrentDayStartTime(new Date());
+            Date currentDayEndTime = DateUtils.getCurrentDayEndTime(new Date());
+            startTime = DateUtils.convertDateToString(currentDayStartTime, DateUtils.DATE_TIME_PATTERN);
+            endTime = DateUtils.convertDateToString(currentDayEndTime, DateUtils.DATE_TIME_PATTERN);
+        }
+        return ResponseHelper.buildResponse(commonServiceImpl.getInfluxdbDataByConditon(stationType,pointId,startTime, endTime)) ;
     }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TestController.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jxiop.biz.entity.IndicatorData;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.jxiop.biz.tdmapper.IndicatorDataMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,6 +23,8 @@ import java.util.List;
 public class TestController extends BaseController {
     @Autowired
     IndicatorDataMapper indicatorDataMapper;
+    @Autowired
+    CommonServiceImpl commonService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "test1", notes = "test1")
@@ -32,4 +35,17 @@ public class TestController extends BaseController {
 
         return indicatorData;
     }
+
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "test2", notes = "test1")
+    @GetMapping("/test2")
+    public void test2 () {
+
+        commonService.healthWarningMinuteByFJ();
+
+
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java

@@ -976,7 +976,7 @@ public class CommonServiceImpl {
     }
 
     @Scheduled(cron = "0 0/10 * * * ?")
-    private void healthWarningMinuteByFJ() {
+    public  void healthWarningMinuteByFJ() {
         Date time = new Date();
         List<IdxBizFanPointProcessVariableClassificationDto> data = idxBizFanPointProcessVariableClassificationMapper.getInfluxDBData();
         Map<String, List<IdxBizFanPointProcessVariableClassificationDto>> maps = data.stream().collect(Collectors.groupingBy(IdxBizFanPointProcessVariableClassificationDto::getGatewayId));
@@ -1028,16 +1028,16 @@ public class CommonServiceImpl {
             double value4 = 0.00;
             for (IdxBizFanPointProcessVariableClassificationDto datum : data) {
                 if (idxBizUhef.getProcessPoint1Id().equals(datum.getSequenceNbr())) {
-                    value1 = datum.getCurrentValue();
+                    value1 = datum.getCurrentValue() == null?0.0: datum.getCurrentValue();
                 }
                 if (idxBizUhef.getProcessPoint2Id().equals(datum.getSequenceNbr())) {
-                    value2 = datum.getCurrentValue();
+                    value2 = datum.getCurrentValue() == null?0.0: datum.getCurrentValue();
                 }
                 if (idxBizUhef.getProcessPoint3Id().equals(datum.getSequenceNbr())) {
-                    value3 = datum.getCurrentValue();
+                    value3 = datum.getCurrentValue() == null?0.0: datum.getCurrentValue();
                 }
                 if (idxBizUhef.getAnalysisPointId().equals(datum.getSequenceNbr())) {
-                    value4 = datum.getCurrentValue();
+                    value4 = datum.getCurrentValue() == null?0.0: datum.getCurrentValue();
                 }
             }
             Map<String, Object> map = new HashMap<>();
@@ -1057,8 +1057,8 @@ public class CommonServiceImpl {
             String response = HttpUtil.createPost(baseUrl + jkzsjsfjurl).body(JSON.toJSONString(realParams)).execute().body();
             JSONObject result = JSON.parseObject(response).getJSONObject("result");
             if (null != result) {
-                JSONObject jsonObject = result.getJSONObject("result1").getJSONObject("rows");
-                List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(jsonObject), JSONObject.class);
+                JSONObject jsonObject = result.getJSONObject("result1");
+                List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(jsonObject.getJSONArray("rows")), JSONObject.class);
                 List<String> ids = new ArrayList<>();
                 jsonObjects.stream().forEach(e -> ids.add(e.getString("analysisVariableId")));
 
@@ -1070,7 +1070,7 @@ public class CommonServiceImpl {
                     for (JSONObject object : jsonObjects) {
                         if (obj.getSequenceNbr().equals(object.getString("analysisVariableId"))) {
                             IdxBizFanHealthIndex idxBizFanHealthIndex = new IdxBizFanHealthIndex();
-                            BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
+                            BeanUtils.copyProperties(obj,idxBizFanHealthIndex );
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
                             idxBizFanHealthIndex.setRecDate(time);
@@ -1102,7 +1102,7 @@ public class CommonServiceImpl {
         }
     }
 
-  //  @Scheduled(cron = "0 */3 * * * ?")
+    @Scheduled(cron = "0 0/10 * * * ?")
     private void healthWarningMinuteByGF() {
         Date time = new Date();
         List<IdxBizPvPointProcessVariableClassificationDto> data = idxBizPvPointProcessVariableClassificationMapper.getInfluxDBData();
@@ -1183,8 +1183,8 @@ public class CommonServiceImpl {
             String response = HttpUtil.createPost(baseUrl + jkzsgfurl).body(JSON.toJSONString(realParams)).execute().body();
             JSONObject result = JSON.parseObject(response).getJSONObject("result");
             if (null != result) {
-                JSONObject jsonObject = result.getJSONObject("result1").getJSONObject("rows");
-                List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(jsonObject), JSONObject.class);
+                JSONObject jsonObject = result.getJSONObject("result1");
+                List<JSONObject> jsonObjects = JSON.parseArray(JSON.toJSONString(jsonObject.getJSONArray("rows")), JSONObject.class);
                 List<String> ids = new ArrayList<>();
                 jsonObjects.stream().forEach(e -> ids.add(e.getString("analysisVariableId")));
 
@@ -1196,7 +1196,7 @@ public class CommonServiceImpl {
                     for (JSONObject object : jsonObjects) {
                         if (obj.getSequenceNbr().equals(object.getString("analysisVariableId"))) {
                             IdxBizPvHealthIndex idxBizFanHealthIndex = new IdxBizPvHealthIndex();
-                            BeanUtils.copyProperties(idxBizFanHealthIndex, obj);
+                            BeanUtils.copyProperties(obj,idxBizFanHealthIndex );
                             idxBizFanHealthIndex.setHealthIndex(object.getDouble("indexValue"));
                             idxBizFanHealthIndex.setAnalysisObjSeq(obj.getSequenceNbr());
                             idxBizFanHealthIndex.setRecDate(time);