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

src/main/java/com/zhgd/xmgl/modules/safetyhat/entity/SafetyHatData.java

@@ -113,6 +113,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 fieldAcquisitionUrl;
+
     /**
      * 企业名称
      */

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml

@@ -25,8 +25,8 @@
     </select>
 
     <select id="getNewestList" resultType="com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData">
-        select shd.*, CONCAT(IFNULL(wi.worker_name, ''), IFNULL(shd.worker_info_name, '')) worker_name, ei.enterprise_name, wi.phone_number, wt.type_name workerTypeName
+        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 join (
+        wi.field_acquisition_url from safety_hat_data shd join (
         select max(upload_time) as upload_time, dev_sn
         from safety_hat_data
         where project_sn = #{projectSn}

src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDevMapper.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.vehicleposition.mapper.VehiclePositionDevMapper">
     <select id="pageList" resultType="com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev">
-        select * from (select vpd.id, vpd.project_sn, vpd.dev_sn, vpd.type, vpd.heartbeat_time, vpd.fence_id, CONCAT(IFNULL(vpd.enterprise_name, ''), IFNULL(en.enterprise_name, '')) enterpriseName,
+        select * from (select vpd.id, vpd.enterprise_ids, vpd.project_sn, vpd.dev_sn, vpd.type, vpd.heartbeat_time, vpd.fence_id, CONCAT(IFNULL(vpd.enterprise_name, ''), IFNULL(en.enterprise_name, '')) enterpriseName,
                CONCAT(IFNULL(vpd.number_plate, ''), IFNULL(ci.car_number, '')) numberPlate,
                 CONCAT(IFNULL(vpd.car_type, ''), IFNULL(ct.car_type_name, '')) carType,
                CONCAT(IFNULL(vpd.driver, ''), IFNULL(wi.worker_name, '')) driver,

src/main/java/com/zhgd/xmgl/modules/vehicleposition/service/impl/VehiclePositionDevServiceImpl.java

@@ -18,6 +18,8 @@ import com.zhgd.xmgl.modules.vehicleposition.entity.VehiclePositionDev;
 import com.zhgd.xmgl.modules.vehicleposition.entity.vo.CountVehiclePositionDevVo;
 import com.zhgd.xmgl.modules.vehicleposition.mapper.*;
 import com.zhgd.xmgl.modules.vehicleposition.service.IVehiclePositionDevService;
+import com.zhgd.xmgl.modules.worker.entity.EnterpriseInfo;
+import com.zhgd.xmgl.modules.worker.mapper.EnterpriseInfoMapper;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
 import org.apache.commons.collections.MapUtils;
@@ -46,6 +48,8 @@ public class VehiclePositionDevServiceImpl extends ServiceImpl<VehiclePositionDe
     VehiclePositionDayRecordMapper vehiclePositionDayRecordMapper;
     @Autowired
     VehiclePositionFenceMapper vehiclePositionFenceMapper;
+    @Autowired
+    private EnterpriseInfoMapper enterpriseInfoMapper;
 
     @Override
     public IPage<VehiclePositionDev> queryPageList(HashMap<String, Object> paramMap) {
@@ -127,8 +131,14 @@ public class VehiclePositionDevServiceImpl extends ServiceImpl<VehiclePositionDe
     }
 
     private List<VehiclePositionDev> dealList(List<VehiclePositionDev> list) {
+        List<EnterpriseInfo> enterpriseInfos = enterpriseInfoMapper.selectList(null);
         for (VehiclePositionDev dev : list) {
             dev.setOnline(dev.getHeartbeatTime() != null && DateUtil.between(dev.getHeartbeatTime(), new Date(), DateUnit.MINUTE) < 30 ? 1 : 0);
+            List<EnterpriseInfo> collect = enterpriseInfos.stream().filter(e -> StringUtils.isNotBlank(dev.getEnterpriseIds())
+                    && Arrays.asList(dev.getEnterpriseIds().split(",")).contains(e.getId().toString())).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                dev.setEnterpriseName(collect.stream().map(c -> c.getEnterpriseName()).collect(Collectors.joining(",")));
+            }
         }
         return list;
     }