From c50491d3f541dfecbbce66d1d7d2a5cb10e65f31 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 2 Dec 2025 16:40:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InspectTaskItemRecordController.java | 2 +- .../quality/controller/DangerTypeRecordController.java | 6 +++--- .../quality/service/impl/QualityRegionServiceImpl.java | 3 +++ .../controller/XzSecurityDangerTypeRecordController.java | 6 +++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java b/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java index a725a349d..ac3abc1bd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/inspection/controller/InspectTaskItemRecordController.java @@ -29,7 +29,7 @@ import java.util.Map; * @version： V1.0 */ @RestController -@RequestMapping("/xmgl/InspectTaskItemRecord") +@RequestMapping("/xmgl/inspectTaskItemRecord") @Slf4j @Api(tags = "检查任务-子任务") public class InspectTaskItemRecordController { diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java index 7deb54d52..add742da8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/DangerTypeRecordController.java @@ -342,11 +342,11 @@ public class DangerTypeRecordController { return vo; }).collect(Collectors.toList()); records.addAll(recordVos); - if (StrUtil.isNotBlank(projectClassify)) { - records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); - } records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); List vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); + if (StrUtil.isNotBlank(projectClassify)) { + vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); + } return Result.success(vos); } diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java index c3cef25a7..3109c456a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java @@ -145,6 +145,9 @@ public class QualityRegionServiceImpl extends ServiceImpl enterpriseIdMap.get(Convert.toLong(key))).filter(Objects::nonNull).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(","))); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java index 1b421c129..6fb8c841e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java @@ -342,11 +342,11 @@ public class XzSecurityDangerTypeRecordController { return vo; }).collect(Collectors.toList()); records.addAll(recordVos); - if (StrUtil.isNotBlank(projectClassify)) { - records = records.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); - } records = records.stream().sorted(Comparator.comparing(TopProjectClassifyTypeRecordTreeVo::getId)).collect(Collectors.toList()); List vos = BeanUtil.copyToList(ListUtils.listToTree(JSONArray.parseArray(JSON.toJSONString(records)), "id", "parentId", "children"), TopProjectClassifyTypeRecordTreeVo.class); + if (StrUtil.isNotBlank(projectClassify)) { + vos = vos.stream().filter(r -> Objects.equals(r.getProjectClassify(), projectClassify)).collect(Collectors.toList()); + } return Result.success(vos); } From 362893f098e94d84700b40a21551e95216b2f6ee Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Wed, 3 Dec 2025 09:03:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=A6=E5=BE=B7=E6=AF=8F=E7=A7=92?= =?UTF-8?q?=E6=9F=A5=E4=B8=80=E6=AC=A1=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/task/SafetyHatTask.java | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java index 8a0247ddd..b12f3cf52 100644 --- a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java +++ b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java @@ -126,16 +126,16 @@ public class SafetyHatTask { } /** - * 定时2分钟获取安全帽数据（每次处理前120个） + * 定时5分钟获取安全帽数据（每次处理前120个） */ - @Scheduled(cron = "0 */2 * * * ?") + @Scheduled(cron = "0 */5 * * * ?") @SchedulerLock(name = "getHelmetData", lockAtMostFor = 1000 * 60 * 2, lockAtLeastFor = 1000 * 10) @RequestMapping("getHelmetData") public void getHelmetData() { List projectList = projectService.list(Wrappers.lambdaQuery().ne(Project::getHelmetUser, "").ne(Project::getHelmetPassword, "")); String before7Date = DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -7)); if (CollUtil.isNotEmpty(projectList)) { - log.info("定时2分钟获取安全帽数据任务开始"); + log.info("定时5分钟获取安全帽数据任务开始"); for (Project project : projectList) { List devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper() .eq(SafetyHatDev::getProjectSn, project.getProjectSn()) @@ -163,7 +163,7 @@ public class SafetyHatTask { pJo.put("end", end); String json = pJo.toJSONString(); try { - Thread.sleep(1000); + Thread.sleep(2000); } catch (InterruptedException e) { e.printStackTrace(); } @@ -217,20 +217,27 @@ public class SafetyHatTask { @RequestMapping("setYesterdayHelmetData") public void setYesterdayHelmetData() { log.info("定时设置昨天的轨迹到数据库任务开始"); + String before7Date = DateUtil.formatDateTime(DateUtil.offsetDay(new Date(), -7)); List projectList = projectService.list(Wrappers.lambdaQuery().ne(Project::getHelmetUser, "").ne(Project::getHelmetPassword, "")); if (CollUtil.isNotEmpty(projectList)) { for (Project project : projectList) { List devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper() - .eq(SafetyHatDev::getProjectSn, project.getProjectSn())); + .eq(SafetyHatDev::getProjectSn, project.getProjectSn()) + .isNotNull(SafetyHatDev::getExtUserId) + .ge(SafetyHatDev::getHeartbeatTime, before7Date) + .orderByAsc(SafetyHatDev::getRdDataTime) + .last("limit 120") + ); for (SafetyHatDev dev : devList) { - if (StrUtil.isBlank(dev.getExtUserId())) { - log.info("定时设置昨天的轨迹到数据库任务，安全帽外部user_id没有设置,devSn:{}", dev.getDevSn()); - continue; - } DateTime yB = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1)); DateTime yE = DateUtil.endOfDay(DateUtil.offsetDay(new Date(), -1)); String start = yB.getTime() / 1000L + ""; String end = yE.getTime() / 1000L + ""; + try { + Thread.sleep(3000); + } catch (InterruptedException e) { + e.printStackTrace(); + } String url = "https://caps.runde.pro/api/index.php?ctl=location&act=get_user_path_web"; JSONObject pJo = new JSONObject(); pJo.put("admin_id", project.getHelmetUser());