新增 性诱测报2.0业务端对接

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/IIotPestrecogService.java

@@ -5,10 +5,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.pest.domain.*;
-import com.yunfeiyun.agmp.iotm.device.xycb.domain.IotXyinfoPestTotalDto;
 
 import java.util.List;
-import java.util.Map;
 
 public interface IIotPestrecogService {
     public IPage<IotPestrecogListResVo> selectIotPestrecogList(IotPestRecogPeriodReqVo reqVo, PageDomain pageDomain) throws JsonProcessingException;
@@ -21,13 +19,5 @@ public interface IIotPestrecogService {
 
     public List<IotPestrecogGroupPestListResVo> groupByPestList(IotDeviceDataListReqVo reqVo);
 
-    public List<IotXyinfoPestTotalDto> getIotXyinfoPestTotal(List<String> devBidList);
-
-    public List<IotXyinfoPestTotalDto> getIotXyIIIinfoPestTotal(List<String> devBidList);
-
-    public Map<String, IotXyinfoPestTotalDto> getIotXyinfoPestTotalMap(List<String> devBidList);
-
-    public Map<String, IotXyinfoPestTotalDto> getIotXyIIIinfoPestTotalMap(List<String> devBidList);
-
     public IotPestRecogPeriodInfoResVo period(IotPestRecogPeriodReqVo reqVo);
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotPestrecogServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.yunfeiyun.agmp.common.core.page.PageDomain;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
-import com.yunfeiyun.agmp.iot.common.domain.*;
+import com.yunfeiyun.agmp.iot.common.domain.IotCbdimg;
+import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
+import com.yunfeiyun.agmp.iot.common.domain.IotPest;
 import com.yunfeiyun.agmp.iot.common.domain.resvo.IoPestResVo;
 import com.yunfeiyun.agmp.iot.common.enums.EnumCbdMarkType;
 import com.yunfeiyun.agmp.iot.common.service.MongoService;
@@ -12,7 +14,6 @@ import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.pest.domain.*;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IIotPestService;
 import com.yunfeiyun.agmp.iotm.device.pest.service.IIotPestrecogService;
-import com.yunfeiyun.agmp.iotm.device.xycb.domain.IotXyinfoPestTotalDto;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -436,99 +437,6 @@ public class IotPestrecogServiceImpl implements IIotPestrecogService {
         return iotPestrecogGroupPestListResVoList;
     }
 
-
-    /**
-     * 获取性诱设备虫情识别总数
-     * @param devBidList
-     * @return
-     */
-    @Override
-    public List<IotXyinfoPestTotalDto> getIotXyinfoPestTotal(List<String> devBidList) {
-        Criteria criteria = new Criteria()
-                .and("devBid").in(devBidList);
-        MatchOperation matchOperation = Aggregation.match(criteria);
-
-        ProjectionOperation projectionOperation = Aggregation.project()
-                .and("devBid").as("devBid")
-                .andExpression("{$convert: {input: '$xycb2dataContent.ct', to: 'int', onError: 0, onNull: 0}}").as("ct");
-
-        GroupOperation groupOperation = Aggregation.group("devBid")
-                .sum("ct").as("pestTotal");
-
-        ProjectionOperation projectionOperation2 = Aggregation.project()
-                .and("_id").as("devBid")
-                .and("pestTotal").as("pestTotal");
-
-        Aggregation aggregation = Aggregation.newAggregation(
-                matchOperation,
-                projectionOperation,
-                groupOperation,
-                projectionOperation2
-        );
-
-        List<IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoList = mongoService.aggregate(
-                IotYfXycb2data.class, aggregation, IotXyinfoPestTotalDto.class
-        );
-
-        return iotXyinfoPestTotalDtoList;
-    }
-
-    /**
-     * 获取性诱设备虫情识别总数
-     * @param devBidList
-     * @return
-     */
-    @Override
-    public Map<String, IotXyinfoPestTotalDto> getIotXyinfoPestTotalMap(List<String> devBidList) {
-        List<IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoList = getIotXyinfoPestTotal(devBidList);
-        Map<String, IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoMap = new HashMap<>();
-        for(IotXyinfoPestTotalDto iotXyinfoPestTotalDto: iotXyinfoPestTotalDtoList){
-            iotXyinfoPestTotalDtoMap.put(iotXyinfoPestTotalDto.getDevBid(), iotXyinfoPestTotalDto);
-        }
-        return iotXyinfoPestTotalDtoMap;
-    }
-
-    @Override
-    public List<IotXyinfoPestTotalDto> getIotXyIIIinfoPestTotal(List<String> devBidList) {
-        Criteria criteria = new Criteria()
-                .and("devBid").in(devBidList);
-        MatchOperation matchOperation = Aggregation.match(criteria);
-
-        ProjectionOperation projectionOperation = Aggregation.project()
-                .and("devBid").as("devBid")
-                .andExpression("{$convert: {input: '$xycbdataContent.infr_ct', to: 'int', onError: 0, onNull: 0}}").as("ct");
-
-        GroupOperation groupOperation = Aggregation.group("devBid")
-                .sum("ct").as("pestTotal");
-
-        ProjectionOperation projectionOperation2 = Aggregation.project()
-                .and("_id").as("devBid")
-                .and("pestTotal").as("pestTotal");
-
-        Aggregation aggregation = Aggregation.newAggregation(
-                matchOperation,
-                projectionOperation,
-                groupOperation,
-                projectionOperation2
-        );
-
-        List<IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoList = mongoService.aggregate(
-                IotYfXycbIIIdata.class, aggregation, IotXyinfoPestTotalDto.class
-        );
-
-        return iotXyinfoPestTotalDtoList;
-    }
-
-    @Override
-    public Map<String, IotXyinfoPestTotalDto> getIotXyIIIinfoPestTotalMap(List<String> devBidList) {
-        List<IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoList = getIotXyIIIinfoPestTotal(devBidList);
-        Map<String, IotXyinfoPestTotalDto> iotXyinfoPestTotalDtoMap = new HashMap<>();
-        for(IotXyinfoPestTotalDto iotXyinfoPestTotalDto: iotXyinfoPestTotalDtoList){
-            iotXyinfoPestTotalDtoMap.put(iotXyinfoPestTotalDto.getDevBid(), iotXyinfoPestTotalDto);
-        }
-        return iotXyinfoPestTotalDtoMap;
-    }
-
     /**
      * @param reqVo
      */

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/domain/IotXycbInfoResVo.java

@@ -67,6 +67,12 @@ public class IotXycbInfoResVo {
     @Excel(name = "诱芯到期时间")
     private String xyinfoLureexpireddate;
 
+    /** 设备类型标识 */
+    private String devtypeBid;
+
+    /** 设备业务标识 */
+    private String devBid;
+
 
 
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/IIotXycbCommService.java

@@ -80,6 +80,9 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
             case IotDeviceDictConst.TYPE_YF_XYCB_III:
                 tableClass = IotYfXycbIIIdata.class;
                 break;
+            case IotDeviceDictConst.TYPE_YF_XYCB_2:
+                tableClass = IotYfXycb2data.class;
+                break;
             default:
                 break;
         }
@@ -101,7 +104,7 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "请输入正确的起止时间");
         }
 
