Explorar el Código

修复 当测报灯没有识别数据的情况下进行人工标记失败的问题

zhaiyifei hace 1 año
padre
commit
21ea8b413b

+ 5 - 2
src/main/java/com/yunfeiyun/agmp/iotm/device/pest/service/impl/IotPestrecogServiceImpl.java

@@ -502,6 +502,7 @@ public class IotPestrecogServiceImpl implements IIotPestrecogService {
         String cbdrecogType = reqVo.getCbdrecogType();
         String cbdrecogMarktype = reqVo.getCbdrecogMarktype();
         String pestBusid = reqVo.getPestBid();
+        String pestName = reqVo.getPestName();
 
         Criteria criteria = new Criteria()
                 .and("devBid").is(devBid)
@@ -571,9 +572,11 @@ public class IotPestrecogServiceImpl implements IIotPestrecogService {
             if(Objects.equals(cbdrecogMarktype, EnumCbdMarkType.AUTO.getCode())){
                 ioPestResVo = iotPestService.selectIotPestDetailByPestBid(pestBusid);
             }else{
-                ioPestResVo = iotPestService.selectIotPestDetailByPestName(pestBusid);
+                ioPestResVo = iotPestService.selectIotPestDetailByPestName(pestName);
+            }
+            if(ioPestResVo != null){
+                BeanUtils.copyProperties(ioPestResVo, result);
             }
-            BeanUtils.copyProperties(ioPestResVo, result);
         }
         return result;
     }