From d7b8ad1004a130244d6d199bd7d49984450d1de7 Mon Sep 17 00:00:00 2001 From: htjcAdmin Date: Thu, 4 Sep 2025 21:43:20 +0800 Subject: [PATCH] =?UTF-8?q?/*Redisson=E6=9C=BA=E5=88=B6=E4=B8=8D=E8=B5=B7?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=9B?= =?UTF-8?q?=E7=BA=A2=E5=A4=96=E7=94=BB=E6=A1=86=E8=AE=BE=E7=BD=AE=E5=80=BC?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93*/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AnalyseResponseServiceImpl.java | 6 +-- .../AnalyseRequestDelayQueueListener.java | 8 ++-- .../service/AnalyseRequestServiceImpl.java | 6 +-- .../controller/PatrolPresetPosController.java | 45 ++++++++++++------- .../service/BasedataPatrolPointService.java | 3 ++ .../BasedataPatrolPointController.java | 7 ++- 6 files changed, 46 insertions(+), 29 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index 9a1d69e..6c04d24 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -76,7 +76,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { private ResultAnalysisUtils resultAnalysisUtils; @Resource - private DelayQueueService delayQueueService; + private DelayQueueService delayQueueService; @Override public void picAnalyseRetNotify(AnalyseResult analyseResult) { @@ -127,8 +127,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { analyseRequest.getTaskPatrolId(), requestId, analyseRequest); - if (delayQueueService.containRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseRequest)) { - boolean isRemoved = delayQueueService.removeRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseRequest); + if (delayQueueService.containRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseRequest.getRequestId())) { + boolean isRemoved = delayQueueService.removeRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseRequest.getRequestId()); log.info("ALGORITHM_FILTER_RESULT Redisson Removed requestId: {}, Result: {}, analyseRequest: {}", requestId, isRemoved ? "success" : "fail", analyseRequest); } else { log.info("ALGORITHM_FILTER_RESULT Redisson has Compensated requestId: {}, analyseRequest: {}", requestId, analyseRequest); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestDelayQueueListener.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestDelayQueueListener.java index b8777b2..76be9f0 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestDelayQueueListener.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestDelayQueueListener.java @@ -35,13 +35,15 @@ public class AnalyseRequestDelayQueueListener implements InitializingBean, Dispo public void afterPropertiesSet() { // 启动监听线程 listenerThread = new Thread(() -> { - RBlockingQueue blockingQueue = redissonClient.getBlockingQueue(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE); + RBlockingQueue blockingQueue = redissonClient.getBlockingQueue(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE); log.info("Listening AnalyseRequest Delay Queue Task Launching"); while (running && !Thread.currentThread().isInterrupted()) { try { - AnalyseRequest request = blockingQueue.take(); // 阻塞等待任务到期 - handleRequest(request); +// AnalyseRequest request = blockingQueue.take(); // 阻塞等待任务到期 +// handleRequest(request); + final String requestId = blockingQueue.take(); // 阻塞等待任务到期 + log.info("ANALYSE_REQUEST_DELAY_QUEUE_EXPIRE requestId: {}", requestId); } catch (RedissonShutdownException e) { log.warn("Redisson 已关闭，终止监听线程"); break; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java index 7a69c05..7765c8a 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java @@ -44,7 +44,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { private AnalyseRequestRetryableDelegate retryDelegate; @Resource - private DelayQueueService delayQueueService; + private DelayQueueService delayQueueService; @Resource private IAnalyseLogService analysisLogService; @@ -130,9 +130,9 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService { analyseReq.setRedissonTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date())); if (testMode) { - delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq, (3L), TimeUnit.MINUTES); + delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq.getRequestId(), (3L), TimeUnit.MINUTES); } else { - delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq, requestTimeout, TimeUnit.DAYS); + delayQueueService.submitRequest(AnalyseConstants.ALGORITHM_REQUEST_DELAY_QUEUE, analyseReq.getRequestId(), requestTimeout, TimeUnit.DAYS); } if (retryDelegate.callRemoteAnalyseService(analyseReq)) { 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 b5fc657..5b3c7ba 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 @@ -390,11 +390,13 @@ public class PatrolPresetPosController extends BaseController { String password = jsonObject.getString(("password")); List presetPoints = new ArrayList<>(); String params = "code=" + channelCode; - if(StringUtils.isNotEmpty(host)) params.concat(("&host=")).concat(URLEncoder.encode(host, ("UTF-8"))); - if(StringUtils.isNotEmpty(port)) params.concat(("&port=")).concat(URLEncoder.encode(port, ("UTF-8"))); - if(StringUtils.isNotEmpty(username)) params.concat(("&username=")).concat(URLEncoder.encode(username, ("UTF-8"))); - if(StringUtils.isNotEmpty(password)) params.concat(("&password=")).concat(URLEncoder.encode(password, ("UTF-8"))); - if(StringUtils.isNotEmpty(address)) params.concat(("&address=")).concat(URLEncoder.encode(address, ("UTF-8"))); + if (StringUtils.isNotEmpty(host)) params.concat(("&host=")).concat(URLEncoder.encode(host, ("UTF-8"))); + if (StringUtils.isNotEmpty(port)) params.concat(("&port=")).concat(URLEncoder.encode(port, ("UTF-8"))); + if (StringUtils.isNotEmpty(username)) + params.concat(("&username=")).concat(URLEncoder.encode(username, ("UTF-8"))); + if (StringUtils.isNotEmpty(password)) + params.concat(("&password=")).concat(URLEncoder.encode(password, ("UTF-8"))); + if (StringUtils.isNotEmpty(address)) params.concat(("&address=")).concat(URLEncoder.encode(address, ("UTF-8"))); String result = HttpClientUtils.get((this.deviceUrl + AccessApiConstant.PTZ_LIST), params); JSONObject ivsPresetInfo = JSONObject.parseObject(result); String resultCode = ivsPresetInfo.getString("resultCode"); @@ -513,7 +515,7 @@ public class PatrolPresetPosController extends BaseController { this.basedataPatrolPointService.UpPatrolPointModel((new JSONObject()).fluentPut("patrolPointId", patrolPresetPos.getPatrolPointId())); // insert into basedata_patrolpoint_preset JSONArray objects = this.selectBasePreset(patrolPresetPos); - if (objects == null || objects.size() == 0) { + if (objects == null || objects.isEmpty()) { basePresetId = this.insertBasePreset(patrolPresetPos); } SnapModel snapModel = new SnapModel(); @@ -521,7 +523,18 @@ public class PatrolPresetPosController extends BaseController { snapModel.setPatrolDeviceCode(patrolPresetPos.getPatrolDeviceCode()); snap = this.deviceIntoService.snap(snapModel); patrolPresetPos.setChannelImg(snap); - logger.info("[PRESET] patrolPresetPos: {}", patrolPresetPos); + logger.info("PRESET_ADD patrolPointId: {}, patrolPresetPos: {}", patrolPresetPos.getPatrolPointId(), patrolPresetPos); + // update basedata_patrolpoint + try { + JSONObject editJsonObject = (new JSONObject()) + .fluentPut("patrolpointId", patrolPresetPos.getPatrolPointId()) + .fluentPut("meterType", patrolPresetPos.getPresetParamList().get(0).getCoordinate()); + logger.info("PRESET_ADD editJsonObject: {}", editJsonObject); + basedataPatrolPointService.edit(editJsonObject); + } catch (Exception e) { + e.printStackTrace(); + } + PatrolPresetPos patrolPresetPos1 = new PatrolPresetPos(); patrolPresetPos1.setPatrolPointId(patrolPresetPos.getPatrolPointId()); List presetPosList = patrolPresetPosService.selectPatrolPresetPosList(patrolPresetPos1); @@ -547,19 +560,19 @@ public class PatrolPresetPosController extends BaseController { temperParam.put("cameraCode", patrolPresetPos.getChannelCode()); List> polygonList = new ArrayList<>(); String[] split = patrolPresetParam.getCoordinate().split(StringUtils.COMMA); - if(split.length == 10){ + if (split.length == 10) { Map point = new HashMap<>(); - point.put("x", (int)((Double.parseDouble(split[0])/Double.parseDouble(split[8])) * 8190)); - point.put("y", (int)((Double.parseDouble(split[1])/Double.parseDouble(split[9])) * 8190)); + point.put("x", (int) ((Double.parseDouble(split[0]) / Double.parseDouble(split[8])) * 8190)); + point.put("y", (int) ((Double.parseDouble(split[1]) / Double.parseDouble(split[9])) * 8190)); Map point1 = new HashMap<>(); - point1.put("x", (int)((Double.parseDouble(split[2])/Double.parseDouble(split[8])) * 8190)); - point1.put("y", (int)((Double.parseDouble(split[3])/Double.parseDouble(split[9])) * 8190)); + point1.put("x", (int) ((Double.parseDouble(split[2]) / Double.parseDouble(split[8])) * 8190)); + point1.put("y", (int) ((Double.parseDouble(split[3]) / Double.parseDouble(split[9])) * 8190)); Map point2 = new HashMap<>(); - point2.put("x", (int)((Double.parseDouble(split[4])/Double.parseDouble(split[8])) * 8190)); - point2.put("y", (int)((Double.parseDouble(split[5])/Double.parseDouble(split[9])) * 8190)); + point2.put("x", (int) ((Double.parseDouble(split[4]) / Double.parseDouble(split[8])) * 8190)); + point2.put("y", (int) ((Double.parseDouble(split[5]) / Double.parseDouble(split[9])) * 8190)); Map point3 = new HashMap<>(); - point3.put("x", (int)((Double.parseDouble(split[6])/Double.parseDouble(split[8])) * 8190)); - point3.put("y", (int)((Double.parseDouble(split[7])/Double.parseDouble(split[9])) * 8190)); + point3.put("x", (int) ((Double.parseDouble(split[6]) / Double.parseDouble(split[8])) * 8190)); + point3.put("y", (int) ((Double.parseDouble(split[7]) / Double.parseDouble(split[9])) * 8190)); polygonList.add(point); polygonList.add(point1); polygonList.add(point2); diff --git a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/BasedataPatrolPointService.java b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/BasedataPatrolPointService.java index 7299f49..81e97a2 100644 --- a/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/BasedataPatrolPointService.java +++ b/inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/service/BasedataPatrolPointService.java @@ -14,6 +14,9 @@ public interface BasedataPatrolPointService { @PostMapping({"/patrolpointmnt/patrolpoint"}) AjaxResult add(@RequestBody JSONObject jsonObject); + @PostMapping({"/patrolpointmnt/patrolpoint/edit"}) + AjaxResult edit(@RequestBody JSONObject jsonObject); + @PostMapping({"/patrolpointmnt/patrolpoint/remove/{patrolpointIds}"}) AjaxResult remove(@PathVariable("patrolpointIds") Long[] pointIds); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java index 4eaef9a..807057f 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -42,6 +43,7 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; +@Slf4j @RestController @RequestMapping({"/patrolpointmnt/patrolpoint"}) public class BasedataPatrolPointController extends BaseController { @@ -186,6 +188,7 @@ public class BasedataPatrolPointController extends BaseController { ) @PostMapping({"/edit"}) public AjaxResult edit(@RequestBody BasedataPatrolPoint basedataPatrolpoint) { + log.info("BASEDATA_PATROL_POINT_CONTROLLER EDIT param: {}", basedataPatrolpoint); return this.toAjax(this.basedataPatrolPointService.updateBasedataPatrolPoint(basedataPatrolpoint)); } @@ -273,8 +276,4 @@ public class BasedataPatrolPointController extends BaseController { return AjaxResult.success(this.basedataPatrolPointService.pointLatestResult(pointLatestResultVo)); } - - - - }