修改健康状态指数分析

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

@@ -78,10 +78,12 @@ public class TdInfoQueryController extends BaseController {
     @Autowired
     UserEmpowerMapper userEmpowerMapper;
 
-    private SimpleDateFormat hhmmss = new SimpleDateFormat("HH:mm:ss");
+    private  SimpleDateFormat hhmmss = new SimpleDateFormat("HH:mm:ss");
     private SimpleDateFormat mmss = new SimpleDateFormat("mm:ss");
     private SimpleDateFormat ss = new SimpleDateFormat("ss");
 
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/getFanHealthIndexInfo")
     @ApiOperation(httpMethod = "POST", value = "分页查询健康指数信息 - 风电", notes = "分页查询健康指数信息 - 风电")
@@ -98,28 +100,36 @@ public class TdInfoQueryController extends BaseController {
         }
         dto.setOrgCode(orgCode);
 
-        String time = "";
+        Date currentDate = new Date();
         if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
-            Date d = new Date();
-            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天")) {
-                time = hhmmss.format(d);
+            String startDate = dto.getStartDate();
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
+                startDate = startDate + " " + hhmmss.format(currentDate);
             }
-            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时")) {
-                time = mmss.format(d);
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
+                startDate = startDate + ":" + mmss.format(currentDate);
             }
-            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟")) {
-                time = ss.format(d);
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
+                startDate = startDate + ":" +  ss.format(currentDate);
             }
 
-            String startDate = dto.getStartDate();
-            startDate = dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") ? startDate + " " + time : startDate + ":" + time;
             Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
             String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
             dto.setStartDate(startDateString);
         }
         if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
             String endDate = dto.getEndDate();
-            endDate = dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") ? endDate + " " + time : endDate + ":" + time;
+
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
+                endDate = endDate + " " + hhmmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
+                endDate = endDate + ":" + mmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
+                endDate = endDate + ":" +  ss.format(currentDate);
+            }
+
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
             String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
             dto.setEndDate(endDateString);
@@ -188,14 +198,39 @@ public class TdInfoQueryController extends BaseController {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
         }
         dto.setOrgCode(orgCode);
+
+        Date currentDate = new Date();
         if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
             String startDate = dto.getStartDate();
+
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && startDate.length() == 10) {
+                startDate = startDate + " " + hhmmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && startDate.length() == 13) {
+                startDate = startDate + ":" + mmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && startDate.length() == 16) {
+                startDate = startDate + ":" +  ss.format(currentDate);
+            }
+
+
             Date date = DateUtils.dateParse(startDate, DATE_TIME_PATTERN);
             String startDateString = DateUtils.dateFormat(DateUtils.dateAddHours(date, -8), DATE_TIME_PATTERN);
             dto.setStartDate(startDateString);
         }
         if (CharSequenceUtil.isNotEmpty(dto.getEndDate())) {
             String endDate = dto.getEndDate();
+
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天") && endDate.length() == 10) {
+                endDate = endDate + " " + hhmmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时") && endDate.length() == 13) {
+                endDate = endDate + ":" + mmss.format(currentDate);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟") && endDate.length() == 16) {
+                endDate = endDate + ":" +  ss.format(currentDate);
+            }
+
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
             String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
             dto.setEndDate(endDateString);