新增 mongodb find 增加 allowDiskUse

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

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -171,16 +172,19 @@ public class IotYbqController extends BaseController {
      */
     @RequestMapping("/data/env/stat")
     public AjaxResult getEnvStatList(IotYbqdataReqVo reqVo) {
-        String devBizId = reqVo.getDevBid();
-        if (StringUtils.isEmpty(devBizId)) {
+        String devBid = reqVo.getDevBid();
+        if (StringUtils.isEmpty(devBid)) {
             throw new IotBizException(IotErrorCode.FAILURE.getCode(), "设备id不可为空");
         }
         String ybqType = reqVo.getDateDevType();
         if (StringUtils.isEmpty(ybqType)) {
             throw new IotBizException(IotErrorCode.FAILURE.getCode(), "数据类型不可为空");
         }
-        Map<String, Object> map = BeanUtil.beanToMap(reqVo);
+
         // 预测时间可能会被更新，所以用修改时间，创建时候这个值会默认有
+        Map<String, Object> map = new HashMap<>();
+        map.put("devBid", devBid);
+        map.put("dateDevType", ybqType);
         if (StringUtils.isNotEmpty(reqVo.getStartDate()) && StringUtils.isEmpty(reqVo.getEndDate())) {
             map.put("gte_ybqdataCreatedDate", reqVo.getStartDate());
         }
@@ -190,9 +194,7 @@ public class IotYbqController extends BaseController {
         if (StringUtils.isNotEmpty(reqVo.getStartDate()) && StringUtils.isNotEmpty(reqVo.getEndDate())) {
             map.put("time_ybqdataCreatedDate", reqVo.getStartDate() + "," + reqVo.getEndDate());
         }
-        map.remove("startDate");
-        map.remove("endDate");
-        return AjaxResult.success(mongoService.findAll(IotYbqEnvData.class, map, "ybqdataCreatedDate,asc"));
+        return AjaxResult.success(mongoService.findAll(IotYbqEnvData.class, map, "ybqdataCreatedDate"));
     }
 
     @GetMapping("/refresh/{devBid}")