新增 获取云飞墒情站历史数据接口

src/main/java/com/yunfeiyun/agmp/iotm/device/qxz/service/impl/IotYfQxzServiceImpl.java

@@ -50,14 +50,14 @@ public class IotYfQxzServiceImpl extends IotDeviceBaseServiceImpl implements Iot
     private RedisCacheManager redisCacheManager;
 
     public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo) throws ParseException {
-        return dataList(reqVo, true);
+        return dataList(reqVo, true, false);
     }
 
     /**
      * 获取数据列表接口
      * @param reqVo
      */
-    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo, boolean isNow) throws ParseException {
+    public TableDataInfo dataList(IotDeviceQxzDataListReqVo reqVo, boolean isNow, boolean isDisable) throws ParseException {
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(ErrorCode.SUCCESS.getCode());
         rspData.setMsg(ErrorCode.SUCCESS.getMessage());
@@ -112,7 +112,7 @@ public class IotYfQxzServiceImpl extends IotDeviceBaseServiceImpl implements Iot
         List<List<IotQxzDataListRseVo>> rest = new ArrayList<>();
         for(QxzDataListDto item: qxzDataListDtoIPage.getRecords()){
             List<QxzDataDto> dataList = item.getDataList();
-            List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, false);
+            List<IotQxzDataListRseVo> iotQxzDataListRseVoList = ElementFactorUtil.qxzListProcessData(dataList, factorList, findDevice, isDisable);
             rest.add(iotQxzDataListRseVoList);
         }
         rspData.setData(rest);
@@ -307,7 +307,7 @@ public class IotYfQxzServiceImpl extends IotDeviceBaseServiceImpl implements Iot
         String devBid = reqVo.getDevBid();
 
         IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
-        TableDataInfo tableDataInfo = dataList(reqVo, false);
+        TableDataInfo tableDataInfo = dataList(reqVo, false, true);
         List<List<IotQxzDataListRseVo>> rest = (List<List<IotQxzDataListRseVo>>) tableDataInfo.getData();
         if(rest == null || rest.isEmpty()){
             log.info("devBid:{},【最近数据】empty",devBid);