新增 获取测报灯识别图片列表接口

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotScreenController.java

@@ -15,6 +15,7 @@ import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorAddressGetReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorCaptureReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorPtzReqVo;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotPestRecogPeriodReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotHomeDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotScreenStatReqVo;
@@ -242,4 +243,23 @@ public class IotScreenController extends BaseController {
         return success(iIotScreenService.cbdDataLatest(devBid));
     }
 
+    /**
+     * 获取测报灯图片列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:cbdimg:list')")
+    @GetMapping("/device/cbd/img/list")
+    public TableDataInfo cbdImgList(IotPestRecogPeriodReqVo reqVo) {
+        return getDataTable(iIotScreenService.cbdImgList(reqVo));
+    }
+
+
+    /**
+     * 获取测报灯识别图片列表
+     */
+    @PreAuthorize("@ss.hasPermi('iot:cbdimg:list')")
+    @GetMapping("/device/cbd/recog/img/list")
+    public TableDataInfo cbdRecogImgList(IotPestRecogPeriodReqVo reqVo) {
+        return getDataTable(iIotScreenService.cbdRecogImgList(reqVo));
+    }
+
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotScreenService.java

@@ -10,6 +10,7 @@ import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceDataListReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorAddressGetReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorCaptureReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorPtzReqVo;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotPestRecogPeriodReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotHomeDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotScreenStatReqVo;
@@ -90,4 +91,18 @@ public interface IIotScreenService {
      * @return
      */
     public JSONObject cbdDataLatest(String devBid);
+
+    /**
+     * 获取测报灯图片列表
+     * @param reqVo
+     * @return
+     */
+    public IPage cbdImgList(IotPestRecogPeriodReqVo reqVo);
+
+    /**
+     * 获取测报灯识别图片列表
+     * @param reqVo
+     * @return
+     */
+    public IPage cbdRecogImgList(IotPestRecogPeriodReqVo reqVo);
 }

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotScreenServiceImpl.java

@@ -25,6 +25,10 @@ import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorAddressGetReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorCaptureReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.domin.IotMonitorPtzReqVo;
 import com.yunfeiyun.agmp.iotm.device.monitor.service.IotMonitorService;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotCbdimgListResVo;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotPestRecogPeriodReqVo;
+import com.yunfeiyun.agmp.iotm.device.pest.domain.IotPestrecogListResVo;
+import com.yunfeiyun.agmp.iotm.device.pest.service.IIotPestrecogService;
 import com.yunfeiyun.agmp.iotm.device.ybq.domain.IotYbqPredictIntoDto;
 import com.yunfeiyun.agmp.iotm.util.ValidateUtil;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
@@ -33,6 +37,7 @@ import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotScreenStatReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotWarnlogReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.*;
 import com.yunfeiyun.agmp.iotm.web.service.*;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
@@ -43,6 +48,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
+@Slf4j
 @Service
 public class IotScreenServiceImpl implements IIotScreenService {
 
@@ -67,6 +73,9 @@ public class IotScreenServiceImpl implements IIotScreenService {
     @Autowired
     private IIotDeviceService iIotDeviceService;
 
+    @Autowired
+    private IIotPestrecogService iIotPestrecogService;
+
     /**
      * 设备统计
      *
@@ -480,5 +489,64 @@ public class IotScreenServiceImpl implements IIotScreenService {
         return iotDeviceCommonService.func(iotDeviceBaseFunReqVo);
     }
 
+    /**
+     * 获取测报灯图片列表
+     *
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public IPage cbdImgList(IotPestRecogPeriodReqVo reqVo) {
+        ValidateUtil.validateDevBid(reqVo.getDevBid());
+        String startTime = reqVo.getStartTime();
+        String endTime = reqVo.getEndTime();
+        String column = "cbdimgCreatedDate";
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("devBid", reqVo.getDevBid());
+        map.put("cbdimgDelstatus", "0");
+
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isEmpty(endTime)) {
+            map.put("gte_" + column, startTime);
+        }
+        if (StringUtils.isEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            map.put("lte_" + column, endTime);
+        }
+        if (StringUtils.isNotEmpty(startTime) && StringUtils.isNotEmpty(endTime)) {
+            map.put("time_" + column, startTime + "," + endTime);
+        }
+
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        IPage listPage = mongoService.findListPage(IotCbdimg.class, map, pageDomain);
+
+        List<IotCbdimg> cbdimgList = listPage.getRecords();
+        List<IotCbdimgListResVo> cbdimgListResVoList = new ArrayList<>();
+        for (IotCbdimg iotCbdimg : cbdimgList) {
+            IotCbdimgListResVo iotCbdimgListResVo = new IotCbdimgListResVo();
+            BeanUtils.copyProperties(iotCbdimg, iotCbdimgListResVo);
+            cbdimgListResVoList.add(iotCbdimgListResVo);
+        }
+        listPage.setRecords(cbdimgListResVoList);
+        return listPage;
+    }
+
+    /**
+     * 获取测报灯识别图片列表
+     *
+     * @param reqVo
+     * @return
+     */
+    @Override
+    public IPage cbdRecogImgList(IotPestRecogPeriodReqVo reqVo) {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        IPage<IotPestrecogListResVo> listPage = null;
+        try{
+            listPage = iIotPestrecogService.selectIotPestrecogList(reqVo, pageDomain);
+        }catch (Exception e){
+            log.error("一张图获取测报灯识别图片列表异常", e);
+        }
+        return listPage;
+    }
+
 
 }