Merge remote-tracking branch 'origin/uat' into uat

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 {

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

src/main/java/com/zhgd/xmgl/modules/quality/service/impl/QualityRegionServiceImpl.java

@@ -145,6 +145,9 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
             }
             if (Objects.equals(securityType, 2)) {
                 //质量
+                qualityRegion.setSecurityEnterpriseIds(qualityRegion.getQualityEnterpriseIds());
+                qualityRegion.setSecurityDutyIds(qualityRegion.getQualityDutyIds());
+                qualityRegion.setSecurityReviewIds(qualityRegion.getQualityReviewIds());
                 if (StrUtil.isNotBlank(qualityRegion.getQualityEnterpriseIds())) {
                     qualityRegion.setEnterpriseNames(StrUtil.split(qualityRegion.getQualityEnterpriseIds(), ",").stream().map(key -> enterpriseIdMap.get(Convert.toLong(key))).filter(Objects::nonNull).map(EnterpriseInfo::getEnterpriseName).collect(Collectors.joining(",")));
                 }

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

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<Project> projectList = projectService.list(Wrappers.<Project>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<SafetyHatDev> devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
                         .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<Project> projectList = projectService.list(Wrappers.<Project>lambdaQuery().ne(Project::getHelmetUser, "").ne(Project::getHelmetPassword, ""));
         if (CollUtil.isNotEmpty(projectList)) {
             for (Project project : projectList) {
                 List<SafetyHatDev> devList = safetyHatDevMapper.selectList(new LambdaQueryWrapper<SafetyHatDev>()
-                        .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());