-        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
         if (findDevice == null) {
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备不存在");
         }
@@ -155,6 +158,12 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
         if (StringUtils.isEmpty(devBid)) {
             throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备标识不能为空");
         }
+
+        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+        if (findDevice == null) {
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备不存在");
+        }
+
         String startDate = reqVo.getStartTime();
         String endDate = reqVo.getEndTime();
         String unit = "day";
@@ -177,7 +186,7 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
         ProjectionOperation projectionOperation = Aggregation.project()
                 .and("xycbdataContent.ah").as("ah")
                 .and("xycbdataContent.at").as("at")
-                .and("xycbdataContent.ct").as("ct")
+                .and("xycbdataContent.infr_ct").as("ct")
                 .and("xycbdataCreatedDate").as("createDate");
 
         ProjectionOperation projectionOperation2 = Aggregation.project()
@@ -206,9 +215,9 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
                 projectionOperation3,
                 sortOperation
         );
-
+        Class tableClass = getTableClass(findDevice.getDevtypeBid());
         List<IotXycbPolylineResVo> iotXycbPolylineResVos = mongoService.aggregate(
-                IotYfXycbIIIdata.class, aggregation, IotXycbPolylineResVo.class
+                tableClass, aggregation, IotXycbPolylineResVo.class
         );
         return iotXycbPolylineResVos;
     }
@@ -223,6 +232,13 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
         if (StringUtils.isEmpty(devBid)) {
             throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备标识不能为空");
         }
