|
|
@@ -81,8 +81,8 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("cbdimgBid", cbdimgBid);
|
|
|
IotCbdimg iotCbdimg = (IotCbdimg) mongoService.findOne(IotCbdimg.class, map, null, null);
|
|
|
+
|
|
|
String nowDate = DateUtils.dateTimeNow();
|
|
|
- iotCbdimg.setCbdimgModifieddate(nowDate);
|
|
|
|
|
|
Map<String, IotCbdrecog> cbdrecog = iotCbdimg.getCbdrecog();
|
|
|
IotCbdrecog iotCbdrecog = cbdrecog.get(cbdrecogType);
|
|
|
@@ -95,11 +95,11 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
iotCbdrecog.setCbdrecogMarktype(EnumCbdMarkType.AUTO.getCode());
|
|
|
iotCbdrecog.setCbdrecogDelstatus("0");
|
|
|
iotCbdrecog.setCbdrecogCreator(SecurityUtils.getUserId());
|
|
|
- iotCbdrecog.setCbdrecogCreatedDate(nowDate);
|
|
|
+ iotCbdrecog.setCbdrecogCreatedDate(iotCbdimg.getCbdimgCreatedDate());
|
|
|
+ iotCbdrecog.setCbdrecogModifieddate(iotCbdimg.getCbdimgCreatedDate());
|
|
|
}
|
|
|
|
|
|
iotCbdrecog.setCbdrecogModifier(SecurityUtils.getUserId());
|
|
|
- iotCbdrecog.setCbdrecogModifieddate(nowDate);
|
|
|
if (StringUtils.isNotEmpty(cbdrecogManualBase64)) {
|
|
|
String imgUrl = getPestRecogImgOssUrl(cbdrecogManualBase64, iotCbdrecog.getCbdrecogBid());
|
|
|
iotCbdrecog.setCbdrecogManualaddr(imgUrl);
|
|
|
@@ -112,7 +112,7 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
IotDevice iotDevice = iotDeviceService.selectIotDeviceByDevBid(devBid);
|
|
|
JSONArray recogArray = JSONArray.parseArray(cbdrecogManualmark);
|
|
|
Map<String, IotCbdPestrecog> cbdPestrecogMap = new LinkedHashMap<>();
|
|
|
- Long cbdrecogTotalnumManual = 0L;
|
|
|
+ long cbdrecogTotalnumManual = 0L;
|
|
|
for(Object o : recogArray) {
|
|
|
JSONObject point = (JSONObject) o;
|
|
|
for(String pestName : point.keySet()) {
|
|
|
@@ -159,10 +159,8 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
Map<String, List<IotCbdPestrecog>> pestrecog = iotCbdrecog.getPestrecog();
|
|
|
if(pestrecog == null){
|
|
|
pestrecog = new HashMap<>();
|
|
|
- pestrecog.put(EnumCbdMarkType.HAND.getCode(), pestrecogList);
|
|
|
- }else{
|
|
|
- pestrecog.put(EnumCbdMarkType.HAND.getCode(), pestrecogList);
|
|
|
}
|
|
|
+ pestrecog.put(EnumCbdMarkType.HAND.getCode(), pestrecogList);
|
|
|
iotCbdrecog.setPestrecog(pestrecog);
|
|
|
cbdrecog.put(cbdrecogType, iotCbdrecog);
|
|
|
iotCbdimg.setCbdrecog(cbdrecog);
|
|
|
@@ -182,8 +180,6 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("cbdimgBid", cbdimgBid);
|
|
|
IotCbdimg iotCbdimg = (IotCbdimg) mongoService.findOne(IotCbdimg.class, map, null, null);
|
|
|
- String nowDate = DateUtils.dateTimeNow();
|
|
|
- iotCbdimg.setCbdimgModifieddate(nowDate);
|
|
|
|
|
|
Map<String, IotCbdrecog> cbdrecog = iotCbdimg.getCbdrecog();
|
|
|
IotCbdrecog iotCbdrecog = cbdrecog.get(cbdrecogType);
|
|
|
@@ -191,7 +187,6 @@ public class IotCbdrecogServiceImpl implements IIotCbdrecogService {
|
|
|
return 1;
|
|
|
}
|
|
|
iotCbdrecog.setCbdrecogModifier(SecurityUtils.getUserId());
|
|
|
- iotCbdrecog.setCbdrecogModifieddate(nowDate);
|
|
|
iotCbdrecog.setCbdrecogManualmark("");
|
|
|
iotCbdrecog.setCbdrecogManualaddr("");
|
|
|
iotCbdrecog.setCbdrecogResultManual("");
|