新增 吸虫塔重新识别功能

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

@@ -9,6 +9,7 @@ import com.yunfeiyun.agmp.common.framework.oss.cloud.OSSFactory;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
+import com.yunfeiyun.agmp.iot.common.constant.devicetype.IotDeviceDictConst;
 import com.yunfeiyun.agmp.iot.common.constant.mq.IotActionEnums;
 import com.yunfeiyun.agmp.iot.common.domain.*;
 import com.yunfeiyun.agmp.iot.common.domain.reqvo.IotCbdrecogAgainReqVo;
@@ -61,16 +62,27 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
     @Resource
     private IotsMqProviderService iotsMqProviderService;
 
+    private String getCbdrecogType(IotCbdrecogReqVo reqVo, String devBid){
+        String cbdrecogType = reqVo.getCbdrecogType();
+        IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
+        if(iotDevice.getDevtypeBid().equals(IotDeviceDictConst.TYPE_YF_XCT)){
+            cbdrecogType = EnumCbdRecogType.A.getCode();
+        }
+        return cbdrecogType;
+    }
+
 
     @Transactional
     @Override
     public int artificialUpdate(IotCbdrecogReqVo reqVo) {
-        String cbdrecogType = reqVo.getCbdrecogType();
         String cbdimgBid = reqVo.getCbdimgBid();
         String cbdrecogManualmark = reqVo.getCbdrecogManualmark();
         String cbdrecogManualBase64 = reqVo.getCbdrecogManualBase64();
         String devBid = reqVo.getDevBid();
 
+        IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
+        String cbdrecogType = getCbdrecogType(reqVo, reqVo.getDevBid());
+
         Map<String, Object> map = new HashMap<>();
         map.put("cbdimgBid", cbdimgBid);
         IotCbdimg iotCbdimg = (IotCbdimg) mongoService.findOne(IotCbdimg.class, map, null, null);
@@ -102,7 +114,6 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
             iotCbdrecog.setCbdrecogManualmark(cbdrecogManualmark);
         }
 
-        IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
         JSONArray recogArray = JSONArray.parseArray(cbdrecogManualmark);
         Map<String, IotCbdPestrecog> cbdPestrecogMap = new LinkedHashMap<>();
         long cbdrecogTotalnumManual = 0L;
@@ -166,7 +177,6 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
 
     @Override
     public int artificialReset(IotCbdrecogReqVo reqVo) {
-        String cbdrecogType = reqVo.getCbdrecogType();
         String cbdrecogMarktype = EnumCbdMarkType.HAND.getCode();
         String cbdimgBid = reqVo.getCbdimgBid();
 
@@ -174,6 +184,9 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
         map.put("cbdimgBid", cbdimgBid);
         IotCbdimg iotCbdimg = (IotCbdimg) mongoService.findOne(IotCbdimg.class, map, null, null);
 
+        String devBid = iotCbdimg.getDevBid();
+        String cbdrecogType = getCbdrecogType(reqVo, devBid);
+
         Map<String, IotCbdrecog> cbdrecog = iotCbdimg.getCbdrecog();
         IotCbdrecog iotCbdrecog = cbdrecog.get(cbdrecogType);
         if (iotCbdrecog == null) {
@@ -206,7 +219,6 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
      */
     @Override
     public IotCbdrecogInfoResVo info(IotCbdrecogReqVo reqVo) {
-        String cbdrecogType = reqVo.getCbdrecogType();
         String cbdrecogMarktype = reqVo.getCbdrecogMarktype();
         String cbdimgBid = reqVo.getCbdimgBid();
 
@@ -214,6 +226,10 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
         if (iotCbdimg == null) {
             throw new IotBizException(ErrorCode.INVALID_PARAMETER.getCode(), "未找到对应的图片记录");
         }
+
+        String devBid = iotCbdimg.getDevBid();
+        String cbdrecogType = getCbdrecogType(reqVo, devBid);
+
         Map<String, IotCbdrecog> cbdrecogMap = iotCbdimg.getCbdrecog();
         IotCbdrecog iotCbdrecog = cbdrecogMap.getOrDefault(cbdrecogType, new IotCbdrecog());
         Map<String, List<IotCbdPestrecog>> pestrecogMap = iotCbdrecog.getPestrecog();
@@ -331,18 +347,20 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
      */
     @Override
     public void againRecog(IotCbdrecogAgainReqVo reqVo) {
-        String cbdrecogType = reqVo.getCbdrecogType();
         String cbdimgBid = reqVo.getCbdimgBid();
         String devBid = reqVo.getDevBid();
 
-        if (EnumCbdRecogType.findEnumByCode(cbdrecogType) == null) {
-            throw new IotBizException(ErrorCode.FAILURE.getCode(), "识别类型错误");
-        }
-
         IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
         if (iotDevice == null) {
             throw new IotBizException(ErrorCode.FAILURE.getCode(), "设备不存在");
         }
+        IotCbdrecogReqVo req = new IotCbdrecogReqVo();
+        req.setCbdrecogType(reqVo.getCbdrecogType());
+        String cbdrecogType = getCbdrecogType(req, devBid);
+
+        if (EnumCbdRecogType.findEnumByCode(cbdrecogType) == null) {
+            throw new IotBizException(ErrorCode.FAILURE.getCode(), "识别类型错误");
+        }
 
         Map<String, Object> map = new HashMap<>();
         map.put("cbdimgBid", cbdimgBid);
@@ -350,6 +368,8 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
         if (iotCbdimg == null) {
             throw new IotBizException(ErrorCode.FAILURE.getCode(), "图片不存在");
         }
+        reqVo.setCbdrecogType(cbdrecogType);
+        reqVo.setDevtypeBid(iotDevice.getDevtypeBid());
         iotsMqProviderService.sendBaseDataToIots(IotActionEnums.DEVICE_CBD_AGAIN_RECORD, reqVo, "测报灯重新识别");
     }
 

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

@@ -106,9 +106,15 @@ public class IotHomeServiceImpl implements IIotHomeService {
         List<IotHomeDeviceListResVo> resultList = new ArrayList<>();
         for(IotHomeDeviceListResVo item : dataList) {
             IotDevice deviceInfo = deviceMap.get(item.getDevBid());
-            if(deviceInfo == null){
-                continue;
+            // 测试使用
+            if(deviceInfo == null) {
+                deviceInfo = new IotDevice();
+//                continue;
             }
+            // 正式使用
+//            if(deviceInfo == null){
+//                continue;
+//            }
             item.setDevName(deviceInfo.getDevName());
             resultList.add(item);
         }