+        String startDate = reqVo.getStartTime();
+        String endDate = reqVo.getEndTime();
+
+        if(!(StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate))){
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "请输入正确的起止时间");
+        }
+
         IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
         if(iotDevice == null){
             throw new IotBizException(IotErrorCode.INVALID_DEVICE_ID.getCode(), "设备不存在");
@@ -230,6 +246,8 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
 
         IotXycbInfoResVo iotXycbInfoResVo = new IotXycbInfoResVo();
         iotXycbInfoResVo.setDevStatus(iotDevice.getDevStatus());
+        iotXycbInfoResVo.setDevBid(devBid);
+        iotXycbInfoResVo.setDevtypeBid(iotDevice.getDevtypeBid());
 
         IotXyinfoDto iotXyinfoDto = iIotXyinfoService.selectIotXyinfoByDevBid(devBid);
         if(iotXyinfoDto != null){
@@ -249,23 +267,47 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
             iotXycbInfoResVo.setRainStatusName(rainStatusName);
         }
 
-        HashMap<String, String> params = new HashMap<>();
-        params.put("devBid", devBid);
+        Criteria criteria = new Criteria()
+                .and("devBid").is(devBid)
+                .andOperator(
+                        Criteria.where("xycbdataCreatedDate").gte(startDate),
+                        Criteria.where("xycbdataCreatedDate").lte(endDate)
+                );
+        MatchOperation matchOperation = Aggregation.match(criteria);
+        SortOperation sortOperation = Aggregation.sort(Sort.Direction.DESC, "xycbdataCreatedDate");
 
-        Class tableClass = getTableClass(iotDevice.getDevtypeBid());
-        IotYfXycbdata iotYfXycbdata = (IotYfXycbdata) mongoService.findOne(tableClass, params, "xycbdataCreatedDate", "desc");
-        if(iotYfXycbdata != null){
-            JSONObject xyData = iotYfXycbdata.getXycbdataContent();
-            iotXycbInfoResVo.setAt(xyData.getString("at"));
-            iotXycbInfoResVo.setAh(xyData.getString("ah"));
-        }
+        ProjectionOperation projectionOperation = Aggregation.project()
+                .and("at").as("at")
+                .and("ah").as("ah")
+                .andExpression("{$convert: {input: '$xycbdataContent.infr_ct', to: 'int', onError: 0, onNull: 0}}").as("ct");
 
-        List<String> devBidList = new ArrayList<>();
-        devBidList.add(devBid);
+        GroupOperation groupOperation = Aggregation.group()
+                .first("at").as("at")
+                .first("ah").as("ah")
+                .sum("ct").as("pestTotal");
 
-        Map<String, IotXyinfoPestTotalDto>  iotXyinfoPestTotalDtoMap = iIotPestrecogService.getIotXyIIIinfoPestTotalMap(devBidList);
-        if(iotXyinfoPestTotalDtoMap.containsKey(devBid)){
-            iotXycbInfoResVo.setPestTotal(String.valueOf(iotXyinfoPestTotalDtoMap.get(devBid).getPestTotal()));
+        ProjectionOperation projectionOperation2 = Aggregation.project()
+                .and("at").as("at")
+                .and("ah").as("ah")
+                .and("pestTotal").as("pestTotal");
+
+        Class tableClass = getTableClass(iotDevice.getDevtypeBid());
+        Aggregation aggregation = Aggregation.newAggregation(
+                matchOperation,
+                sortOperation,
+                projectionOperation,
+                groupOperation,
+                projectionOperation2
+        );
+
+        List<IotXycbInfoResVo> iotXyinfoTotalResList = mongoService.aggregate(
+                tableClass, aggregation, IotXycbInfoResVo.class
+        );
+        if(!iotXyinfoTotalResList.isEmpty()){
+            IotXycbInfoResVo iotXyinfoTotalRes = iotXyinfoTotalResList.get(0);
+            iotXycbInfoResVo.setAt(iotXyinfoTotalRes.getAt());
+            iotXycbInfoResVo.setAh(iotXyinfoTotalRes.getAh());
+            iotXycbInfoResVo.setPestTotal(String.valueOf(iotXyinfoTotalRes.getPestTotal()));
         }
         return iotXycbInfoResVo;
     }
@@ -311,24 +353,13 @@ public class IIotXycbCommService extends IotDeviceBaseServiceImpl implements Iot
         HttpServletResponse response = iotDeviceExportReqVo.getResponse();
         IotDeviceDataListReqVo reqVo = iotDeviceExportReqVo.getReqVo();
 
-        String devBid = reqVo.getDevBid();
-        String startTime = reqVo.getStartTime();
-        String endTime = reqVo.getEndTime();
-        String[] params = {devBid, startTime, endTime};
-        for (String k : params) {
-            if (StringUtils.isEmpty(k)) {
-                throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "参数不能为空");
-            }
-        }
-
-        IotDevice iotDevice = iIotDeviceService.selectIotDeviceByDevBid(devBid);
-
-        //性诱III  数据导出
-        IotXycbReqVo reqVo1 = new IotXycbReqVo();
+        IotDeviceDataListReqVo reqVo1 = new IotDeviceDataListReqVo();
         reqVo1.setDevBid(reqVo.getDevBid());
