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