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

车辆bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-05-14 17:23:05 +08:00
parent 2d7eb91987
commit c25f8fcad9
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -953,14 +953,24 @@ public class HikvisionCall {
if (success) { if (success) {
msg = "同步成功，车牌号码：" + carInfo.getCarNumber(); msg = "同步成功，车牌号码：" + carInfo.getCarNumber();
title += "成功"; title += "成功";
setSuccessByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); updateSuccessStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null);
} else { } else {
JSONObject jo = JSONObject.parseObject(rs); JSONObject jo = JSONObject.parseObject(rs);
String code = jo.getString("code"); String code = jo.getString("code");
if (Objects.equals(code, "0x00072202")) { if (Objects.equals(code, "0x00072202")) {
msg = "同步成功，车牌号码：" + carInfo.getCarNumber(); msg = "同步成功，车牌号码：" + carInfo.getCarNumber();
title += "成功"; title += "成功";
setSuccessByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); updateSuccessStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null);
} else if (Objects.equals(code, "0x02e33900")) {
String msg1 = jo.getString("msg");
if (Objects.equals(msg1, "reservation record not existed or overdued!")) {
msg = "同步成功，车牌号码：" + carInfo.getCarNumber();
title += "成功";
updateSuccessStatusByNow(carInfo.getProjectSn(), carInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null);
} else {
msg = "同步失败，车牌号码：" + carInfo.getCarNumber() + "。失败原因：下发异常";
title += "失败";
}
} else { } else {
msg = "同步失败，车牌号码：" + carInfo.getCarNumber() + "。失败原因：下发异常"; msg = "同步失败，车牌号码：" + carInfo.getCarNumber() + "。失败原因：下发异常";
title += "失败"; title += "失败";
@ -1000,7 +1010,7 @@ public class HikvisionCall {
String msg = ""; String msg = "";
String noticeType = "23"; String noticeType = "23";
if (success) { if (success) {
setSuccessByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null);
msg = "同步成功，人员名称：" + workerInfo.getWorkerName() + "，身份证号：" + workerInfo.getIdCard(); msg = "同步成功，人员名称：" + workerInfo.getWorkerName() + "，身份证号：" + workerInfo.getIdCard();
title += "成功"; title += "成功";
} else { } else {
@ -1022,7 +1032,7 @@ public class HikvisionCall {
title += "失败"; title += "失败";
} else if (Objects.equals(msg1, "PersonId Already In Db")) { } else if (Objects.equals(msg1, "PersonId Already In Db")) {
//成功 //成功
setSuccessByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null); updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), type, operate, ThreadLocalUtil.getNotNull().getDate("now"), null);
msg = "同步成功，人员名称：" + workerInfo.getWorkerName() + "，身份证号：" + workerInfo.getIdCard(); msg = "同步成功，人员名称：" + workerInfo.getWorkerName() + "，身份证号：" + workerInfo.getIdCard();
title += "成功"; title += "成功";
} }
@ -1036,7 +1046,7 @@ public class HikvisionCall {
} }
} }
private void setSuccessByNow(String projectSn, Long whoId, Integer type, Integer operate, Date now, String deviceSn) { private void updateSuccessStatusByNow(String projectSn, Long whoId, Integer type, Integer operate, Date now, String deviceSn) {
LambdaQueryWrapper<XzHikvisionSync> queryWrapper = new LambdaQueryWrapper<XzHikvisionSync>() LambdaQueryWrapper<XzHikvisionSync> queryWrapper = new LambdaQueryWrapper<XzHikvisionSync>()
.eq(XzHikvisionSync::getProjectSn, projectSn) .eq(XzHikvisionSync::getProjectSn, projectSn)
.eq(XzHikvisionSync::getWhoId, whoId) .eq(XzHikvisionSync::getWhoId, whoId)
@ -1549,8 +1559,9 @@ public class HikvisionCall {
//根据车牌号删除车辆 //根据车牌号删除车辆
JSONObject oldCarInfo = searchCarInfoByCarNumberFromHttp(carInfo.getCarNumber(), project); JSONObject oldCarInfo = searchCarInfoByCarNumberFromHttp(carInfo.getCarNumber(), project);
if (oldCarInfo != null) { if (oldCarInfo != null) {
log.info("海康存在以前添加的车辆，车牌号：{}", oldCarInfo.getString("plateNo")); log.info("海康存在车辆，车牌号：{}", oldCarInfo.getString("plateNo"));
deleteCarInfoByIdFromHttp(oldCarInfo.getString("vehicleId"), project); String rs = deleteCarInfoByIdFromHttp(oldCarInfo.getString("vehicleId"), project);
sendNoticeForCarInfo("删除车辆白名单到海康isc", rs, carInfo, 4, 3);
} }
} }
@ -2328,7 +2339,7 @@ public class HikvisionCall {
String code = sdRs.getString("code"); String code = sdRs.getString("code");
if (Objects.equals(code, "0x15403007")) { if (Objects.equals(code, "0x15403007")) {
//已存在权限，下发成功 //已存在权限，下发成功
setSuccessByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, ThreadLocalUtil.getNotNull().getDate("now"), devSn); updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, ThreadLocalUtil.getNotNull().getDate("now"), devSn);
sucSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "；"); sucSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "；");
return; return;
} }
@ -2342,7 +2353,7 @@ public class HikvisionCall {
JSONObject sdRsJo = HikvisionUtil.getJSONObjectData(sdRs); JSONObject sdRsJo = HikvisionUtil.getJSONObjectData(sdRs);
Integer downloadResult = sdRsJo.getJSONObject("resourceDownloadResult").getInteger("downloadResult"); Integer downloadResult = sdRsJo.getJSONObject("resourceDownloadResult").getInteger("downloadResult");
if (downloadResult == 0) { if (downloadResult == 0) {
setSuccessByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, ThreadLocalUtil.getNotNull().getDate("now"), devSn); updateSuccessStatusByNow(workerInfo.getProjectSn(), workerInfo.getId(), 3, i == 0 ? 1 : 3, ThreadLocalUtil.getNotNull().getDate("now"), devSn);
sucSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "；"); sucSb.append(workerInfo.getWorkerName() + "，" + dev.getDevName() + "；");
} else { } else {
log.error(workerInfo.getWorkerName() + "，" + dev.getDevName() + ",fail：" + sdRsJo.toJSONString()); log.error(workerInfo.getWorkerName() + "，" + dev.getDevName() + ",fail：" + sdRsJo.toJSONString());