-        reqVo1.setStartDate(reqVo.getStartTime());
-        reqVo1.setEndDate(reqVo.getEndTime());
-        List<IotYfXycbDataListRspVo> list = iIotXycbService.exportXYIIIDataList(reqVo1,iotDevice);
+        reqVo1.setStartTime(reqVo.getStartTime());
+        reqVo1.setEndTime(reqVo.getEndTime());
+
+        TableDataInfo tableDataInfo = dataList(reqVo1);
+        List<IotYfXycbDataListRspVo> list = (List<IotYfXycbDataListRspVo>) tableDataInfo.getData();
         ExcelUtil util = new ExcelUtil<>(IotYfXycbDataListRspVo.class);
         util.exportExcel(response, list, "设备数据");
     }

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/impl/IotXycb2ServiceImpl.java

@@ -0,0 +1,119 @@
+package com.yunfeiyun.agmp.iotm.device.xycb.service.impl;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+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.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.IotYfXycbdata;
+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.xycb.domain.IotXycbConfigEditReqVo;
+import com.yunfeiyun.agmp.iotm.device.xycb.domain.IotYfXycbDataListRspVo;
+import com.yunfeiyun.agmp.iotm.device.xycb.service.IIotXycbCommService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+@Slf4j
+@Service(value = ServiceNameConst.SERVICE_YF_XYCB_2)
+public class IotXycb2ServiceImpl extends IIotXycbCommService {
+
+    @Resource
+    private IIotDeviceconfigService iIotDeviceconfigService;
+
+    @Autowired
+    private IIotDeviceService iotDeviceService;
+
+    @Autowired
+    private MongoService mongoService;
+
+    @Override
+    public JSONObject configInfo(IotDeviceDataListReqVo reqVo){
+        throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(),"当前设备不支持此操作");
+    }
+
+    @Override
+    public String sendConfigCmd(IotXycbConfigEditReqVo reqVo) {
+        throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(),"当前设备不支持此操作");
+    }
+
+    @Override
+    public TableDataInfo dataList(IotDeviceDataListReqVo reqVo){
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(ErrorCode.SUCCESS.getCode());
+        rspData.setMsg(ErrorCode.SUCCESS.getMessage());
+        rspData.setData(new ArrayList<>());
+        rspData.setTotal(0);
+
+        String devBid = reqVo.getDevBid();
+        String startTime = reqVo.getStartTime();
+        String endTime = reqVo.getEndTime();
+
+        if (startTime == null || endTime == null) {
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "请输入正确的起止时间");
+        }
+
+        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+        if (findDevice == null) {
+            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备不存在");
+        }
+
+        Map<String, Object> cases = new HashMap<>();
+        cases.put("devBid", devBid);
+        cases.put("time_xycbdataCreatedDate", startTime +  "," + endTime);
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Class tableClass = getTableClass(findDevice.getDevtypeBid());
+        IPage listPage = mongoService.findListPage(tableClass, cases, pageDomain);
+
+        List<IotYfXycbdata> iotYfXycbdataList = listPage.getRecords();
+        List<IotYfXycbDataListRspVo> iotYfXycbDataListRspVoList = new ArrayList<>();
+        for(IotYfXycbdata xycbdata: iotYfXycbdataList){
+            JSONObject jsonObject = xycbdata.getXycbdataContent();
+            String cs = "0";
+            if(!Objects.equals(jsonObject.getInteger("b_c"), 0)){
+                cs = "1";
+            }
+            IotYfXycbDataListRspVo xycbDataListRspVo = new IotYfXycbDataListRspVo();
+            xycbDataListRspVo.setDevBid(devBid);
+            xycbDataListRspVo.setDs("1");
+            xycbDataListRspVo.setWs("1");
+            xycbDataListRspVo.setAt(jsonObject.getString("at"));
+            xycbDataListRspVo.setAh(jsonObject.getString("ah"));
+            xycbDataListRspVo.setBs("0");
+            xycbDataListRspVo.setCs(cs);
+            xycbDataListRspVo.setCv("0");
+            xycbDataListRspVo.setBv(jsonObject.getString("b_v"));
+            xycbDataListRspVo.setCt((String) jsonObject.getOrDefault("infr_ct", "0"));
+            xycbDataListRspVo.setCreatedDate(xycbdata.getXycbdataCreatedDate());
+
+            iotYfXycbDataListRspVoList.add(xycbDataListRspVo);
+        }
+        rspData.setData(iotYfXycbDataListRspVoList);
+        rspData.setTotal(listPage.getTotal());
+        return rspData;
+    }
+
+    /**
+     * 刷新指令集
+     *
+     * @param reqVo
+     */
+    @Override
+    public void refresh(DeviceRefreshDto reqVo) {
+        // 性诱2.0设备 不支持控制
+    }
+
+}

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/impl/IotXycbIIIServiceImpl.java

