fix: 新增注册反馈接口

guzijian
1 parent ade1de37
Showing 8 changed files with 90 additions and 41 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.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/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -109,16 +109,7 @@ public class DriverController extends BaseController {
         return toAjax(driverService.insertDriver(driver));
     }
-    /**
-     * 人脸注册
-     * @param driver
-     * @return
-     */
-    @PostMapping("/addDriver")
-    @ApiOperation("新增驾驶员信息(酒精一体机)")
-    public AjaxResult addDriver(@ApiParam @RequestBody Driver driver) {
-        return toAjax(driverService.addDriver(driver));
-    }
+
     /**
      * 修改驾驶员信息
@@ -174,4 +165,13 @@ public class DriverController extends BaseController {
         driverService.downloadHeadImage(jobCode, response);
     }
+    /**
+     * 人脸注册状态
+     */
+    @ApiOperation("注册反馈")
+    @GetMapping("/faceSignIn")
+    public AjaxResult faceRegistrationFeedback(@RequestParam("deviceId") String deviceId,@RequestParam("jobCode")List<String> jobCode){
+        return driverService.faceRegistrationFeedback(deviceId,jobCode);
+    }
+
 }
@@ -145,4 +145,7 @@ public class Driver extends BaseEntity {
     @ApiModelProperty("更新时间")
     private Date update_time;
+    @ApiModelProperty("注册设备列表")
+    private String signInEquipment;
+
 }
@@ -93,7 +93,11 @@ public interface DriverMapper
      */
     Integer jobCodeIsEmpty(@Param("jobCode") String jobCode);
-    String getDriverInfoByJobCode(@Param("jobCode") String jobCode);
+    String getDriverImageByJobCode(@Param("jobCode") String jobCode);
     List<Driver> getDrivers(Driver driver);
+
+    Driver getDriverInfoByJobCode(@Param("jobCode")String  jobCode);
+
+    Integer insertDriverFace(@Param("deviceId") String deviceId, @Param("jobCodes")List<String> jobCodes);
 }
@@ -87,5 +87,6 @@ public interface IDriverService
     List<Driver> getDrivers(Driver driver);
-    int addDriver(Driver driver);
+
+    AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCode);
 }
@@ -15,6 +15,7 @@ import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
 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;
