fix: 修改人脸更新接口逻辑

guzijian
1 parent 33a17c25
Showing 8 changed files with 43 additions and 16 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/global/Result.java
ruoyi-admin/src/main/java/com/ruoyi/common/global/ResultCode.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.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/pojo/request/FaceUpdateReqVo.java
ruoyi-admin/src/main/resources/application-druid-prd.yml
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -39,6 +39,15 @@ public class Result&lt;T extends Object&gt; {
         return r;
     }
  
+    public static <T> Result<T> OK(ResultCode code,T data){
+        Result r = new Result();
+        r.setSuccess(true);
+        r.setCode(code.getCode());
+        r.setMsg("部分成功");
+        r.setData(data);
+        return r;
+    }
+
     /** 成功静态方法 */
     public static <T> Result<T> OK(T data) {
         Result r = new Result();
@@ -8,6 +8,7 @@ public enum ResultCode {
     CODE_200(200, "操作成功"),
     CODE_201(201,"对象创建成功"),
     CODE_202(202,"请求已经被接受"),
+    CODE_207(207,"请求已经成功处理了部分内容，但是还有其他内容未被处理"),
     CODE_400(400,"参数列表错误（缺少，格式不匹配）"),
     CODE_401(401,"未授权"),
     CODE_403(403,"访问受限，授权过期"),
@@ -151,11 +151,10 @@ public class DriverController extends BaseController {
     @ApiOperation("人脸数据更新接口")
     public Result<?> updateFaceByJob(HttpServletRequest request, @ApiParam @Validated @RequestBody FaceUpdateReqVo vo) {
         try {
-            driverService.updateFaceByJob(request, vo);
+            return driverService.updateFaceByJob(request, vo);
         } catch (Exception e) {
-            return Result.ERROR(ResultCode.CODE_401, e.getMessage());
+            return Result.ERROR(e.getMessage());
         }
-        return Result.OK();
     }
  
     /**
@@ -5,6 +5,7 @@ import java.util.List;
  
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
+import com.ruoyi.common.global.Result;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
@@ -94,7 +95,7 @@ public interface IDriverService
  
     void updateDriverByComputed();
  
-    void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo);
+    Result updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo);
  
     void saveDriverSignInfo(DriverSignInRequestVo vo);
  
@@ -12,6 +12,8 @@ import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.common.global.ResultCode;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
@@ -42,6 +44,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
  
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
+import static com.ruoyi.common.global.ResultCode.CODE_207;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
  
 /**
@@ -187,7 +190,6 @@ public class DriverServiceImpl implements IDriverService {
     }
  
  
-
     @Override
     public AjaxResult getDriverSchedulingAll() {
         return AjaxResult.success(redisCache.getHashKeys(DRIVER_SCHEDULING_PRE + ConstDateUtil.formatDate("yyyyMMdd")));
@@ -273,16 +275,24 @@ public class DriverServiceImpl implements IDriverService {
     }
  
     @Override
-    public void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo) {
+    public Result<?> updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo) {
         // 获取校验
         String header = request.getHeader("X-TOKEN-AUTHORIZATION");
         if (!PERSONNEL_API_KEY.equals(header)) {
-            throw new RuntimeException("X-TOKEN-AUTHORIZATION value error");
+            return Result.ERROR(ResultCode.CODE_401, "X-TOKEN-AUTHORIZATION value error");
         }
         Date date = new Date();
         // 查询当前人员信息库是否存在对应员工数据
         List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList());
-        List<String> existsJobCodes = driverMapper.queryJobCodesIsExists(jobCodes);
+        Map<String,String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item ->item,s->s));
+        // 更新失败人员工号列表
+        List<String> updateFailJobCodes = new ArrayList<>();
+        for (String jobCode : jobCodes) {
+            if (Objects.isNull(existsSet.get(jobCode))) {
+                updateFailJobCodes.add(jobCode);
+            }
+        }
+        jobCodes = new ArrayList<>(existsSet.values());
  
         List<Driver> drivers = vo.getFaceDataList().stream().map(item -> {
             Driver driver = new Driver();
@@ -297,7 +307,7 @@ public class DriverServiceImpl implements IDriverService {
             driver.setPersonnelName(item.getName());
             driver.setUpdateTime(date);
             return driver;
-        }).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getJobCode()))), ArrayList::new));
+        }).filter(item -> !Objects.isNull(existsSet.get(item.getJobCode()))).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getJobCode()))), ArrayList::new));
         List<List<Driver>> lists = ListUtils.splitList(drivers, 400);
         log.info("开始人脸数据更新");
         // 数据更新 更新人脸注册标识 更新基本数据
@@ -305,11 +315,14 @@ public class DriverServiceImpl implements IDriverService {
             driverMapper.updateSignStatusDriversByJobCodes(list);
         }
         log.info("人脸数据更新完成");
-        // TODO 删除注册表中对应工号的数据
-//        List<String> jobCodes = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
+        log.info("未成功更新工号：{}", updateFailJobCodes);
         log.info("开始删除注册表中对应工号的数据");
         driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
         log.info("删除注册表中对应工号的数据结束");
+        if (updateFailJobCodes.size() != 0)
+            return Result.OK(CODE_207, updateFailJobCodes);
+        else
+            return Result.OK();
     }
  
     @Override
@@ -47,5 +47,9 @@ public class FaceUpdateReqVo {
           @ApiModelProperty("工种")
           @NotBlank(message = "工种不能为空")
           String posts;
+          @ApiModelProperty("线路")
+          String lineName;
+          @ApiModelProperty("车队")
+          String fleetName;
       }
 }
@@ -71,11 +71,10 @@ spring:
         devtools:
             restart:
                 # 热部署开关
-                enabled: true
+                enabled: false
         # redis 配置
         redis:
             # 地址
-            #      host: 1.14.107.94
             host: 121.41.83.61
             database: 0
             password: "guzijian"
@@ -112,7 +111,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /home/ruoyi/uploadPath
+    profile: D:/ruoyi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -120,7 +119,7 @@ ruoyi:
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 8100
+    port: 8080
     servlet:
         # 应用的访问路径
         context-path: /
@@ -140,6 +140,7 @@
     </select>
     <select id="queryJobCodesIsExists" resultType="java.lang.String">
         select job_code
+        from driver
         where job_code in
             <foreach collection="jobCodes" item="item" open="(" separator="," close=")">
                 #{item}
@@ -273,7 +274,7 @@
         </foreach>
     </delete>
     <delete id="deleteDeviceIdAssociatedJobCode">
-        delete from driver where
+        delete from driver_face_device_id where
    job_code in
    ( <foreach collection="jobCodes" item="item" separator=",">
         #{item}