鞍钢再次修改

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<ExamRegulation> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamRegulation.class, map);
-        if (StringUtils.isNotBlank(workerId)) {
+        if (SecurityUtils.getUser() != null) {
-            queryWrapper.lambda().like(ExamRegulation::getWorkerId, workerId);
+            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<ExamRegulation> page = PageUtil.getPage(map);
         IPage<ExamRegulation> pageList = examRegulationService.page(page, queryWrapper);
@@ -102,6 +115,13 @@ public class ExamRegulationController {
     @PostMapping(value = "/list")
     public Result<List<ExamRegulation>> queryList(@RequestBody ExamRegulation examRegulation) {
         QueryWrapper<ExamRegulation> 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<ExamRegulation> list = examRegulationService.list(queryWrapper);
         return Result.success(list);
     }

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<ExamSafetyManual> queryWrapper = QueryGenerator.initPageQueryWrapper(ExamSafetyManual.class, map);
-        if (StringUtils.isNotBlank(workerId)) {
+        if (SecurityUtils.getUser() != null) {
-            queryWrapper.lambda().like(ExamSafetyManual::getWorkerId, workerId);
+            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<ExamSafetyManual> page = PageUtil.getPage(map);
         IPage<ExamSafetyManual> pageList = examSafetyManualService.page(page, queryWrapper);
@@ -102,6 +115,13 @@ public class ExamSafetyManualController {
     @PostMapping(value = "/list")
     public Result<List<ExamSafetyManual>> queryList(@RequestBody ExamSafetyManual examSafetyManual) {
         QueryWrapper<ExamSafetyManual> 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<ExamSafetyManual> list = examSafetyManualService.list(queryWrapper);
         return Result.success(list);
     }

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java

@@ -169,7 +169,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
                 if (isInFence) {
                     inFence = true;
                     // 人员非法闯入区域报警
-                    if (!Arrays.asList(dev.getFenceId().split(",")).contains(fence.getId().toString())) {
+                    if (dev.getFenceId() == null || !Arrays.asList(dev.getFenceId().split(",")).contains(fence.getId().toString())) {
                         if (safetyHatAlarmConfig != null && safetyHatAlarmConfig.getIllegalEnable() == 1) {
                             SafetyHatAlarm alarm = new SafetyHatAlarm();
                             alarm.setDevSn(dev.getDevSn());

src/main/java/com/zhgd/xmgl/modules/xz/special/controller/CountApiController.java

@@ -233,8 +233,8 @@ public class CountApiController {
             CountSpecialVo vo = new CountSpecialVo();
             DateTime dateTime = DateUtil.offsetDay(DateUtil.parseDate(startTime), i);
             vo.setDate(DateUtil.format(dateTime, "MM-dd"));
-            vo.setXzBlindPlatePlugSafeNum((int) n1.stream().filter(n -> n.getWorkExecutionBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
+            vo.setXzBlindPlatePlugSafeNum((int) n1.stream().filter(n -> n.getActualJobBeginTime().compareTo(DateUtil.endOfDay(dateTime)) <= 0
-                        && n.getWorkExecutionEndTime().compareTo(DateUtil.beginOfDay(dateTime)) >= 0).count());
+                        && 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

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzBlindPlatePlugSafeServiceImpl.java

@@ -73,7 +73,7 @@ public class XzBlindPlatePlugSafeServiceImpl extends ServiceImpl<XzBlindPlatePlu
         Page<XzBlindPlatePlugSafe> 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<XzBlindPlatePlugSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzGroundSafetServiceImpl.java

@@ -72,7 +72,7 @@ public class XzGroundSafetServiceImpl extends ServiceImpl<XzGroundSafetMapper, X
         Page<XzGroundSafet> 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<XzGroundSafet> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHighJobSafeServiceImpl.java

@@ -72,7 +72,7 @@ public class XzHighJobSafeServiceImpl extends ServiceImpl<XzHighJobSafeMapper, X
         Page<XzHighJobSafe> 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<XzHighJobSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzHoistSafetyWorkServiceImpl.java

@@ -72,7 +72,7 @@ public class XzHoistSafetyWorkServiceImpl extends ServiceImpl<XzHoistSafetyWorkM
         Page<XzHoistSafetyWork> 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<XzHoistSafetyWork> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzLimitSpaceSafeServiceImpl.java

@@ -72,7 +72,7 @@ public class XzLimitSpaceSafeServiceImpl extends ServiceImpl<XzLimitSpaceSafeMap
         Page<XzLimitSpaceSafe> 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<XzLimitSpaceSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzOpenCircuitSafeServiceImpl.java

@@ -72,7 +72,7 @@ public class XzOpenCircuitSafeServiceImpl extends ServiceImpl<XzOpenCircuitSafeM
         Page<XzOpenCircuitSafe> 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<XzOpenCircuitSafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

src/main/java/com/zhgd/xmgl/modules/xz/special/service/impl/XzTemporaryElectricitySafeServiceImpl.java

@@ -72,7 +72,7 @@ public class XzTemporaryElectricitySafeServiceImpl extends ServiceImpl<XzTempora
         Page<XzTemporaryElectricitySafe> 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<XzTemporaryElectricitySafe> pageList = baseMapper.queryList(page, queryWrapper, paramMap);

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);
                     }
                 }