feat: 增加注册列表显示

guzijian
1 parent 7022fa14
Showing 13 changed files with 150 additions and 14 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/global/GlobalDriverInfoCache.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/equipment/mapper/EquipmentMapper.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/domain/EquipmentDriverExpand.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/domain/SignInExpand.java
ruoyi-admin/src/main/resources/application-druid-dev.yml
ruoyi-admin/src/main/resources/application-druid-uat.yml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
ruoyi-admin/src/main/resources/mapper/equipment/EquipmentMapper.xml
 package com.ruoyi.common.global;
 import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.pojo.domain.SignInExpand;
+import com.ruoyi.utils.ConstDateUtil;
 import org.springframework.stereotype.Component;
 import java.security.Principal;
@@ -12,18 +14,42 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 @Component
 public class GlobalDriverInfoCache {
-    private final ConcurrentHashMap<String, List<SignIn>> userCurrentMap = new ConcurrentHashMap();
+    /**
+     * 上午签到汇总
+     */
+    private final ConcurrentHashMap<String, List<SignInExpand>> morningUserSignInMap = new ConcurrentHashMap();
+    /**
+     * 下午签到汇总
+     */
+    private final ConcurrentHashMap<String, List<SignInExpand>> afternoonUserSignInMap = new ConcurrentHashMap();
     /**
-     * 驾驶员签到
+     * 驾驶员签到成功
+     *
      * @param signIn
      */
-    public void putDriver(SignIn signIn) {
-        if (Objects.isNull(userCurrentMap.get(signIn.getJobCode()))) {
-            userCurrentMap.put(signIn.getJobCode(), new ArrayList<>(Arrays.asList(signIn)));
-        } else {
-            userCurrentMap.get(signIn.getJobCode()).add(signIn);
+    public void putDriverSignInSuccess(SignIn signIn) {
+        ConcurrentHashMap<String, List<SignInExpand>> userCurrentMap = null;
+        int hour = Integer.parseInt(ConstDateUtil.formatDate("HH"));
+        if (hour >= 0 && hour < 12) {
+            userCurrentMap = morningUserSignInMap;
+            if (Objects.isNull(userCurrentMap.get(signIn.getJobCode()))) {
+                SignInExpand signInExpand = new SignInExpand();
+                signInExpand.setJobCode(signIn.getJobCode());
+                signInExpand.setMorningSignInIds(signInExpand.getMorningSignInIds() + signIn.getId() + ",");
+                userCurrentMap.put(signIn.getJobCode(), new ArrayList<>(Arrays.asList(signInExpand)));
+            } else {
+                userCurrentMap.get(signIn.getJobCode()).add(null);
+            }
+        }else {
+            userCurrentMap = afternoonUserSignInMap;
         }
+        /**
+         * 存在判断  上下午只保留一条作为正式的签到结果
+         * 上午签到 -》 成功  | 下午签到 -》异常，成功
+         * 上午签到 -》 异常，异常 | 下午签到 -》 成功
+         */
+
     }
@@ -100,4 +100,6 @@ public interface DriverMapper
     Driver getDriverInfoByJobCode(@Param("jobCode")String  jobCode);
     Integer insertDriverFace(@Param("deviceId") String deviceId, @Param("jobCodes")List<String> jobCodes);
+
+    void updateDriverByComputed(@Param("count")Integer count);
 }
@@ -89,4 +89,6 @@ public interface IDriverService
     AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCode);
+
+    void updateDriverByComputed();
 }
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.stream.Collectors;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -12,13 +13,16 @@ import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
+import com.ruoyi.pojo.domain.EquipmentDriverExpand;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ListUtils;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.tomcat.util.buf.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -41,6 +45,8 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
 @Service
 public class DriverServiceImpl implements IDriverService {
+    @Autowired
+    private EquipmentMapper equipmentMapper;
     @Value("${api.url.getSchedulingInfo}")
     private String schedulingInfoUrl;
     @Value("${api.config.password}")
@@ -82,7 +88,14 @@ public class DriverServiceImpl implements IDriverService {
      */
     @Override
     public List<Driver> selectDriverList(Driver driver) {
-        return driverMapper.selectDriverList(driver);
+        List<Driver> drivers = driverMapper.selectDriverList(driver);
+        List<EquipmentDriverExpand> list = equipmentMapper.querySignListByJobCode(drivers);
+        for (Driver item : drivers) {
+            // 查询对应工号的注册设备号 然后用，拼接展示在前端
+            List<String> collect = list.stream().filter(todo -> item.getJobCode().equals(todo.getJobCode())).map(EquipmentDriverExpand::getDeviceId).collect(Collectors.toList());
+            item.setSignInEquipment(StringUtils.join(collect));
+        }
+        return drivers;
     }
     /**
@@ -242,6 +255,13 @@ public class DriverServiceImpl implements IDriverService {
         return AjaxResult.success("注册成功");
     }
+    @Override
+    public void updateDriverByComputed() {
+        Integer count = equipmentMapper.count();
+        // 更新人脸认证状态
+        driverMapper.updateDriverByComputed(count);
+    }
+
     private File getLocationFile(String jobCode) {
         String image = driverMapper.getDriverImageByJobCode(jobCode);
 package com.ruoyi.equipment.mapper;
 import java.util.List;
+
+import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.pojo.domain.EquipmentDriverExpand;
 import org.apache.ibatis.annotations.Param;
 /**
@@ -61,4 +64,8 @@ public interface EquipmentMapper
     public int deleteEquipmentByIds(Long[] ids);
     Equipment selectEquipmentByDeviceId(@Param("deviceId") String deviceId);
+
+    Integer count();
+
+    List<EquipmentDriverExpand> querySignListByJobCode(@Param("drivers") List<Driver> drivers);
 }
@@ -144,6 +144,7 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public AjaxResult addSignIn(SignIn signIn) throws IOException {
+        // 查询员工信息
         Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
         // 查询地址
         Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
@@ -154,7 +154,7 @@ public class DriverJob implements InitializingBean {
             ImageUrlResultResponseVo vo = JSON.parseObject(s, ImageUrlResultResponseVo.class);
             result = vo.getResult();
             // 可能需要重新获取token
-        }catch (Exception e){
+        } catch (Exception e) {
             String token = DriverJob.getToken(TOKEN_URL).getAccessToken();
             header.put("x-acs-dingtalk-access-token", token);
             String s = HttpUtils.doGet(url, param, header);
@@ -166,7 +166,7 @@ public class DriverJob implements InitializingBean {
     /**
      * 获取排班任务请求
-     * 12小时执行一次
+     * 24小时执行一次
      */
     public void getSchedulingInfo() {
         // 获取排班请求
@@ -181,6 +181,13 @@ public class DriverJob implements InitializingBean {
         saveSchedulingToRedis(getSchedulingInfoUrl, ConstDateUtil.formatDate("yyyyMMdd"));
     }
+    /**
+     * 计算是否全部设备完成了对应的用户人脸注册
+     */
+    public void computedFaceSignIn() {
+        DRIVER_SERVICE.updateDriverByComputed();
+    }
+
     public Map<String, List<ResponseScheduling>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey) {
         List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
+package com.ruoyi.pojo.domain;
+
+import lombok.Data;
+
+@Data
+public class EquipmentDriverExpand {
+    private String id;
+    /**
+     * 设备号
+     */
+    private String deviceId;
+    /**
+     * 工号
+     */
+    private String jobCode;
+}
+package com.ruoyi.pojo.domain;
+
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 签到扩展表
+ * @author guzijian
+ */
+@Data
+public class SignInExpand {
+    private Integer id;
+    private String jobCode;
+    /**
+     * 上午签到集合 1，2
+     */
+    private String morningSignInIds;
+    /**
+     * 下午签到集合 1，2
+     */
+    private String afternoonSignInIds;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date dated;
+}
@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
                 # 测试地址
-                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true
+                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
                 username: root
                 password: guzijian
             # 从库数据源
@@ -7,7 +7,7 @@ spring:
       # 主库数据源
       master:
         # 测试地址
-        url: jdbc:mysql://1.14.107.94:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
         username: root
         password: guzijian
       # 从库数据源
@@ -166,7 +166,8 @@
             <if test="lineName != null">line_name,</if>
             <if test="lineCode != null">line_code,</if>
             <if test="faceSignIn != null">face_sign_in,</if>
-            <if test="image != null">image</if>
+            <if test="image != null">image,</if>
+            <if test="updateTime != null">update_time</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="jobCode != null and jobCode != ''">#{jobCode},</if>
@@ -186,7 +187,8 @@
             <if test="lineName != null">#{lineName},</if>
             <if test="lineCode != null">#{lineCode},</if>
             <if test="faceSignIn != null">#{faceSignIn},</if>
-            <if test="image != null">#{image}</if>
+            <if test="image != null">#{image},</if>
+            <if test="updateTime != null">#{updateTime}</if>
         </trim>
         on duplicate key update
         job_code = values(job_code)
@@ -217,6 +219,22 @@
         </trim>
         where id = #{id}
     </update>
+    <update id="updateDriverByComputed">
+        update driver set face_sign_in = 0
+        WHERE job_code in (
+            SELECT job_code
+            FROM driver_face_device_id
+            GROUP BY job_code
+            HAVING COUNT(*) = #{count}
+        );
+        update driver set face_sign_in = 2
+        WHERE job_code in (
+            SELECT job_code
+            FROM driver_face_device_id
+            GROUP BY job_code
+            HAVING COUNT(*) != #{count}
+        );
+    </update>
     <insert id="saveDriverScheduling">
         INSERT INTO driver_scheduling (
         id, scheduleDate, lineName, lineCode, lpName,
@@ -46,6 +46,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectEquipmentVo"></include>
         where device_id = #{deviceId}
     </select>
+    <select id="count" resultType="java.lang.Integer">
+        select count(*) from equipment
+        where status = 1
+    </select>
+    <select id="querySignListByJobCode" resultType="com.ruoyi.pojo.domain.EquipmentDriverExpand">
+        select * from driver_face_device_id
+        where job_code in
+        <foreach collection="drivers" item="item" open="(" separator="," close=")">
+            #{item.jobCode}
+        </foreach>
+    </select>
     <insert id="insertEquipment" parameterType="Equipment" useGeneratedKeys="true" keyProperty="id">