From 79a7af577ba1462e05d8fd5e238919e55f1b0b52 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 13 Dec 2024 17:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E5=B8=BD=E8=B0=83=E6=95=B4(?=
 =?UTF-8?q?=E4=B8=AD=E5=8C=97=E6=B0=B4=E5=88=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/config/SafetyHatWSClient.java   |  21 ++++-----
 .../controller/SafetyHatDevController.java    |  40 +++++++++---------
 .../safetyhat/entity/SafetyHatAlarm.java      |   6 +++
 .../safetyhat/entity/SafetyHatData.java       |  14 ++++++
 .../safetyhat/entity/SafetyHatDev.java        |  13 ++++--
 .../mapper/xml/SafetyHatAlarmMapper.xml       |   2 +-
 .../mapper/xml/SafetyHatDataMapper.xml        |   5 ++-
 .../mapper/xml/SafetyHatDevMapper.xml         |   2 +-
 .../impl/SafetyHatAlarmServiceImpl.java       |   1 +
 .../impl/SafetyHatDataServiceImpl.java        |   6 +--
 .../service/impl/SafetyHatDevServiceImpl.java |  28 +++++++++---
 .../com/zhgd/xmgl/task/SafetyHatTask.java     |   2 +
 .../java/com/zhgd/xmgl/util/ExcelUtils.java   |  13 +++++-
 .../resources/excel/安全帽设备导入模板.xlsx   | Bin 9545 -> 10204 bytes
 14 files changed, 105 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java
index 05de7fb46..2996dfa26 100644
--- a/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java
+++ b/src/main/java/com/zhgd/xmgl/config/SafetyHatWSClient.java
@@ -86,16 +86,16 @@ public class SafetyHatWSClient {
                                     JSONObject joLocationInfo = joData.getJSONObject("location_info");
                                     if (joLocationInfo != null) {
                                         //纬度(坐标系：高德地图 GCJ-02)
-                                        Double xPoint = joLocationInfo.getDouble("x_point");
-                                        Double yPoint = joLocationInfo.getDouble("y_point");
-                                        Long ctime = joLocationInfo.getLong("ctime");
-                                        SafetyHatData data = new SafetyHatData();
-                                        data.setWorkerInfoId(dev.getWorkerInfoId());
-                                        data.setDevSn(dev.getDevSn());
-                                        data.setLatitude(xPoint);
-                                        data.setLongitude(yPoint);
-                                        data.setUploadTime(new Date(ctime * 1000L));
-                                        data.setProjectSn(dev.getProjectSn());
+//                                        Double xPoint = joLocationInfo.getDouble("x_point");
+//                                        Double yPoint = joLocationInfo.getDouble("y_point");
+//                                        Long ctime = joLocationInfo.getLong("ctime");
+//                                        SafetyHatData data = new SafetyHatData();
+//                                        data.setWorkerInfoId(dev.getWorkerInfoId());
+//                                        data.setDevSn(dev.getDevSn());
+//                                        data.setLatitude(xPoint);
+//                                        data.setLongitude(yPoint);
+//                                        data.setUploadTime(new Date(ctime * 1000L));
+//                                        data.setProjectSn(dev.getProjectSn());
                                         try {
                                             //不从这里获取实时坐标，因为从这里获取的轨迹没有经过过滤
                                             //SpringContextUtils.getBean(ISafetyHatDataService.class).add(data);
@@ -173,6 +173,7 @@ public class SafetyHatWSClient {
                         alarm.setLongitude(xPoint);
                         alarm.setFenceId(dev.getFenceId());
                         alarm.setType(dev.getType());
+                        alarm.setWorkerInfoName(dev.getWorkerInfoName());
                         if (dev.getType() == 2) {
                             alarm.setAlarmInfo(jo.getString("msg"));
                         }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java
index aadcf4101..a952c2656 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDevController.java
@@ -36,10 +36,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -205,15 +202,19 @@ public class SafetyHatDevController {
     @GetMapping(value = "/enterprise/tree/list")
     public Result<List<QueryEnterpriseTreeVo>> queryEnterpriseTreeList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
         List<SafetyHatDev> safetyHatDevs = safetyHatDevService.queryList(paramMap);
-        List<Long> workerIds = safetyHatDevs.stream().map(safetyHatDev -> safetyHatDev.getWorkerInfoId()).collect(Collectors.toList());
-        if (CollUtil.isEmpty(workerIds)) {
-            workerIds.add(-1L);
+//        List<Long> workerIds = safetyHatDevs.stream().map(safetyHatDev -> safetyHatDev.getWorkerInfoId()).collect(Collectors.toList());
+//        if (CollUtil.isEmpty(workerIds)) {
+//            workerIds.add(-1L);
+//        }
+//        List<WorkerInfo> workerInfos = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>().in(WorkerInfo::getId, workerIds));
+        List<String> enterpriseIds = new ArrayList<>();
+        for (SafetyHatDev safetyHatDev : safetyHatDevs) {
+            enterpriseIds.addAll(Arrays.asList(safetyHatDev.getEnterpriseIds().split(",")));
         }
-        List<WorkerInfo> workerInfos = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>().in(WorkerInfo::getId, workerIds));
-        List<Long> enterpriseIds = workerInfos.stream().map(WorkerInfo::getEnterpriseId).collect(Collectors.toList());
-        Map<Long, List<WorkerInfo>> enterpriseMap = workerInfos.stream().collect(Collectors.groupingBy(WorkerInfo::getEnterpriseId));
+//        List<Long> enterpriseIds = safetyHatDevs.stream().map(WorkerInfo::getEnterpriseId).collect(Collectors.toList());
+//        Map<Long, List<WorkerInfo>> enterpriseMap = workerInfos.stream().collect(Collectors.groupingBy(WorkerInfo::getEnterpriseId));
         if (CollUtil.isEmpty(enterpriseIds)) {
-            enterpriseIds.add(-1L);
+            enterpriseIds.add("-1");
         }
         List<EnterpriseInfo> enterpriseInfos = enterpriseInfoService.list(new LambdaQueryWrapper<EnterpriseInfo>().in(EnterpriseInfo::getId, enterpriseIds));
         List<QueryEnterpriseTreeVo> rt = new ArrayList<>();
@@ -221,14 +222,15 @@ public class SafetyHatDevController {
             QueryEnterpriseTreeVo vo = new QueryEnterpriseTreeVo();
             vo.setName(enterpriseInfo.getEnterpriseName());
             vo.setEnterpriseId(enterpriseInfo.getId());
-            List<SafetyHatDev> hatDevs = safetyHatDevs.stream().filter(safetyHatDev -> {
-                safetyHatDev.setName(safetyHatDev.getWorkerName());
-                List<WorkerInfo> l = enterpriseMap.get(enterpriseInfo.getId());
-                if (CollUtil.isNotEmpty(l)) {
-                    return l.stream().anyMatch(workerInfo -> safetyHatDev.getWorkerInfoId().equals(workerInfo.getId()));
-                }
-                return false;
-            }).collect(Collectors.toList());
+//            List<SafetyHatDev> hatDevs = safetyHatDevs.stream().filter(safetyHatDev -> {
+//                safetyHatDev.setName(safetyHatDev.getWorkerName());
+//                List<WorkerInfo> l = enterpriseMap.get(enterpriseInfo.getId());
+//                if (CollUtil.isNotEmpty(l)) {
+//                    return l.stream().anyMatch(workerInfo -> safetyHatDev.getWorkerInfoId().equals(workerInfo.getId()));
+//                }
+//                return false;
+//            }).collect(Collectors.toList());
+            List<SafetyHatDev> hatDevs = safetyHatDevs.stream().filter(s -> s.getEnterpriseIds().contains(enterpriseInfo.getId().toString())).collect(Collectors.toList());
             vo.setSafetyHatDevs(hatDevs);
             rt.add(vo);
         }
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java
index cb7877419..b342bdd8f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatAlarm.java
@@ -37,6 +37,12 @@ public class SafetyHatAlarm implements Serializable {
     @Excel(name = "人员id", width = 15)
     @ApiModelProperty(value = "人员id")
     private java.lang.Long workerInfoId;
+    /**
+     * 人员姓名
+     */
+    @Excel(name = "人员姓名", width = 15)
+    @ApiModelProperty(value = "人员姓名")
+    private java.lang.String workerInfoName;
     /**
      * 设备序号
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
index 2d48b04f1..4e629519f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java
@@ -38,6 +38,12 @@ public class SafetyHatData implements Serializable {
     @Excel(name = "人员id", width = 15)
     @ApiModelProperty(value = "人员id")
     private java.lang.Long workerInfoId;
+    /**
+     * 人员姓名
+     */
+    @Excel(name = "人员姓名", width = 15)
+    @ApiModelProperty(value = "人员姓名")
+    private java.lang.String workerInfoName;
     /**
      * 设备序号
      */
@@ -104,6 +110,14 @@ public class SafetyHatData implements Serializable {
     @TableField(exist = false)
     private java.lang.String workerName;
 
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称", width = 15)
+    @ApiModelProperty(value = "企业名称")
+    @TableField(exist = false)
+    private java.lang.String enterpriseName;
+
     @TableField(exist = false)
     @ApiModelProperty(value = "身份证号")
     private java.lang.String idCard;
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java
index 4df7ef9d5..c6d8fc20a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatDev.java
@@ -1,9 +1,6 @@
 package com.zhgd.xmgl.modules.safetyhat.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,7 +33,15 @@ public class SafetyHatDev implements Serializable {
      */
     @Excel(name = "人员id", width = 15)
     @ApiModelProperty(value = "人员id")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private java.lang.Long workerInfoId;
+    /**
+     * 人员姓名
+     */
+    @Excel(name = "人员姓名", width = 15)
+    @ApiModelProperty(value = "人员姓名")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
+    private java.lang.String workerInfoName;
     /**
      * 设备序号
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
index 75a8a9655..85e937f63 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml
@@ -2,7 +2,7 @@
 <!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.SafetyHatAlarmMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatAlarm">
-        select sha.*, wi.worker_name, hf.fence_name
+        select sha.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(sha.worker_info_name, '')) worker_name, hf.fence_name
         from safety_hat_alarm sha
         left join worker_info wi on wi.id = sha.worker_info_id
         left join safety_hat_fence hf on hf.id = sha.fence_id
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 5e2baf598..6b258bd08 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,7 +2,7 @@
 <!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.*, wi.worker_name
+        select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name
         from safety_hat_data shd
         left join worker_info wi on wi.id = shd.worker_info_id
         ${ew.customSqlSegment}
@@ -22,7 +22,7 @@
     </select>
 
     <select id="getNewestList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
-        select shd.*, wi.worker_name from safety_hat_data shd join (
+        select shd.*, wi.worker_name, ei.enterprise_name from safety_hat_data shd join (
         select max(upload_time) as upload_time, dev_sn
         from safety_hat_data
         where project_sn = #{projectSn}
@@ -35,6 +35,7 @@
         group by dev_sn
         )t on t.upload_time=shd.upload_time and t.dev_sn=shd.dev_sn
         left join worker_info wi on wi.id = shd.worker_info_id
+        left join enterprise_info ei on wi.enterprise_id = ei.id
         group by t.dev_sn
     </select>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml
index 32d56356b..90dbc87f3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDevMapper.xml
@@ -2,7 +2,7 @@
 <!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.SafetyHatDevMapper">
     <select id="queryList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev">
-        select shd.*,wi.worker_name, hf.fence_name
+        select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name, hf.fence_name
         from safety_hat_dev shd
         left join worker_info wi on wi.id = shd.worker_info_id
         left join safety_hat_fence hf on hf.id = shd.fence_id
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
index 3c7cf10dd..2930ed595 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java
@@ -87,6 +87,7 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
             safetyHatAlarm.setAlarmInfo(str);
         }
         safetyHatAlarm.setWorkerInfoId(dev.getWorkerInfoId());
+        safetyHatAlarm.setWorkerInfoName(dev.getWorkerInfoName());
         safetyHatAlarm.setProjectSn(dev.getProjectSn());
         safetyHatAlarm.setId(null);
         baseMapper.insert(safetyHatAlarm);
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
index 13c79bfab..cc1a026fe 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java
@@ -120,6 +120,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
         safetyHatData.setProjectSn(dev.getProjectSn());
         safetyHatData.setId(null);
         safetyHatData.setWorkerInfoId(dev.getWorkerInfoId());
+        safetyHatData.setWorkerInfoName(dev.getWorkerInfoName());
         baseMapper.insert(safetyHatData);
 
         if (dev.getType() == 1) {
@@ -266,7 +267,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
                     data.setUploadTime(new Date(time * 1000L));
                     data.setProjectSn(dev.getProjectSn());
                     data.setIsPlatformData(1);
-                    data.setWorkerName(dev.getWorkerName());
+                    data.setWorkerInfoName(dev.getWorkerInfoName());
                     hatDataArrayList.add(data);
                 }
                 return CollUtil.reverse(hatDataArrayList);
@@ -291,8 +292,7 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
         String projectSn = MapUtils.getString(param, "projectSn");
         List<SafetyHatData> datas = safetyHatDataMapper.selectList(new LambdaQueryWrapper<SafetyHatData>()
                 .eq(SafetyHatData::getProjectSn, projectSn)
-                .ge(SafetyHatData::getUploadTime, DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6)))
-        );
+                .ge(SafetyHatData::getUploadTime, DateUtil.formatDate(DateUtil.offsetDay(new Date(), -6))));
         List<SafetyHatFence> regions = safetyHatFenceService.queryList(new MapBuilder<String, Object>()
                 .put("projectSn", projectSn)
                 .build());
diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java
index e5409c2c3..be5bedcfe 100644
--- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDevServiceImpl.java
@@ -147,7 +147,8 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
     public void exporExcelSafeDevTemplate(HttpServletResponse response, String projectSn) {
         List<SafetyHatFence> fenceList = safetyHatFenceMapper.selectList(Wrappers.<SafetyHatFence>lambdaQuery()
                 .eq(SafetyHatFence::getProjectSn, projectSn));
-        ExcelUtils.exporExcelSafeDevTemplate(response, fenceList);
+        List<EnterpriseInfo> enterpriseInfoList = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, null);
+        ExcelUtils.exporExcelSafeDevTemplate(response, fenceList, enterpriseInfoList);
     }
 
     @Override
@@ -155,6 +156,7 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
     public void importExcelTemplate(MultipartFile excelFile, String projectSn, Integer type) throws Exception {
         List<SafetyHatFence> safetyHatFenceList = safetyHatFenceMapper.selectList(Wrappers.<SafetyHatFence>lambdaQuery()
                 .eq(SafetyHatFence::getProjectSn, projectSn));
+        List<EnterpriseInfo> enterpriseInfoList = enterpriseInfoMapper.selectBySnAndNumberOneList(projectSn, null);
         if (StrUtil.isBlank(projectSn)) {
             throw new OpenAlertException("projectSn不能为空");
         }
@@ -168,37 +170,49 @@ public class SafetyHatDevServiceImpl extends ServiceImpl<SafetyHatDevMapper, Saf
             String name = m.get("人员名称");
             String devSn = m.get("设备序号");
             String fenceName = m.get("围栏名称");
+            String enterpriseName = m.get("分包单位");
             Long fenceId = null;
+            Long enterpriseId = null;
             if (!"".equals(fenceName) && !"#N/A".equals(fenceName)) {
                 List<SafetyHatFence> hatFences = safetyHatFenceList.stream().filter(s -> s.getFenceName().equals(fenceName)).collect(Collectors.toList());
                 if (hatFences.size() > 0) {
                     fenceId = hatFences.get(0).getId();
                 }
             }
+            if (!"".equals(enterpriseName) && !"#N/A".equals(enterpriseName)) {
+                List<EnterpriseInfo> enterpriseInfos = enterpriseInfoList.stream().filter(s -> s.getEnterpriseName().equals(enterpriseName)).collect(Collectors.toList());
+                if (enterpriseInfos.size() > 0) {
+                    enterpriseId = enterpriseInfos.get(0).getId();
+                }
+            }
             List<WorkerInfo> workerInfos = workerInfoMapper.selectList(new LambdaQueryWrapper<WorkerInfo>()
                     .eq(WorkerInfo::getProjectSn, projectSn)
                     .eq(WorkerInfo::getInserviceType, 1)
             );
             Map<String, WorkerInfo> nameMap = workerInfos.stream().collect(Collectors.toMap(WorkerInfo::getWorkerName, Function.identity(), (workerInfo, workerInfo2) -> null));
             WorkerInfo workerInfo = nameMap.get(name);
-            if (workerInfo == null) {
-                sb.append(devSn + ",");
-                return;
-            }
+//            if (workerInfo == null) {
+//                sb.append(devSn + ",");
+//                return;
+//            }
             SafetyHatDev oneDev = safetyHatDevMapper.selectOne(new LambdaQueryWrapper<SafetyHatDev>()
                     .eq(SafetyHatDev::getDevSn, devSn));
             if (oneDev != null) {
-                oneDev.setWorkerInfoId(workerInfo.getId());
+                oneDev.setWorkerInfoId(workerInfo == null ? null : workerInfo.getId());
                 oneDev.setProjectSn(projectSn);
                 oneDev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
+                oneDev.setEnterpriseIds(enterpriseId == null ? "" : String.valueOf(enterpriseId));
+                oneDev.setWorkerInfoName(workerInfo == null ? name : "");
                 baseMapper.updateById(oneDev);
             } else {
                 SafetyHatDev dev = new SafetyHatDev();
-                dev.setWorkerInfoId(workerInfo.getId());
+                dev.setWorkerInfoId(workerInfo == null ? null : workerInfo.getId());
                 dev.setDevSn(devSn);
                 dev.setProjectSn(projectSn);
                 dev.setFenceId(fenceId == null ? "" : String.valueOf(fenceId));
+                dev.setEnterpriseIds(enterpriseId == null ? "" : String.valueOf(enterpriseId));
                 dev.setType(type);
+                dev.setWorkerInfoName(workerInfo == null ? name : "");
                 baseMapper.insert(dev);
             }
         });
diff --git a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
index f221c4761..19ad5f6d5 100644
--- a/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java
@@ -169,6 +169,7 @@ public class SafetyHatTask {
                             data.setProjectSn(dev.getProjectSn());
                             data.setIsPlatformData(1);
                             data.setType(dev.getType());
+                            data.setWorkerInfoName(dev.getWorkerInfoName());
                             safetyHatDataService.add(data);
                         }
                     } else {
@@ -241,6 +242,7 @@ public class SafetyHatTask {
                             data.setUploadTime(new Date(time * 1000L));
                             data.setProjectSn(dev.getProjectSn());
                             data.setIsPlatformData(1);
+                            data.setWorkerInfoName(dev.getWorkerInfoName());
                             safetyHatDataMapper.insert(data);
                         }
                     } else {
diff --git a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
index cadb2acd9..d9e5c4be6 100644
--- a/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
+++ b/src/main/java/com/zhgd/xmgl/util/ExcelUtils.java
@@ -3,6 +3,7 @@ package com.zhgd.xmgl.util;
 import com.zhgd.jeecg.common.mybatis.EntityMap;
 import com.zhgd.xmgl.modules.exam.entity.ExamSubject;
 import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatFence;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
 import com.zhgd.xmgl.modules.worker.entity.WorkerSafeEducationWorker;
 import com.zhgd.xmgl.modules.worker.entity.WorkerType;
 import lombok.extern.slf4j.Slf4j;
@@ -253,7 +254,7 @@ public class ExcelUtils {
         }
     }
 
-    public static void exporExcelSafeDevTemplate(HttpServletResponse response, List<SafetyHatFence> fenceList) {
+    public static void exporExcelSafeDevTemplate(HttpServletResponse response, List<SafetyHatFence> fenceList, List<EnterpriseInfo> enterpriseInfoList) {
         try {
             ClassPathResource classPathResource = new ClassPathResource("excel/安全帽设备导入模板.xlsx");
             InputStream inputStream = classPathResource.getInputStream();
@@ -268,6 +269,16 @@ public class ExcelUtils {
                     cell1.setCellValue(fenceList.get(i).getFenceName());
                 }
             }
+            //分包单位下拉列
+            XSSFSheet sheet3 = workbook.getSheet("分包单位");
+            if (enterpriseInfoList.size() > 0) {
+                for (int i = 0; i < enterpriseInfoList.size(); i++) {
+                    XSSFRow row1 = sheet3.createRow(i);
+                    XSSFCell cell1 = row1.createCell(0);
+                        cell1.setCellType(CellType.STRING);
+                    cell1.setCellValue(enterpriseInfoList.get(i).getEnterpriseName());
+                }
+            }
             downLoadExcel("安全帽设备导入模板.xlsx", response, workbook);
         } catch (IOException e) {
             log.error("error：", e);
diff --git a/src/main/resources/excel/安全帽设备导入模板.xlsx b/src/main/resources/excel/安全帽设备导入模板.xlsx
index f58bd1e91d886d3dc8b6260ed84a2905b8b1a729..cbe4d143a3317b79f94b18679f330a2c1a4280b9 100644
GIT binary patch
delta 4141
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
R_S-Qd;l>hz5##y&_8&x_Lw^7O

delta 3542
zcmZ8k2Q*w;7oHhLAH75!-S7}KN`xWNdx?-}G5U-lgNTp}5)w7!YLg%j(W4GR2+<NH
zdWsgkmk@%8_K&=`R{ocB*1c<;b?-TQ-@W(u?eC78b{ZroQXg2Dd8>j!Age@mZakSR
zW8_Bo1|!aAh@DBiUOYUSqrz#2k4W@(Qlci@@Vr9}M>5=I3;{I*KB)G0GWE0ptJ<5p
zrpM1TCf^7HuD0bg5H5F1^)&`%vSNF;HMRLvA}|4V*XwdC@@2PZgv_zj)dNQNwi!D>
zl{VL9=V=8s*daR*gNP%Kv86e@bW-%pnT3}5x&hz0@5a<AZ5}ei9Oc60oGurd#OJ(c
zYqL*M+)O@)+)})@PbCRl+@Q^2YnPfQ3^ZqTNAaFjWQ|&S(kWhWd%sW)>}oMk3o(|K
zQFwXdh{^pkO;)LKP;R(+it`;_^aC9ZKJkv7vF&#Ut)GVs1+ym`6)U;d4ZVnBy2kv`
z>rVFlxJ#&~zHS8|wZ43be#bYki!oy}c9I~E;rX$I(hWxq_{OVG>}_Q}?R_d8K4ykw
z<g6eNhzj(;WCqz%s}^hx)PVW$#wM*Yj1hZ!;{sdi6&W?i5(PGmm1qM!*05pQ-Ky$`
z86D@UF3{;BXCOS3y<tFA7Td%5AFuZpdOAjKmBcJTUs&dH3Or$C4P(l+a+B2xB<hDm
z3NF?qHXvZJ{S-W0i|=#^1!)MW@!?9yDqAfgAr_U*m6f~4);b&|;_(&#cuGbyJ=NL|
zZczV*jl(nqtSmA|j^4Dx_1%EQ7RNuV(Gyp7*}=q6@IxaZ3THNCj1kA*ZkLZ9jr1de
zO-c^)XwG}jekJC5wD-QgStMU-UF`A^?R@``Rl}&v=jmmX>&i81WRNJ7g}wHy_g(2~
zxvrpVS2!muSN>uj-}h9;|F8>d7@m6u_i-%S;5;rNcOhzaLpdXiUVL%NAK#NMb7M)$
z7hZ37VI1<;5zish=|Elh@pn`2u=>*akCUjQG&+=OdZJ|ty-ib-?l^c$bZ@$;qY3=q
zXdl@PUXvgdFcSm>Vj<<g#Rp}E^YQgNiwXct$k^}~Mjk1^uRTsufb;W7+5{&jU`CNQ
zmDaFD+J_t1!pmy624*+u`_$xt7Y_SNJcPk}tm1F@AoMIHYZMix%|kUeQBxj64@)_7
zoy3)8Vb&w-#+Bwc=Po*<^XvltH1uzc45<Qwof-x*<06c27v4f)3U|$RkNPVuYUJHp
zkl}bUsxe#c&M(Wfl+q3J1BYxQox7O)z_B5h0OB0WUEFPKq%_pW)hx+16q0IH<ty8Q
zPW`EXGmmAo1+w#kcIeZW$BjaTxUg56@FC^HSZvR2zPH$SN!supT)IP*Ij1K0hU~XB
z*aaQ{VKfz(_NKU1!~3wf$G+k~wo#PU08ZOf6t3O)&^*I38l65{u<NPUy2J@g-k;jP
zn(F8VPv8Ow<eD_o%^&aMND=HN2P!Bz@v_plyfJZB&DakzjIV{hF}z)={+0(dxT0UQ
zo)T?fRfI?)DiJU*0-RB%=j`u>GfcJUZW?a##sY5j#keK$UG9UPr-Vge_q}R2w66m}
zbpD3IG~JVN)*{=y!|uiI*1+_jBx8YUPyTuC%|prHeZl3}Yx^`HPFV%@dA95fJk9hr
zjn}deDl1FR(@rX}1}okWz#nsLQPMu(vSt0jLNUZC?bV`hTBVhWU0Op)R&!WeSc=}y
zJGn35BVS|Ozp<Izv|252*PUr+9NB6wd$v@3`D?6_h)!K$JO8?8a{i2eS+6Qy>-#ge
zkAo#wgZ0`{qOT!Je1}rc(?CMzmhrEoS6)2YTF`7axi`ZCR`$8@<fm5lob90L)Y~XY
zan=CY*i03KrFu;Mb{fmXvs%mk{S3v6b+u5Kik7DJw4{yG_4g7y4T2ubwFhKj<_iU%
zWGG84)ine;?yUOtKW2XD9r<M^ZM{;dCk_Qos{E*|^s`u^++bfEUSXPd0P@1y3h1lE
zPx!iB{ZJJ4sGP!>!(u{gW&8dsVjCeoQB1G)rJVA)Og>;nEmU4Bs&nXWhB0%6sO|p6
zwGbutjdun1kM`ngWHsyFwnWZB^=pBv14_!t^LgIk{sy&h=h}+zy;WNsgb$<si&xJT
zYX-W$Dt=pY3pUX$!b{uE_+vr^KfC+Jn@AK^YqsuIKG@#gn{?E0;C-J*NxX!azO?oi
z|MUSUuHB*ry_^#L9F5T57gn8q4<lRp?16bSh+wDa^qwuv)@ArGtMC8b){`!tdrNcb
zH54O791O3&JXwg~s=N`M88}&-bZxd@KcZQgY{a#XIi%_c=6V7;MK^#H<08JKYycB4
z(O#v%@B6mOb(5g|ophbj>@Cb$KacA;R~JivoF~@Z@3dI$<7ExnkgSox&FAUL0>w)C
z1?7nmQ`F;Rbe(?k2|+B|4wp>JKQgbAbJI4PNRkUg<lp#!I>Yo-s_A6*-lSxybB=Vy
zY(huN@e5FdRh~qDSIgF#{{|InOnw($DXPCkQBHFFYy5R~#p*V8uf$y&v@|+4)4fpp
z$@`#{>{ROd<b|4xjyK{E6$9JZ${z+OA(!(q+giW{nJwCn#7@@eDBauc#G)EscPl+D
z%jd{x=RB%EsoPlGJFM-UO?dFqJN2}uM6R2dmVIIPFTt(i4gEuxNel-g2Z0#=`TRg1
z9NO8(2mK4CmYUcx8O8>VB{<cDw?SpHUS#f@Xh{Vm4|)7*RepFfB8EzvM%ca{@iS7L
zKUFQ;(QDG&qLPI}oF*gXJP&=Kd*^a{quUg1Vl)k(X5bPMc}tq6ONl9@sfz+kZh&&Y
zJBcbsO<l>J(mven@fVwGbr;|ZWtx%*PyW<HE|7fX`CBgpS4)qHxJz8M{yasY4zpcB
zG^4%zoJucek?efAWm<<iSGJ_5iAAChx+OqNkh*m=sZ3%NamLiJtK-!w)l^<xb9G^G
zAHS2$a*(E?xS+CJ;cz0yn+HhjQx`)5egvi)PicNQK3Ad;wSLpM)8zHkIq3N=+KT%8
zh*H5NXc$Uutvv8PR>B*zqqErf@uC=436oB7T<FWo6SjVKv$b(o@)(IJEMDweMZP61
z;s>8+`zB2_Ook_@>r3F({(k!Lws-#ugOy;GR2@8aIvgDT`l3^wtPnoQtf7}~j$eYk
zB|L?_#V*l3p2MhZ4q@h=)i2MF_cg*F)Vz$IFYf%Pkg64B!Qf|}gY_s|*q|u5U|c?7
zu>E4jGyhzL$4%t3=1MYpouhze7s9ADeg27VgM8nU#LPL&7vNS9(MIYvu57W`bkEjt
z3zPVqczig5Q#q)8f>(A3JN87#(aI~Cep3$eKkWPlCr+@&($Z5bqH|8cpi2e<ae)9Y
z5gz>O$K75ev7x;eaeOcBj?~y4GlMyd0sq*iBhd9Ycw5SSx4}<%$7!t@q_0vQcXNj3
zUM8m}@rdvCx2P~xcQzM&8i@D2kvlgOKL7PACwWDU&R%bJI1_bE`+Cm;EV$<zb9IIo
zlf9(42jM6t$*Nk}!ysLk`+PO+y#>TYq1X6Q`d6BS{AGa7j{zaA);@ut3f`v5=DA~Z
zJT~?*;L3DyaXi`8MrMJick1-~2E1G@&?eQWSpKqi8ZWpeS3(yuE{=aqcXn_HuXALH
zoaLSlVgr(f2vV|hXt|I&-@n-t`*`x1I}3rc%`PW&extDsKaSh~4=Bv1!mD{thz?5v
zN;33R3IL8mZ1|F-ZfwhGSdxD-B)+`t>|}nKEleBU&0hGO%r00<a^`_rWXohA^WV%#
z5cA<nxV5^)-W`;(13|)83%QQz{b~D1#3|Quv=_Ila>p2M6K-xJBH=FJjz*s2`!Ye7
zk7h_St8PzEmi?*QYo6jn?$&!Rm(T(g5`?wJ1`90Wohd^4SHJizW5~IOY|!Nco18Qi
z1<qTQ*^}I2U<sGbA-C&2U4+fXL5oYcu2gGYvq33=oGv$5%IGZbh|?h=D{~)SUJ{(|
z5pJDebm^f_O9HGkJ)L|p5y)Dr>SB6Yil`zVv^f*afA5tmRANV%TEOeaPRL^^`_SD@
zdz}D$0D1<JBfn0dgmvpIX#FUfv55w)2vMje4in<lL(Oa;mn>a_N9%KNlDnh2c2|4@
z$l{hbanB8*4g0(2Df>Ip!FTIrPH@->&YNlHax*!z)}e=PF$p)HdA$mJ?eqL=854FH
z<vWi&{xQ{)qxzGi&A<@WUnKoY3-kVw6H?8R1{lOoy6eJ88Pb3h@Bn`c$wA)p03U>`
ze*caDvcihozmzm7p)Mq4!gRWmH2&HA2nZ7v=KfRr{eI30yb(r%eE_hCjLLW3UoFEC
z=Zf(=`-g+b|3c}Pg?~+O^O1lh$@6FP`E4Vb0jLx~!ZMiu=}7)T7*{{QSBM{gi_$|>
zse!YiijeEnfSafY&*~o({`-&zj6lBVd2j+SD=NVKTZMr@Xa4c!UuPNsxR^G?g%aQw
bW8;=PrF}C)D8=b3%%o{d>I@6~r>p+~-<md7