diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java index 61c6f1c..7a93e65 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java @@ -595,9 +595,9 @@ public class XaImageTask implements ITask { String enJson = XaUtils.encryptStr(json.trim(), appSecret); - List syncRecordsUpdates = jsonData.getDatas(); - for(XaTCCTCSBZPXX xx: syncRecordsUpdates){ - xx.setLV_ZPZP(""); + List syncRecordsUpdates = jsonData.getDatas(); + for(XaRYRKPHOTO xx: syncRecordsUpdates){ + xx.setLV_ZP(""); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java index 8efef18..ebb50d9 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java @@ -385,6 +385,7 @@ public class DeviceApiServiceImpl implements DeviceApiService { //保存人脸个数 deviceEntity.setFaceCount(faceCount); + deviceEntity.setLastUpdateTime(new Date()); tenDeviceService.evictupdateById(deviceEntity); TenCellEntity cellEntity = tenCellService.getById(deviceEntity.getCellId()); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java b/shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java index c887894..e99bac6 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java @@ -108,26 +108,26 @@ public class VideoOpenApi { } } - if(backgroundPicture!=null && !backgroundPicture.isEmpty()){ - try { - byte[] b = Base64.getDecoder().decode(backgroundPicture.replace("\n", "")); - InputStream inputStream = new ByteArrayInputStream(b); - String userFileUrl = "video/" + - recordEntity.getCellId().toString() + "/" + - DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH) + "/"; - String fileName = userFileUrl + UUIDUtil.uuid() + ".jpg"; -// String fileName = "t_"+UUIDUtil.uuid()+ "." +extension; - PutObjectOptions putObjectOptions = new PutObjectOptions(b.length, -1); - putObjectOptions.setContentType("image/jpeg"); - minioClient.putObject( - minioConfig.getBucketName(), fileName, inputStream, putObjectOptions); - inputStream.close(); - recordEntity.setBackgroudPicture(fileName); - - } catch (Exception e) { - e.printStackTrace(); - } - } +// if(backgroundPicture!=null && !backgroundPicture.isEmpty()){ +// try { +// byte[] b = Base64.getDecoder().decode(backgroundPicture.replace("\n", "")); +// InputStream inputStream = new ByteArrayInputStream(b); +// String userFileUrl = "video/" + +// recordEntity.getCellId().toString() + "/" + +// DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH) + "/"; +// String fileName = userFileUrl + UUIDUtil.uuid() + ".jpg"; +//// String fileName = "t_"+UUIDUtil.uuid()+ "." +extension; +// PutObjectOptions putObjectOptions = new PutObjectOptions(b.length, -1); +// putObjectOptions.setContentType("image/jpeg"); +// minioClient.putObject( +// minioConfig.getBucketName(), fileName, inputStream, putObjectOptions); +// inputStream.close(); +// recordEntity.setBackgroudPicture(fileName); +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } tenVideoRecordService.save(recordEntity); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/xian/vo/XaTCCTCSBZPXXEXIT.java b/shapelight-admin/src/main/java/net/shapelight/modules/xian/vo/XaTCCTCSBZPXXEXIT.java index 3c560a3..6695983 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/xian/vo/XaTCCTCSBZPXXEXIT.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/xian/vo/XaTCCTCSBZPXXEXIT.java @@ -17,7 +17,7 @@ public class XaTCCTCSBZPXXEXIT { @JSONField(name="LV_ZPSJ") private String LV_ZPSJ; - @JSONField(name="LV_JKBM") + @JSONField(name="LV_CKBM") private String LV_CKBM;