@@ -55,6 +56,9 @@ public class DriverServiceImpl implements IDriverService {
     private DriverMapper driverMapper;
     @Autowired
+    private ThreadJobService threadJobService;
+
+    @Autowired
     private RedisCache redisCache;
     /**
@@ -233,14 +237,16 @@ public class DriverServiceImpl implements IDriverService {
         return drivers;
     }
+
+
     @Override
-    public int addDriver(Driver driver) {
-        // TODO 人脸注册
-        return 0;
+    public AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCodes) {
+        threadJobService.asyncUpdateDriver(deviceId,jobCodes);
+        return AjaxResult.success("注册成功");
     }
     private File getLocationFile(String jobCode) {
-        String image = driverMapper.getDriverInfoByJobCode(jobCode);
+        String image = driverMapper.getDriverImageByJobCode(jobCode);
         return new File(RuoYiConfig.getProfile() + File.separator + image.replace("/profile", ""));
     }
@@ -89,9 +89,9 @@ public class SignInServiceImpl implements ISignInService {
         if (signIn.getType() == null) {
             signIn.setType(SignInEnum.SIGN_IN);
         }
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())){
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())) {
             signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
-            signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL)? "酒精测试不通过超标:" + signIn.getAlcoholIntake().floatValue() + "%" : "");
+            signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL) ? "酒精测试不通过超标:" + signIn.getAlcoholIntake().floatValue() + "%" : "");
         }
         return signInMapper.insertSignIn(signIn);
     }
@@ -131,7 +131,7 @@ public class SignInServiceImpl implements ISignInService {
     }
     @Override
-    public AjaxResult addSignIn(SignIn signIn) throws  IOException {
+    public AjaxResult addSignIn(SignIn signIn) throws IOException {
         // 签到检查
         checkSignIn(signIn);
         // base64转图片
@@ -140,33 +140,35 @@ public class SignInServiceImpl implements ISignInService {
         uploadImage(signIn);
         signInMapper.insertSignIn(signIn);
         // TODO 驾驶人员二次签到酒精测试异常
-        if (true){
+        if (true) {
             Integer count = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode());
-            if (Objects.isNull(count)){
-                redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(),0);
+            if (Objects.isNull(count)) {
+                redisCache.setCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 0);
+            } else {
+                count = redisCache.increment(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
             }
-            count = redisCache.increment(ConstDateUtil.formatDate("yyyyMMdd") + REDIS_SIGN_IN, signIn.getJobCode(), 1);
-            if (count.equals(2) || count.compareTo(2) == 1){
-
+            if (count.compareTo(2) >= 0) {
+                // TODO
+                return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark() + "，酒精测试不通过两次请更换车辆驾驶员");
             }
         }
-        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING): AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark());
+        return SIGN_IN_SUCCESS.equals(signIn.getStatus()) ? AjaxResult.success(SIGN_IN_SUCCESS_STRING) : AjaxResult.error(SIGN_IN_ERROR + signIn.getRemark());
     }
     private void checkSignIn(SignIn signIn) {
         // TODO 更具工号获取人员信息
         Driver driver = getDriverInfoByJobCode(signIn.getJobCode());
-        if (Objects.isNull(driver)){
+        if (Objects.isNull(driver)) {
             signIn.setStatus(SIGN_IN_SUCCESS);
             return;
         }
         // TODO 排班校验 非司售未作
-        checkWorkDay(signIn,driver.getPersonnelType());
+        checkWorkDay(signIn, driver.getPersonnelType());
         // 酒精测试校验 TODO 判断人员类型
-        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())){
+        if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag())) {
             signIn.setStatus(signIn.getAlcoholIntake().compareTo(new BigDecimal(20)) < 0 ? SIGN_IN_SUCCESS : SIGN_IN_FAIL);
             signIn.setRemark(signIn.getStatus().equals(SIGN_IN_FAIL) ? ALCOHOL_SIGN_IN_ERROR : "");
         }
@@ -178,11 +180,11 @@ public class SignInServiceImpl implements ISignInService {
     private void checkWorkDay(SignIn signIn, String personnelType) {
         List<ResponseScheduling> jobs = null;
-        switch (personnelType){
+        switch (personnelType) {
             case "0":
                 // 查询工号对应的排班 司售人员
-                jobs = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd"),signIn.getJobCode());
-                if (Objects.isNull(jobs)|| jobs.size() == 0){
+                jobs = redisCache.getCacheMapValue(ConstDateUtil.formatDate("yyyyMMdd"), signIn.getJobCode());
+                if (Objects.isNull(jobs) || jobs.size() == 0) {
                     signIn.setStatus(SIGN_IN_FAIL);
                     signIn.setRemark(WORK_DAY_ERROR);
                 }
@@ -194,7 +196,7 @@ public class SignInServiceImpl implements ISignInService {
         }
         // 超时校验司售人员
-        checkTimeOut(signIn,jobs);
+        checkTimeOut(signIn, jobs);
         // TODO 非司售人员
     }
@@ -231,7 +233,7 @@ public class SignInServiceImpl implements ISignInService {
         String pathFileName = getPathFileName(filePath, fileName);
         signIn.setImage(pathFileName);
         // 异步上传文件
-        threadJobConfig.startUpload(absPath,base64);
+        threadJobConfig.asyncStartUpload(absPath, base64);
     }
     /**
@@ -8,7 +8,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
-import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.driver.mapper.DriverMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Base64;
+import java.util.List;
 import java.util.Objects;
@@ -34,6 +35,10 @@ import java.util.Objects;
 @Slf4j
 public class ThreadJobService {
+    @Autowired
+    private DriverMapper driverMapper;
+
+
     /**
      * 异步上传图片
@@ -44,10 +49,9 @@ public class ThreadJobService {
      * @throws IOException
      */
     @Async
-    public void startUpload(String url, String base64) {
+    public void asyncStartUpload(String url, String base64) {
         FileOutputStream outputStream = null;
         base64 = base64.replaceAll(" ", "");
-//        byte[] imageBytes = Base64.getDecoder().decode(base64);
         BASE64Decoder decoder = new BASE64Decoder();
         try {
             byte[] photoBase64 = decoder.decodeBuffer(base64);
@@ -72,6 +76,14 @@ public class ThreadJobService {
             }
         }
     }
+    @Async
+    public void asyncUpdateDriver(String deviceId, List<String> jobCodes){
+        // 获取员工信息
+        // 加锁
+        // 同步锁实现
+        Integer result = driverMapper.insertDriverFace(deviceId, jobCodes);
+        log.info("注册设备与员工关联完毕:{}",result);
+    }
     /**
      * 检查文件类型
@@ -137,4 +149,6 @@ public class ThreadJobService {
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
     }
+
+
 }
@@ -45,12 +45,13 @@
                line_code,
                face_sign_in,
                image,
-               update_time
+               update_time,
+               sign_in_equipment
         from driver
     </sql>
     <sql id="insertDriverVo">
         job_code
-        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image,update_time
+        , company_code, branche_company_code, personnel_name, papers_code, ic_card_code, personnel_type, posts, card, telphone, ic_rfid, id_rfid, tag_rfid, remark, line_name, line_code,face_sign_in,image,update_time,sign_in_equipment
     </sql>
     <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
@@ -111,7 +112,7 @@
        from driver
         where job_code = #{jobCode}
     </select>
-    <select id="getDriverInfoByJobCode" resultType="String">
+    <select id="getDriverImageByJobCode" resultType="String">
         select image from driver
         where job_code = #{jobCode}
     </select>
@@ -140,6 +141,10 @@
             <if test="faceSignIn != null  and faceSignIn != ''">and face_sign_in = #{faceSignIn}</if>
         </where>
     </select>
+    <select id="getDriverInfoByJobCode" resultType="com.ruoyi.driver.domain.Driver">
+        <include refid="selectDriverVo"></include>
+        where job_code = #{jobCode}
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -206,6 +211,7 @@
             <if test="lineCode != null">line_code = #{lineCode},</if>
             <if test="faceSignIn != null">face_sign_in = #{faceSignIn},</if>
             <if test="image != null">image = #{image}</if>
+            <if test="signInEquipment != null">sign_in_equipment = #{signInEquipment}</if>
         </trim>
         where id = #{id}
     </update>
@@ -293,11 +299,24 @@
             #{item.lineCode,jdbcType=VARCHAR},
             #{item.faceSignIn},
             #{item.image},
-            #{item.updateTime}
+            #{item.updateTime},
+            #{item.signInEquipment}
+            )
+        </foreach>
+        on duplicate key update
+        job_code = values(job_code)
+    </insert>
+    <insert id="insertDriverFace" useGeneratedKeys="true" keyProperty="id">
+        INSERT INTO driver_face_device_id ( job_code,device_id )
+        values
+        <foreach collection="jobCodes" item="item" index="index" separator=",">
+            (
+            #{item},#{deviceId}
             )
         </foreach>
         on duplicate key update
         job_code = values(job_code)
+        device_id = values(device_id)
     </insert>
 </mapper>
 \ No newline at end of file