admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
GUO 2024-05-03 21:26:30 +08:00
parent 9e3ce39b06
commit 1cdd97cd1a
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
View File

@ -146,7 +146,7 @@ public class AsyncHikvision {
if (Objects.equals(carInfo.getCarModuleType(), 1)) { if (Objects.equals(carInfo.getCarModuleType(), 1)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
} else if (Objects.equals(carInfo.getCarModuleType(), 2)) { } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
} }
asyncHikvision.addCarInfoForHikvisionAsyc(carInfo, now); asyncHikvision.addCarInfoForHikvisionAsyc(carInfo, now);
@ -184,7 +184,7 @@ public class AsyncHikvision {
if (Objects.equals(carInfo.getCarModuleType(), 1)) { if (Objects.equals(carInfo.getCarModuleType(), 1)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
} else if (Objects.equals(carInfo.getCarModuleType(), 2)) { } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now)); xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
} }
asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old, now); asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old, now);

2
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -1153,7 +1153,7 @@ public class HikvisionCall {
} }
if (Objects.equals(carInfo.getCarModuleType(), 1)) { if (Objects.equals(carInfo.getCarModuleType(), 1)) {
addFixedCar(carInfo, project); addFixedCar(carInfo, project);
} else if (Objects.equals(carInfo.getCarModuleType(), 2)) { } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
reservationCar(project, carInfo); reservationCar(project, carInfo);
} }
} }

13
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
View File

@ -119,7 +119,7 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
String devName = xzHikvisionSync.getDevName(); String devName = xzHikvisionSync.getDevName();
String deviceSn = xzHikvisionSync.getDeviceSn(); String deviceSn = xzHikvisionSync.getDeviceSn();
if (StrUtil.isBlank(deviceSn)) { if (StrUtil.isBlank(deviceSn)) {
xzHikvisionSync.setDetail(StrUtil.format("{}{}到ISC{}", getOperateName(operate), getTypeName(type), getIsSuccessName(isSuccess))); xzHikvisionSync.setDetail(StrUtil.format("{}{}到ISC{}", getOperateName(operate, type), getTypeName(type), getIsSuccessName(isSuccess)));
} else { } else {
xzHikvisionSync.setDetail(StrUtil.format("{}{}到{}{}", getOperateNameForDev(operate), getTypeName(type), devName, getIsSuccessName(isSuccess))); xzHikvisionSync.setDetail(StrUtil.format("{}{}到{}{}", getOperateNameForDev(operate), getTypeName(type), devName, getIsSuccessName(isSuccess)));
} }
@ -139,6 +139,12 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
return "人员照片"; return "人员照片";
case 3: case 3:
return "人员权限"; return "人员权限";
case 4:
return "固定车辆";
case 5:
return "固定车辆群组";
case 6:
return "临时车";
} }
return null; return null;
} }
@ -153,7 +159,10 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
return null; return null;
} }
private String getOperateName(Integer operate) { private String getOperateName(Integer operate, Integer type) {
if (operate == 1 && type >= 4) {
return "保存";
}
switch (operate) { switch (operate) {
case 1: case 1:
return "新增"; return "新增";