From 77cfc700f6cabeae81487c7e07c8bf1eae2b7c6d Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sun, 29 Sep 2024 15:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=A1=E6=8E=A7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E5=91=8A=E8=AD=A6=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ConsControlController.java | 12 ++++++++++ .../bracelet/service/IConsControlService.java | 9 ++++++++ .../service/impl/ConsControlServiceImpl.java | 22 +++++++++++++++++++ .../mapper/bracelet/ConsControlMapper.xml | 1 + 4 files changed, 44 insertions(+) diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java index ff122a3..5729515 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ConsControlController.java @@ -236,4 +236,16 @@ public class ConsControlController extends BaseController { public AjaxResult getPhotosById(@RequestBody BraceletParamsDto dto) { return service.getPhotosById(dto); } + + /** + * 判断人员管控是否有告警 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/9/29 15:16 + */ + @GetMapping("getPersonControlIsWarn") + public AjaxResult getPersonControlIsWarn(BraceletParamsDto dto) { + return service.getPersonControlIsWarn(dto); + } } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java index 4da73e2..7c769c1 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IConsControlService.java @@ -179,4 +179,13 @@ public interface IConsControlService { * @date 2024/8/22 10:01 */ AjaxResult getPhotosById(BraceletParamsDto dto); + + /** + * 判断人员管控是否有告警 + * @param dto + * @return AjaxResult + * @author cwchen + * @date 2024/9/29 15:17 + */ + AjaxResult getPersonControlIsWarn(BraceletParamsDto dto); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java index 08db670..6c76958 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java @@ -672,6 +672,28 @@ public class ConsControlServiceImpl implements IConsControlService { return AjaxResult.success(base64List); } + @Override + public AjaxResult getPersonControlIsWarn(BraceletParamsDto dto) { + Integer isWarn = 0; + try { + List list = new ArrayList<>(); + list = mapper.getPersonsTree(dto); + for (PersonTreeVo item : list) { + if (Objects.equals(item.getLevel(), BusinessConstants.LEVEL)) { + // 判断施工人员是否预警 + isWarn = beyondTheScopeOfConstruction(dto, item.getDevId(), item.getGtId()); + if(Objects.equals(isWarn,BusinessConstants.WARN)){ + isWarn = 1; + return AjaxResult.success(isWarn); + } + } + } + } catch (Exception e) { + log.error(e.toString()); + } + return AjaxResult.success(isWarn); + } + /** * 获取文件 * diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml index e5ba05e..b3722c4 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml @@ -106,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND tp.depart_id IS NOT NULL ORDER BY tw.create_time DESC + LIMIT 54