From e4c5f753dbbf253d3e0754290a97443a88c99845 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 11 Oct 2024 19:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/controller/QualityRegionController.java    |  2 +-
 .../modules/quality/service/IQualityRegionService.java |  2 +-
 .../quality/service/impl/QualityRegionServiceImpl.java | 10 +++++-----
 .../worker/service/impl/WorkerInfoServiceImpl.java     | 10 ++++++----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
index 1a207d40e..16fb1e1e9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java
@@ -123,7 +123,7 @@ public class QualityRegionController {
     @ApiOperation(value = "查询区域人数", notes = "查询区域人数", httpMethod = "POST")
     @PostMapping(value = "/queryRegionWorker")
     public Result<Object> queryRegionWorker(QualityRegion qualityRegion) {
-        return Result.success(qualityRegionService.queryRegionWorker(qualityRegion));
+        return Result.success(qualityRegionService.queryRegionWorker(qualityRegion.getId().toString()).size());
     }
 
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
index 41db5fcee..da6ba6a18 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/service/IQualityRegionService.java
@@ -65,5 +65,5 @@ public interface IQualityRegionService extends IService<QualityRegion> {
      */
     QualityRegion queryBindRegion();
 
-    int queryRegionWorker(QualityRegion qualityRegion);
+    List<Long> queryRegionWorker(String id);
 }
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 7e4f88f04..8b1a031a1 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
@@ -301,10 +301,10 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
     }
 
     @Override
-    public int queryRegionWorker(QualityRegion qualityRegion) {
-        QualityRegion byId = this.getById(qualityRegion.getId());
+    public List<Long> queryRegionWorker(String id) {
+        QualityRegion byId = this.getById(id);
         List<SafetyHatData> dataList = safetyHatDataMapper.getNewestDataGroupByProjectSn(byId.getProjectSn());
-        int workerNum = 0;
+        List<Long> workerIds = new ArrayList<>();
         if (CollUtil.isNotEmpty(dataList)) {
             for (SafetyHatData d : dataList) {
                 boolean inFence = false;
@@ -322,11 +322,11 @@ public class QualityRegionServiceImpl extends ServiceImpl<QualityRegionMapper, Q
                     inFence = RegionUtil.isInPolygon(d.getLongitude(), d.getLatitude(), lon, lat);
                 }
                 if (inFence) {
-                    workerNum++;
+                    workerIds.add(d.getWorkerInfoId());
                 }
             }
         }
-        return workerNum;
+        return workerIds;
     }
 
     private void deleteRegion(Long id) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 792612ff0..ec1f6f012 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -55,6 +55,7 @@ import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo;
 import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService;
+import com.zhgd.xmgl.modules.quality.service.IQualityRegionService;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
 import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
@@ -269,7 +270,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     @Autowired
     private IExamTrainRecordService examTrainRecordService;
     @Autowired
-    private ISafetyHatFenceService safetyHatFenceService;
+    private IQualityRegionService qualityRegionService;
     /**
      * 人员管理分页
      *
@@ -281,9 +282,10 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
         // 区域人员
         String qualityRegionId = MapUtils.getString(map, "qualityRegionId");
         if (StringUtils.isNotEmpty(qualityRegionId)) {
-            String workerInFence = safetyHatFenceService.getWorkerInFence(qualityRegionId);
-            if (StringUtils.isNotEmpty(workerInFence)) {
-                map.put("workerInfos", workerInFence);
+            List<Long> workerIds = qualityRegionService.queryRegionWorker(qualityRegionId);
+            if (workerIds.size() > 0) {
+                String collect = workerIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+                map.put("workerInfos", collect);
             }
         }
         int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());