From c25f8fcad96a8da4a3155d83f30e0f8161c62854 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 14 May 2024 17:23:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/call/HikvisionCall.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index e1c7be5e1..07cd79951 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -953,14 +953,24 @@ public class HikvisionCall { if (success) { msg = "同步成功，车牌号码：" + carInfo.getCarNumber(); 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 { JSONObject jo = JSONObject.parseObject(rs); String code = jo.getString("code"); if (Objects.equals(code, "0x00072202")) { msg = "同步成功，车牌号码：" + carInfo.getCarNumber(); 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 { msg = "同步失败，车牌号码：" + carInfo.getCarNumber() + "。失败原因：下发异常"; title += "失败"; @@ -1000,7 +1010,7 @@ public class HikvisionCall { String msg = ""; String noticeType = "23"; 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(); title += "成功"; } else { @@ -1022,7 +1032,7 @@ public class HikvisionCall { title += "失败"; } 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(); 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 queryWrapper = new LambdaQueryWrapper() .eq(XzHikvisionSync::getProjectSn, projectSn) .eq(XzHikvisionSync::getWhoId, whoId) @@ -1549,8 +1559,9 @@ public class HikvisionCall { //根据车牌号删除车辆 JSONObject oldCarInfo = searchCarInfoByCarNumberFromHttp(carInfo.getCarNumber(), project); if (oldCarInfo != null) { - log.info("海康存在以前添加的车辆，车牌号：{}", oldCarInfo.getString("plateNo")); - deleteCarInfoByIdFromHttp(oldCarInfo.getString("vehicleId"), project); + log.info("海康存在车辆，车牌号：{}", oldCarInfo.getString("plateNo")); + 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"); 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() + "；"); return; } @@ -2342,7 +2353,7 @@ public class HikvisionCall { JSONObject sdRsJo = HikvisionUtil.getJSONObjectData(sdRs); Integer downloadResult = sdRsJo.getJSONObject("resourceDownloadResult").getInteger("downloadResult"); 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() + "；"); } else { log.error(workerInfo.getWorkerName() + "，" + dev.getDevName() + ",fail：" + sdRsJo.toJSONString());