修改风电健康状态指数分析全域筛选条件

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

@@ -41,6 +41,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.text.DecimalFormat;
 import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -75,12 +78,17 @@ public class TdInfoQueryController extends BaseController {
     @Autowired
     UserEmpowerMapper userEmpowerMapper;
 
+    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 = "分页查询健康指数信息 - 风电")
     @GatewayIdAutowired
     public ResponseModel<Page<FanHealthIndex>> getFanHealthIndexInfo(@RequestBody FanHealthIndexDto dto) throws ParseException {
 
+
         ReginParams reginParams = getSelectedOrgInfo();
         String userId = reginParams.getUserModel().getUserId();
         StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
@@ -89,14 +97,29 @@ public class TdInfoQueryController extends BaseController {
             orgCode = stdUserEmpower.getAmosOrgCode().get(0)+"%";
         }
         dto.setOrgCode(orgCode);
+
+        String time = "";
         if (CharSequenceUtil.isNotEmpty(dto.getStartDate())) {
+            Date d = new Date();
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按天")) {
+                time = hhmmss.format(d);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按小时")) {
+                time = mmss.format(d);
+            }
+            if(dto.getAnalysisType() != null && dto.getAnalysisType().equals("按10分钟")) {
+                time = ss.format(d);
+            }
+
             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;
             Date endDateDate = DateUtils.dateParse(endDate, DATE_TIME_PATTERN);
             String endDateString = DateUtils.dateFormat(DateUtils.dateAddHours(endDateDate, -8), DATE_TIME_PATTERN);
             dto.setEndDate(endDateString);