Merge branch 'develop' of com_yunfei_saas/agmp_iotm into master

src/main/java/com/yunfeiyun/agmp/iotm/device/bzy/controller/IotDeviceBzyController.java

@@ -202,8 +202,11 @@ public class IotDeviceBzyController extends BaseController {
         if(iotDevice == null){
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(),"设备不存在");
         }
+        JSONObject jsonObject = new JSONObject();
         IotDeviceconfig iotDeviceconfig = iIotDeviceconfigService.selectIotDeviceConfigByDevBid(devBid);
-        JSONObject jsonObject = JSONObject.parseObject(iotDeviceconfig.getDevcfgContext());
+        if(iotDeviceconfig != null){
+            jsonObject = JSONObject.parseObject(iotDeviceconfig.getDevcfgContext());
+        }
         return AjaxResult.success(jsonObject);
     }
 

src/main/java/com/yunfeiyun/agmp/iotm/device/common/domin/IotDeviceDataListReqVo.java

@@ -51,6 +51,6 @@ public class IotDeviceDataListReqVo
     /**
      * 是否不分页
      */
-    private boolean isNotPage;
+    private Boolean isNotPage;
 
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/controller/IotDeviceCbdController.java

@@ -176,6 +176,9 @@ public class IotDeviceCbdController extends BaseController {
         devBidList.add(devInfo.getDevBid());
         Map<String, Long> imgCountMap = getImgCountMap(devBidList);
         devInfo.setImgCount(imgCountMap.getOrDefault(devBid, 0L));
+        if(!"1".equals(devInfo.getDevRecogtype())){
+            devInfo.setDevRecogtype("0");
+        }
         return success(devInfo);
     }
 

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/controller/IotDeviceQxzController.java

@@ -203,7 +203,7 @@ public class IotDeviceQxzController extends BaseController {
         iotDeviceDataListReqVo.setDevBid(devBid);
         iotDeviceDataListReqVo.setStartTime(startTime);
         iotDeviceDataListReqVo.setEndTime(endTime);
-        iotDeviceDataListReqVo.setNotPage(true);
+        iotDeviceDataListReqVo.setIsNotPage(true);
 
         IotDeviceBaseFunReqVo iotDeviceBaseFunReqVo = new IotDeviceBaseFunReqVo();
         iotDeviceBaseFunReqVo.setDevBid(reqVo.getDevBid());

src/main/java/com/yunfeiyun/agmp/iotm/device/qxsqz/service/IIotQxzCommService.java

@@ -89,7 +89,7 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         rspData.setMsg(ErrorCode.SUCCESS.getMessage());
         rspData.setData(new ArrayList<>());
         rspData.setTotal(0);
-        boolean isNotPage = reqVo.isNotPage();
+        Boolean isNotPage = reqVo.getIsNotPage();
 
         IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
 
@@ -134,7 +134,7 @@ public class IIotQxzCommService extends IotDeviceBaseServiceImpl implements IotD
         }
         long total = 0;
         List<QxzDataListDto> qxzDataListDtoList = new ArrayList<>();
-        if(isNotPage) {
+        if(isNotPage != null && isNotPage) {
             List<QxzDataListDto> dtoList = mongoService.aggregate(tableClass, aggregation, QxzDataListDto.class);
             if(dtoList != null){
                 total = dtoList.size();

src/main/java/com/yunfeiyun/agmp/iotm/device/ybq/serviceImp/IotYbqEnvDataServiceImpl.java

@@ -1,23 +1,22 @@
 package com.yunfeiyun.agmp.iotm.device.ybq.serviceImp;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.common.framework.manager.RedisCacheManager;
 import com.yunfeiyun.agmp.common.utils.JSONUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.common.utils.uuid.IdUtils;
+import com.yunfeiyun.agmp.iot.common.constant.IotErrorCode;
 import com.yunfeiyun.agmp.iot.common.constant.devicetype.ServiceNameConst;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
-import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevicelasteddata;
 import com.yunfeiyun.agmp.iot.common.domain.IotYbqEnvData;
-import com.yunfeiyun.agmp.iot.common.model.cmd.CmdGroupModel;
+import com.yunfeiyun.agmp.iot.common.enums.ybq.YbqTypeConst;
+import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
 import com.yunfeiyun.agmp.iotm.device.common.domin.DeviceRefreshDto;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.impl.IotDeviceBaseServiceImpl;
 import com.yunfeiyun.agmp.iotm.device.ybq.service.IotYbqEnvDataService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -44,6 +43,9 @@ public class IotYbqEnvDataServiceImpl extends IotDeviceBaseServiceImpl implement
     @Autowired
     private RedisCacheManager redisCacheManager;
 
+    @Autowired
+    private IIotDeviceService iotDeviceService;
+
 
     @Override
     public void insertData(IotYbqEnvData iotYbqEnvData) {
@@ -58,7 +60,19 @@ public class IotYbqEnvDataServiceImpl extends IotDeviceBaseServiceImpl implement
     @Override
     public List<IotYbqEnvData> selectIotYbqEnvDataList(IotDeviceDataListReqVo reqVo) {
 
-        Map<String, Object> map = BeanUtil.beanToMap(reqVo);
+        String devBid = reqVo.getDevBid();
+        IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
+        if(iotDevice == null) {
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
+        }
+        YbqTypeConst ybqTypeConst = YbqTypeConst.getByServiceName(iotDevice.getDevtypeBid());
+        if(ybqTypeConst == null){
+            throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备类型不匹配");
+        }
+        String ybqType = ybqTypeConst.getCode();
+        Map<String, Object> map = new HashMap<>();
+        map.put("devBid", devBid);
+        map.put("dateDevType", ybqType);
         if (StringUtils.isNotEmpty(reqVo.getStartTime()) && StringUtils.isEmpty(reqVo.getEndTime())) {
             map.put("gte_ybqdataCreatedDate", reqVo.getStartTime());
         }
@@ -68,8 +82,6 @@ public class IotYbqEnvDataServiceImpl extends IotDeviceBaseServiceImpl implement
         if (StringUtils.isNotEmpty(reqVo.getStartTime()) && StringUtils.isNotEmpty(reqVo.getEndTime())) {
             map.put("time_ybqdataCreatedDate", reqVo.getStartTime() + "," + reqVo.getEndTime());
         }
-        map.remove("startTime");
-        map.remove("endTime");
         List<IotYbqEnvData> iotYbqEnvDataResVos = mongoService.findAll(IotYbqEnvData.class, map, "ybqdataCreatedDate desc");
         return iotYbqEnvDataResVos;
     }