From 8927f7616b2932ce47d2929dca9410373dbcc107 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Fri, 21 Mar 2025 09:17:14 +0800 Subject: [PATCH] =?UTF-8?q?/*=E7=94=9F=E4=BA=A7=E7=82=B9=E4=BD=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E7=BB=91=E5=AE=9A=E5=8F=AF=E8=A7=81=E5=85=89?= =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E5=87=BA=E7=8E=B0500=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=B9=B6=E4=B8=94=E5=88=A0=E9=99=A4=E8=AF=A5=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=82=B9=E4=BD=8D=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=201.=20patrol=5Fpreset=5Fpos=E8=A1=A8=E9=87=8CU=5FEQ?= =?UTF-8?q?=5FPOS=E8=81=94=E5=90=88=E7=B4=A2=E5=BC=95UNIQUE=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E6=94=B9=E6=88=90?= =?UTF-8?q?=E8=AF=A5=E7=9B=91=E6=B5=8B=E7=82=B9=E5=B7=B2=E7=BB=8F=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=EF=BC=81=202.=20=E7=BB=91=E5=AE=9A=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E5=8E=BB=E5=88=A0=E9=99=A4=E8=AF=A5?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=82=B9=E4=BD=8D=E3=80=82*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inspect-main/inspect-main-video/pom.xml | 4 ++ .../controller/PatrolPresetPosController.java | 44 +++++++++++-------- .../service/IPatrolPresetPosService.java | 1 + 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/inspect-main/inspect-main-video/pom.xml b/inspect-main/inspect-main-video/pom.xml index 869c785..d109653 100644 --- a/inspect-main/inspect-main-video/pom.xml +++ b/inspect-main/inspect-main-video/pom.xml @@ -40,6 +40,10 @@ com.inspect inspect-base-access + + com.inspect + inspect-base-core + org.springframework.boot spring-boot-starter-amqp diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java index fc8112b..e574f66 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolPresetPosController.java @@ -48,6 +48,7 @@ import com.inspect.patrol.service.impl.Video2NvrComponent; import com.inspect.patrol.vo.CameraVo; import com.inspect.system.base.domain.SysDictData; +import java.sql.SQLIntegrityConstraintViolationException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -56,8 +57,9 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.sun.prism.paint.Color; +import com.inspect.base.core.constant.Color; import org.springframework.beans.factory.annotation.Value; +import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -446,38 +448,37 @@ public class PatrolPresetPosController extends BaseController { patrolPresetPos.setChannelCode(channel.getString("channelCode")); patrolPresetPos.setChannelType(channel.getString("channelType")); patrolPresetPos.setVideoNvrCode(eqpBook.getString("videoNvrCode")); - JSONObject basePresetId; + JSONObject basePreset; String snap; if (patrolPresetPos.getPatrolPointId() == null) { ajaxResult = this.basedataStdPatrolPointService.queryById(patrolPresetPos.getStdParolPointId()); //qinyl - basePresetId = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); + basePreset = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); ajaxResult = this.basedataDeviceService.queryById(patrolPresetPos.getDeviceId()); JSONObject device = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)).getJSONObject("data"); snap = device.getString("areaId"); String stdPatrolPointId = patrolPresetPos.getStdParolPointId(); JSONObject paramJson = (new JSONObject()) .fluentPut("deviceId", patrolPresetPos.getDeviceId()) - .fluentPut("patrolContent", basePresetId.getString("patrolContent")) + .fluentPut("patrolContent", basePreset.getString("patrolContent")) .fluentPut("purpose", INSERT_PATROL_POINT_PURPOSE) .fluentPut("areaId", snap) .fluentPut("stdParolPointId", stdPatrolPointId) .fluentPut("deviceTypeId", device.getString("deviceTypeId")) - .fluentPut("lowerValue", basePresetId.getString("lowerValue")) - .fluentPut("alarmThreshold", basePresetId.getString("alarmThreshold")) - .fluentPut("upperValue", basePresetId.getString("upperValue")) - .fluentPut("algSubtypeIds", basePresetId.getString("algSubtypeIds")) - .fluentPut("patrolPointName", device.getString("deviceName") + "_" + basePresetId.getString("stdPatrolPointName")); + .fluentPut("lowerValue", basePreset.getString("lowerValue")) + .fluentPut("alarmThreshold", basePreset.getString("alarmThreshold")) + .fluentPut("upperValue", basePreset.getString("upperValue")) + .fluentPut("algSubtypeIds", basePreset.getString("algSubtypeIds")) + .fluentPut("patrolPointName", device.getString("deviceName") + "_" + basePreset.getString("stdPatrolPointName")); ajaxResult = this.basedataPatrolPointService.add(paramJson); JSONObject patrolPoint = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult)); patrolPresetPos.setPatrolPointId(patrolPoint.getLong("data")); } - basePresetId = null; - + Integer basePresetId = null; try { this.basedataPatrolPointService.UpPatrolPointModel((new JSONObject()).fluentPut("patrolPointId", patrolPresetPos.getPatrolPointId())); - Integer basePresetId2 = this.insertBasePreset(patrolPresetPos); + basePresetId = this.insertBasePreset(patrolPresetPos); SnapModel snapModel = new SnapModel(); snapModel.setCode(patrolPresetPos.getChannelCode()); snapModel.setPatrolDeviceCode(patrolPresetPos.getPatrolDeviceCode()); @@ -492,21 +493,26 @@ public class PatrolPresetPosController extends BaseController { logger.info("[PRESET] 预置位编码不能为空！: {}", patrolPresetPos.getPresetPosCode()); throw new ServiceException("预置位编码不能为空！"); } else { + logger.info(Color.GREEN + "[PRESET] INSERT patrolPresetPos: {}" + Color.END, patrolPresetPos); int insertResId = patrolPresetPosService.insertPatrolPresetPos(patrolPresetPos); logger.info("[PRESET] insert insertResId: {}", insertResId); - } } else { logger.info("[PRESET] patrolPresetPos: {} already added!", patrolPresetPos1.getPatrolPointId()); } } catch (Exception e) { - this.basedataPatrolPointService.remove(new Long[]{patrolPresetPos.getPatrolPointId()}); - if (basePresetId != null) { - this.basedataPatrolpointPresetService.remove(new Long[]{Long.valueOf(Long.parseLong(basePresetId + ""))}); + logger.warn(Color.RED + "[PRESET] INSERT into patrolPresetPos Exception class: {}" + Color.END, e.getClass()); + if (e.getClass().equals(DuplicateKeyException.class)) { + logger.warn(Color.RED + "[PRESET] INSERT into patrolPresetPos Exception class!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1" + Color.END); + return AjaxResult.fail(500, "该监测点已经绑定！"); + } else { + logger.warn("[PRESET] INSERT into patrolPresetPos 2: {}", e.getMessage()); + this.basedataPatrolPointService.remove(new Long[]{patrolPresetPos.getPatrolPointId()}); + if (basePresetId != null) { + this.basedataPatrolpointPresetService.remove(new Long[]{Long.parseLong(basePresetId + "")}); + } + throw new ServiceException("连接超时！"); } - - e.printStackTrace(); - throw new ServiceException("连接超时！"); } this.toSdkIrParam(patrolPresetPos, eqpBook); diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/IPatrolPresetPosService.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/IPatrolPresetPosService.java index 0c115a9..8905ad1 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/IPatrolPresetPosService.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/IPatrolPresetPosService.java @@ -2,6 +2,7 @@ package com.inspect.patrol.service; import com.inspect.patrol.domain.PatrolPresetPos; import com.inspect.patrol.vo.CameraVo; +import org.springframework.dao.DataAccessException; import java.util.List;