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

amos-boot-data/amos-boot-data-alarm/src/main/java/com/yeejoin/amos/api/alarm/entity/EquipmentSpecificIndex.java

@@ -50,7 +50,7 @@ public class EquipmentSpecificIndex {
 	private String emergencyLevelColor;
 
 	@TableField("is_alarm")
-	private boolean isAlarm;
+	private Double isAlarm;
 	
 	@TableField("emergency_level")
 	private String emergencyLevel;

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

@@ -104,13 +104,13 @@ public class TdInfoQueryController extends BaseController {
         if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
             String startDate = dto.getStartDate();
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
-                startDate = startDate + " " + hhmmss.format(currentDate);
+                startDate = startDate + " 00:00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
-                startDate = startDate + ":" + mmss.format(currentDate);
+                startDate = startDate + ":00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
-                startDate = startDate + ":" +  ss.format(currentDate);
+                startDate = startDate + ":00";
             }
 
             Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
@@ -121,13 +121,13 @@ public class TdInfoQueryController extends BaseController {
             String endDate = dto.getEndDate();
 
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
-                endDate = endDate + " " + hhmmss.format(currentDate);
+                endDate = endDate + " 00:00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
-                endDate = endDate + ":" + mmss.format(currentDate);
+                endDate = endDate + ":00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
-                endDate = endDate + ":" +  ss.format(currentDate);
+                endDate = endDate + ":00";
             }
 
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
@@ -204,13 +204,13 @@ public class TdInfoQueryController extends BaseController {
             String startDate = dto.getStartDate();
 
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
-                startDate = startDate + " " + hhmmss.format(currentDate);
+                startDate = startDate + " 00:00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
-                startDate = startDate + ":" + mmss.format(currentDate);
+                startDate = startDate + ":00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
-                startDate = startDate + ":" +  ss.format(currentDate);
+                startDate = startDate + ":00";
             }
 
 
@@ -222,13 +222,13 @@ public class TdInfoQueryController extends BaseController {
             String endDate = dto.getEndDate();
 
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
-                endDate = endDate + " " + hhmmss.format(currentDate);
+                endDate = endDate + " 00:00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
-                endDate = endDate + ":" + mmss.format(currentDate);
+                endDate = endDate + ":00:00";
             }
             if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
-                endDate = endDate + ":" +  ss.format(currentDate);
+                endDate = endDate + ":00";
             }
 
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
@@ -288,13 +288,13 @@ public class TdInfoQueryController extends BaseController {
             String startDate = dto.getStartDate();
 
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按天") && startDate.length() == 10) {
-                startDate = startDate + " " + hhmmss.format(currentDate);
+                startDate = startDate + " 00:00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按小时") && startDate.length() == 13) {
-                startDate = startDate + ":" + mmss.format(currentDate);
+                startDate = startDate + ":00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按10分钟") && startDate.length() == 16) {
-                startDate = startDate + ":" +  ss.format(currentDate);
+                startDate = startDate + ":00";
             }
 
 
@@ -306,13 +306,13 @@ public class TdInfoQueryController extends BaseController {
             String endDate = dto.getEndDate();
 
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按天") && endDate.length() == 10) {
-                endDate = endDate + " " + hhmmss.format(currentDate);
+                endDate = endDate + " 00:00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按小时") && endDate.length() == 13) {
-                endDate = endDate + ":" + mmss.format(currentDate);
+                endDate = endDate + ":00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按10分钟") && endDate.length() == 16) {
-                endDate = endDate + ":" +  ss.format(currentDate);
+                endDate = endDate + ":00";
             }
 
 
@@ -372,13 +372,13 @@ public class TdInfoQueryController extends BaseController {
             String startDate = dto.getStartDate();
 
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按天") && startDate.length() == 10) {
-                startDate = startDate + " " + hhmmss.format(currentDate);
+                startDate = startDate + " 00:00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按小时") && startDate.length() == 13) {
-                startDate = startDate + ":" + mmss.format(currentDate);
+                startDate = startDate + ":00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按10分钟") && startDate.length() == 16) {
-                startDate = startDate + ":" +  ss.format(currentDate);
+                startDate = startDate + ":00";
             }
 
             Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
@@ -389,13 +389,13 @@ public class TdInfoQueryController extends BaseController {
             String endDate = dto.getEndDate();
 
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按天") && endDate.length() == 10) {
-                endDate = endDate + " " + hhmmss.format(currentDate);
+                endDate = endDate + " 00:00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按小时") && endDate.length() == 13) {
-                endDate = endDate + ":" + mmss.format(currentDate);
+                endDate = endDate + ":00:00";
             }
             if(dto.getWarningPeriod() != null && dto.getWarningPeriod().equals("按10分钟") && endDate.length() == 16) {
-                endDate = endDate + ":" +  ss.format(currentDate);
+                endDate = endDate + ":00";
             }
 
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);

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

@@ -162,7 +162,7 @@ public class PvHealthIndexServiceImpl implements IPvHealthIndexService {
                                                         String analysisObjectType) {
         List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.getInfoList(startTime, tableName, analysisObjectType);
         QueryWrapper<IdxBizPvWeight> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", "3");
+        queryWrapper.eq("type", "4");
         queryWrapper.isNotNull("value");
         List<IdxBizPvWeight> idxBizFanWeights = idxBizPvWeightMapper.selectList(queryWrapper);
         Map<String, Float> weightMap = idxBizFanWeights.stream().collect(Collectors.toMap(o -> o.getArae() + o.getStation() + o.getEquipmentName() + o.getSubarray(), IdxBizPvWeight::getValue));
@@ -215,7 +215,7 @@ public class PvHealthIndexServiceImpl implements IPvHealthIndexService {
                                                         String analysisObjectType) {
         List<PvHealthIndex> pvHealthIndices = pvHealthIndexMapper.getInfoList(startTime, tableName, analysisObjectType);
         QueryWrapper<IdxBizPvWeight> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("type", "4");
+        queryWrapper.eq("type", "3");
         queryWrapper.isNotNull("value");
         List<IdxBizPvWeight> idxBizFanWeights = idxBizPvWeightMapper.selectList(queryWrapper);
         Map<String, Float> weightMap = idxBizFanWeights.stream().collect(Collectors.toMap(o -> o.getArae() + o.getStation() + o.getEquipmentName(), IdxBizPvWeight::getValue));