@@ -8,8 +8,10 @@ import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconfig;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.xycb.service.IIotXycbCommService;
+import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -21,6 +23,9 @@ public class IotXycbIIIServiceImpl extends IIotXycbCommService {
     @Resource
     private IIotDeviceconfigService iIotDeviceconfigService;
 
+    @Autowired
+    private IIotDeviceService iotDeviceService;
+
     @Override
     public JSONObject configInfo(IotDeviceDataListReqVo reqVo){
         String devBid = reqVo.getDevBid();
@@ -42,4 +47,40 @@ public class IotXycbIIIServiceImpl extends IIotXycbCommService {
         return JSONObject.parseObject(iotDeviceconfig.getDevcfgContext());
     }
 
+//    /**
+//     * 数据导出
+//     *
+//     * @param iotDeviceExportReqVo
+//     */
+//    @Override
+//    public void dataExport(IotDeviceExportReqVo iotDeviceExportReqVo) {
+//        HttpServletResponse response = iotDeviceExportReqVo.getResponse();
+//        IotDeviceDataListReqVo reqVo = iotDeviceExportReqVo.getReqVo();
+//
+//        String devBid = reqVo.getDevBid();
+//        String startTime = reqVo.getStartTime();
+//        String endTime = reqVo.getEndTime();
+//        String[] params = {devBid, startTime, endTime};
+//        for (String k : params) {
+//            if (StringUtils.isEmpty(k)) {
+//                throw new IotBizException(IotErrorCode.PARAM_INVALID.getCode(), "参数不能为空");
+//            }
+//        }
+//
+//        IotDevice findDevice = iotDeviceService.selectIotDeviceByDevBid(reqVo.getDevBid());
+//        if (findDevice == null) {
+//            throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "设备不存在");
+//        }
+//
+//        IotDeviceDataListReqVo reqVo1 = new IotDeviceDataListReqVo();
+//        reqVo1.setDevBid(reqVo.getDevBid());
+//        reqVo1.setStartTime(reqVo.getStartTime());
+//        reqVo1.setEndTime(reqVo.getEndTime());
+//
+//        TableDataInfo tableDataInfo = dataList(reqVo1);
+//        List<IotYfXycbDataListRspVo> list = (List<IotYfXycbDataListRspVo>) tableDataInfo.getData();
+//        ExcelUtil util = new ExcelUtil<>(IotYfXycbDataListRspVo.class);
+//        util.exportExcel(response, list, "设备数据");
+//    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/device/xycb/service/impl/IotXycbServiceImpl.java

@@ -243,11 +243,6 @@ public class IotXycbServiceImpl implements IIotXycbService {
 
         List<String> devBidList = new ArrayList<>();
         devBidList.add(devBid);
-
-        Map<String, IotXyinfoPestTotalDto>  iotXyinfoPestTotalDtoMap = iIotPestrecogService.getIotXyIIIinfoPestTotalMap(devBidList);
-        if(iotXyinfoPestTotalDtoMap.containsKey(devBid)){
-            iotXycbInfoResVo.setPestTotal(String.valueOf(iotXyinfoPestTotalDtoMap.get(devBid).getPestTotal()));
-        }
         return iotXycbInfoResVo;
     }
 //    private IotXycbInfoResVo getZjsfXycbInfo(String devBid, IotXycbInfoResVo iotXycbInfoResVo){

src/main/resources/application-dev.yml

@@ -163,7 +163,7 @@ spring:
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 2
     # 密码
     password: 123456
     # 连接超时时间