新增 病害按时间搜索功能

src/main/java/com/yunfeiyun/agmp/iotm/device/ybq/controller/IotYbqController.java

@@ -3,8 +3,10 @@ package com.yunfeiyun.agmp.iotm.device.ybq.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
 import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.core.page.TableSupport;
+import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
@@ -120,20 +122,22 @@ public class IotYbqController extends BaseController {
         if (StringUtils.isEmpty(ybqType)) {
             throw new IotBizException(IotErrorCode.FAILURE.getCode(), "数据类型不可为空");
         }
+        String startDate = reqVo.getStartDate();
+        String endDate = reqVo.getEndDate();
         Map<String, Object> map = BeanUtil.beanToMap(reqVo);
         // 预测时间可能会被更新，所以用修改时间，创建时候这个值会默认有
-        if (StringUtils.isNotEmpty(reqVo.getStartDate()) && StringUtils.isEmpty(reqVo.getEndDate())) {
-            map.put("gte_ybqdataModifiedDate", reqVo.getStartDate());
-        }
-        if (StringUtils.isEmpty(reqVo.getStartDate()) && StringUtils.isNotEmpty(reqVo.getEndDate())) {
-            map.put("lte_ybqdataModifiedDate", reqVo.getEndDate());
-        }
-        if (StringUtils.isNotEmpty(reqVo.getStartDate()) && StringUtils.isNotEmpty(reqVo.getEndDate())) {
-            map.put("time_ybqdataModifiedDate", reqVo.getStartDate() + "," + reqVo.getEndDate());
+        if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
+            startDate = DateUtils.parseDateToStr("yyyyMMdd", DateUtils.parseDate(startDate));
+            endDate = DateUtils.parseDateToStr("yyyyMMdd", DateUtils.parseDate(endDate));
+            map.put("timeStr_computeDate", startDate + "," + endDate);
         }
         map.remove("startDate");
         map.remove("endDate");
-        return getDataTable(mongoService.findListPage(IotYbqPredictData.class, map, TableSupport.buildPageRequest()));
+
+        PageDomain queryRequest = TableSupport.buildPageRequest();
+        queryRequest.setOrderByColumn("computeDate desc,ybqdataCreatedDate desc");
+        queryRequest.setIsAsc("desc");
+        return getDataTable(mongoService.findListPage(IotYbqPredictData.class, map, queryRequest));
     }