From be1496f914cc357abb82d387a15a437c1dc14b26 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 23 May 2025 14:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9E=8D=E9=92=A2=E5=86=8D=E6=AC=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ExamRegulationController.java | 24 +++++++++++++++++-- .../ExamSafetyManualController.java | 24 +++++++++++++++++-- .../impl/SafetyHatDataServiceImpl.java | 2 +- .../controller/CountApiController.java | 4 ++-- .../impl/XzBlindPlatePlugSafeServiceImpl.java | 2 +- .../impl/XzGroundSafetServiceImpl.java | 2 +- .../impl/XzHighJobSafeServiceImpl.java | 2 +- .../impl/XzHoistSafetyWorkServiceImpl.java | 2 +- .../impl/XzLimitSpaceSafeServiceImpl.java | 2 +- .../impl/XzOpenCircuitSafeServiceImpl.java | 2 +- ...XzTemporaryElectricitySafeServiceImpl.java | 2 +- .../com/zhgd/xmgl/task/SafetyHatTask.java | 4 ++-- 12 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamRegulationController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamRegulationController.java index 788f74ae5..c9c24f2b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamRegulationController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamRegulationController.java @@ -2,6 +2,8 @@ package com.zhgd.xmgl.modules.exam.controller; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper; @@ -66,6 +68,9 @@ public class ExamRegulationController { @Autowired private WorkerInfoMapper workerInfoMapper; + @Autowired + private SystemUserMapper systemUserMapper; + /** * 分页列表查询 * @@ -83,8 +88,16 @@ public class ExamRegulationController { String workerId = MapUtils.getString(map, "workerId"); map.remove("workerId"); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamRegulation.class, map); - if (StringUtils.isNotBlank(workerId)) { - queryWrapper.lambda().like(ExamRegulation::getWorkerId, workerId); + if (SecurityUtils.getUser() != null) { + Long userId = SecurityUtils.getUser().getUserId(); + SystemUser systemUser = systemUserMapper.selectById(userId); + if (systemUser != null && systemUser.getWorkerId() != null) { + queryWrapper.lambda().like(ExamRegulation::getWorkerId, systemUser.getWorkerId()); + } + } else { + if (StringUtils.isNotBlank(workerId)) { + queryWrapper.lambda().like(ExamRegulation::getWorkerId, workerId); + } } Page page = PageUtil.getPage(map); IPage pageList = examRegulationService.page(page, queryWrapper); @@ -102,6 +115,13 @@ public class ExamRegulationController { @PostMapping(value = "/list") public Result> queryList(@RequestBody ExamRegulation examRegulation) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(examRegulation); + if (SecurityUtils.getUser() != null) { + Long userId = SecurityUtils.getUser().getUserId(); + SystemUser systemUser = systemUserMapper.selectById(userId); + if (systemUser != null && systemUser.getWorkerId() != null) { + queryWrapper.lambda().like(ExamRegulation::getWorkerId, systemUser.getWorkerId()); + } + } List list = examRegulationService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamSafetyManualController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamSafetyManualController.java index 4c95ac45c..a212392c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamSafetyManualController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamSafetyManualController.java @@ -2,6 +2,8 @@ package com.zhgd.xmgl.modules.exam.controller; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.zhgd.annotation.OperLog; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.exam.entity.ExamRegulation; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; @@ -66,6 +68,9 @@ public class ExamSafetyManualController { @Autowired private WorkerInfoMapper workerInfoMapper; + @Autowired + private SystemUserMapper systemUserMapper; + /** * 分页列表查询 * @@ -83,8 +88,16 @@ public class ExamSafetyManualController { String workerId = MapUtils.getString(map, "workerId"); map.remove("workerId"); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamSafetyManual.class, map); - if (StringUtils.isNotBlank(workerId)) { - queryWrapper.lambda().like(ExamSafetyManual::getWorkerId, workerId); + if (SecurityUtils.getUser() != null) { + Long userId = SecurityUtils.getUser().getUserId(); + SystemUser systemUser = systemUserMapper.selectById(userId); + if (systemUser != null && systemUser.getWorkerId() != null) { + queryWrapper.lambda().like(ExamSafetyManual::getWorkerId, systemUser.getWorkerId()); + } + } else { + if (StringUtils.isNotBlank(workerId)) { + queryWrapper.lambda().like(ExamSafetyManual::getWorkerId, workerId); + } } Page page = PageUtil.getPage(map); IPage pageList = examSafetyManualService.page(page, queryWrapper); @@ -102,6 +115,13 @@ public class ExamSafetyManualController { @PostMapping(value = "/list") public Result> queryList(@RequestBody ExamSafetyManual examSafetyManual) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(examSafetyManual); + if (SecurityUtils.getUser() != null) { + Long userId = SecurityUtils.getUser().getUserId(); + SystemUser systemUser = systemUserMapper.selectById(userId); + if (systemUser != null && systemUser.getWorkerId() != null) { + queryWrapper.lambda().like(ExamSafetyManual::getWorkerId, systemUser.getWorkerId()); + } + } List list = examSafetyManualService.list(queryWrapper); return Result.success(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java index b303f371d..87b5ca4cb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java @@ -169,7 +169,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 - && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); + vo.setXzBlindPlatePlugSafeNum((int) n1.stream().filter(n -> n.getActualJobBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 + && n.getActualJobEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); vo.setXzGroundSafetNum((int) n2.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count()); vo.setXzHighJobSafeNum((int) n3.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0 diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java index a243daf59..9dff506f2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java @@ -73,7 +73,7 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_ticket_code", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java index a4d0686f4..fdc267746 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java @@ -72,7 +72,7 @@ public class XzGroundSafetServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_ticket_code", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java index 10638bd60..c079300ab 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java @@ -72,7 +72,7 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_place", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java index 442eebb4d..e02e86cb9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java @@ -72,7 +72,7 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_ticket_code", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java index d93feec78..0b29beb40 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java @@ -72,7 +72,7 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.limit_space_name", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java index 02c4cdda1..78d83a930 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java @@ -72,7 +72,7 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_ticket_code", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java index 328af5104..c0199925f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java @@ -72,7 +72,7 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl page = PageUtil.getPage(paramMap); String keywords = MapUtils.getString(paramMap, "keywords"); if (StringUtils.isNotBlank(keywords)) { - queryWrapper.and(wq -> wq.like("t.fire_location_and_fire_part", keywords).or() + queryWrapper.and(wq -> wq.like("t.work_ticket_code", keywords).or() .like("su.real_name", keywords)); } IPage pageList = baseMapper.queryList(page, queryWrapper, paramMap); diff --git a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java index ff06a5474..54329e494 100644 --- a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java +++ b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java @@ -401,7 +401,7 @@ public class SafetyHatTask { /** * 定时2分钟修改安全帽状态 */ - @Scheduled(cron = "0 */2 * * * ?") + @Scheduled(cron = "*/2 * * * * ?") @SchedulerLock(name = "updateHelmetState", lockAtMostFor = 1000 * 60 * 2, lockAtLeastFor = 1000 * 10) @RequestMapping("updateHelmetState") public void updateHelmetState() { @@ -411,7 +411,7 @@ public class SafetyHatTask { if (safetyHatDev.getHeartbeatTime() == null) { safetyHatDev.setOnline(0); } else { - if (DateUtil.between(safetyHatDev.getHeartbeatTime(), new Date(), DateUnit.MINUTE) > 10) { + if (DateUtil.between(safetyHatDev.getHeartbeatTime(), new Date(), DateUnit.SECOND) > 3) { safetyHatDev.setOnline(0); } }