Guwan
/
cqyt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.0.6 

1.修复bug
2.设备更新时间作为最后在线时间
This commit is contained in:
gaoben 2021-05-13 09:51:56 +08:00
parent 9a77ef6e77
commit 997f024cdb
4 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java
View File

@ -595,9 +595,9 @@ public class XaImageTask implements ITask {
String enJson = XaUtils.encryptStr(json.trim(), appSecret); String enJson = XaUtils.encryptStr(json.trim(), appSecret);
List<XaTCCTCSBZPXX> syncRecordsUpdates = jsonData.getDatas(); List<XaRYRKPHOTO> syncRecordsUpdates = jsonData.getDatas();
for(XaTCCTCSBZPXX xx: syncRecordsUpdates){ for(XaRYRKPHOTO xx: syncRecordsUpdates){
xx.setLV_ZPZP(""); xx.setLV_ZP("");
} }

1
shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java
View File

@ -385,6 +385,7 @@ public class DeviceApiServiceImpl implements DeviceApiService {
//保存人脸个数 //保存人脸个数
deviceEntity.setFaceCount(faceCount); deviceEntity.setFaceCount(faceCount);
deviceEntity.setLastUpdateTime(new Date());
tenDeviceService.evictupdateById(deviceEntity); tenDeviceService.evictupdateById(deviceEntity);
TenCellEntity cellEntity = tenCellService.getById(deviceEntity.getCellId()); TenCellEntity cellEntity = tenCellService.getById(deviceEntity.getCellId());

40
shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java
View File

@ -108,26 +108,26 @@ public class VideoOpenApi {
} }
} }
if(backgroundPicture!=null && !backgroundPicture.isEmpty()){ // if(backgroundPicture!=null && !backgroundPicture.isEmpty()){
try { // try {
byte[] b = Base64.getDecoder().decode(backgroundPicture.replace("\n", "")); // byte[] b = Base64.getDecoder().decode(backgroundPicture.replace("\n", ""));
InputStream inputStream = new ByteArrayInputStream(b); // InputStream inputStream = new ByteArrayInputStream(b);
String userFileUrl = "video/" + // String userFileUrl = "video/" +
recordEntity.getCellId().toString() + "/" + // recordEntity.getCellId().toString() + "/" +
DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH) + "/"; // DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH) + "/";
String fileName = userFileUrl + UUIDUtil.uuid() + ".jpg"; // String fileName = userFileUrl + UUIDUtil.uuid() + ".jpg";
// String fileName = "t_"+UUIDUtil.uuid()+ "." +extension; //// String fileName = "t_"+UUIDUtil.uuid()+ "." +extension;
PutObjectOptions putObjectOptions = new PutObjectOptions(b.length, -1); // PutObjectOptions putObjectOptions = new PutObjectOptions(b.length, -1);
putObjectOptions.setContentType("image/jpeg"); // putObjectOptions.setContentType("image/jpeg");
minioClient.putObject( // minioClient.putObject(
minioConfig.getBucketName(), fileName, inputStream, putObjectOptions); // minioConfig.getBucketName(), fileName, inputStream, putObjectOptions);
inputStream.close(); // inputStream.close();
recordEntity.setBackgroudPicture(fileName); // recordEntity.setBackgroudPicture(fileName);
//
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
tenVideoRecordService.save(recordEntity); tenVideoRecordService.save(recordEntity);
} }

2
shapelight-admin/src/main/java/net/shapelight/modules/xian/vo/XaTCCTCSBZPXXEXIT.java
View File

@ -17,7 +17,7 @@ public class XaTCCTCSBZPXXEXIT {
@JSONField(name="LV_ZPSJ") @JSONField(name="LV_ZPSJ")
private String LV_ZPSJ; private String LV_ZPSJ;
@JSONField(name="LV_JKBM") @JSONField(name="LV_CKBM")
private String LV_CKBM; private String LV_CKBM;