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