From 717be14f19a74ea67285f25983dfbf36c879fa3d Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Thu, 17 Apr 2025 18:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ModelTalkController.java          | 16 +++++++++-------
 .../safetyhat/mapper/xml/SafetyHatDataMapper.xml |  5 ++++-
 .../service/impl/WorkerInfoServiceImpl.java      | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ModelTalkController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ModelTalkController.java
index 720e64f4b..3a0be98a6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ModelTalkController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ModelTalkController.java
@@ -132,14 +132,16 @@ public class ModelTalkController {
                 .baseUrl(url)
                 .build();
         Map<String, Object> param = new HashMap<>(16);
-        String[] split = fileUrl.split(",");
         List<Map<String, Object>> files = new ArrayList<>();
-        for (int i = 0; i < split.length; i++) {
-            Map<String, Object> file = new HashMap<>(16);
-            file.put("type", "image");
-            file.put("transfer_method", "remote_url");
-            file.put("url", split[i]);
-            files.add(file);
+        if(StringUtils.isNotBlank(fileUrl)) {
+            String[] split = fileUrl.split(",");
+            for (int i = 0; i < split.length; i++) {
+                Map<String, Object> file = new HashMap<>(16);
+                file.put("type", "image");
+                file.put("transfer_method", "remote_url");
+                file.put("url", split[i]);
+                files.add(file);
+            }
         }
         param.put("inputs", new JSONObject());
         param.put("query", query);
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
index d8a8b5c01..9ad61374d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml
@@ -2,9 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDataMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
-        select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name
+        select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name, ei.enterprise_name, wi.phone_number, wt.type_name workerTypeName
         from safety_hat_data shd
         left join worker_info wi on wi.id = shd.worker_info_id
+        left join team_info ti on wi.team_id = ti.id
+        left join worker_type wt on ti.worker_type_id = wt.id
+        left join enterprise_info ei on wi.enterprise_id = ei.id
         ${ew.customSqlSegment}
     </select>
 
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 fab466981..8bcc9b2c0 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
@@ -56,7 +56,9 @@ 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.SafetyHatDev;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
+import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatDevMapper;
 import com.zhgd.xmgl.modules.safetyhat.mapper.SafetyHatFenceMapper;
 import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatFenceService;
 import com.zhgd.xmgl.modules.video.mapper.AiAnalyseHardWareAlarmRecordMapper;
@@ -180,6 +182,9 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
     private WorkerInfoMapper workerInfoMapper;
     @Lazy
     @Autowired
+    private SafetyHatDevMapper safetyHatDevMapper;
+    @Lazy
+    @Autowired
     private WorkerSafeEducationWorkerMapper workerSafeEducationWorkerMapper;
     @Lazy
     @Autowired
@@ -1347,11 +1352,11 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             }
         }
         if (StringUtils.isNotBlank(MapUtils.getString(map, "locationCardno"))) {
-            List<WorkerInfo> workerInfoList = workerInfoMapper.selectList(Wrappers.<WorkerInfo>lambdaQuery()
-                    .eq(WorkerInfo::getLocationCardno, MapUtils.getString(map, "locationCardno"))
-                    .eq(WorkerInfo::getProjectSn, MapUtils.getString(map, "projectSn")));
-            if (workerInfoList.size() > 0) {
-                map.put("workerId", workerInfoList.get(0).getId());
+            List<SafetyHatDev> safetyHatDevs = safetyHatDevMapper.selectList(Wrappers.<SafetyHatDev>lambdaQuery()
+                    .eq(SafetyHatDev::getDevSn, MapUtils.getString(map, "locationCardno"))
+                    .eq(SafetyHatDev::getProjectSn, MapUtils.getString(map, "projectSn")));
+            if (safetyHatDevs.size() > 0) {
+                map.put("workerId", safetyHatDevs.get(0).getWorkerInfoId());
             }
         }
         if (StringUtils.isNotBlank(MapUtils.getString(map, "workerName"))) {