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

guzijian
1 parent 3168b6ae
Showing 4 changed files with 58 additions and 28 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/job/DriverJob.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -102,4 +102,5 @@ public interface DriverMapper
     List<String> queryJobCodesIsExists(@Param("jobCodes") List<String> jobCodes);
  
     void updateDriverInfoByJobCodes(@Param("drivers") List<Driver> drivers);
+
 }
@@ -284,45 +284,71 @@ public class DriverServiceImpl implements IDriverService {
         Date date = new Date();
         // 查询当前人员信息库是否存在对应员工数据
         List<String> jobCodes = vo.getFaceDataList().stream().map(FaceUpdateReqVo.FaceData::getJobCode).collect(Collectors.toList());
-        Map<String,String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item ->item,s->s));
+        Map<String, String> existsSet = driverMapper.queryJobCodesIsExists(jobCodes).stream().collect(Collectors.toMap(item -> item, s -> s));
         // 更新失败人员工号列表
-        List<String> updateFailJobCodes = new ArrayList<>();
+        List<String> insertDriverJobCodeList = new ArrayList<>();
         for (String jobCode : jobCodes) {
             if (Objects.isNull(existsSet.get(jobCode))) {
-                updateFailJobCodes.add(jobCode);
+                insertDriverJobCodeList.add(jobCode);
             }
         }
         jobCodes = new ArrayList<>(existsSet.values());
  
-        List<Driver> drivers = vo.getFaceDataList().stream().map(item -> {
-            Driver driver = new Driver();
-            driver.setPosts(item.getPosts());
-            driver.setJobCode(item.getJobCode());
-            try {
-                driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
-            } catch (IOException e) {
-                log.info(e.getMessage());
-                throw new RuntimeException(e);
-            }
-            driver.setPersonnelName(item.getName());
-            driver.setUpdateTime(date);
-            return driver;
-        }).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);
+        List<Driver> updateDrivers = getDriversByJobCode(vo, date, existsSet, true);
+        List<Driver> insertDrivers = getDriversByJobCode(vo, date, existsSet, false);
+        List<List<Driver>> lists = ListUtils.splitList(updateDrivers, 400);
         log.info("开始人脸数据更新");
         // 数据更新 更新人脸注册标识 更新基本数据
         for (List<Driver> list : lists) {
             driverMapper.updateSignStatusDriversByJobCodes(list);
         }
+        if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers);
+
         log.info("人脸数据更新完成");
-        log.info("未成功更新工号：{}", updateFailJobCodes);
         log.info("开始删除注册表中对应工号的数据");
-        driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
+        if (jobCodes.size() > 0)
+            driverMapper.deleteDeviceIdAssociatedJobCode(jobCodes);
         log.info("删除注册表中对应工号的数据结束");
-        if (updateFailJobCodes.size() != 0)
-            return Result.OK(CODE_207, updateFailJobCodes);
+
+        return Result.OK();
+    }
+
+    private ArrayList<Driver> getDriversByJobCode(FaceUpdateReqVo vo, Date date, Map<String, String> existsSet, Boolean updateFlag) {
+        if (updateFlag)
+            return vo.getFaceDataList().stream().map(item -> {
+                Driver driver = new Driver();
+                driver.setPosts(item.getPosts());
+                driver.setJobCode(item.getJobCode());
+                driver.setFleetName(item.getFleetName());
+                driver.setLineName(item.getLineName());
+                try {
+                    driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                } catch (IOException e) {
+                    log.info(e.getMessage());
+                    throw new RuntimeException(e);
+                }
+                driver.setPersonnelName(item.getName());
+                driver.setUpdateTime(date);
+                return driver;
+            }).filter(item -> !Objects.isNull(existsSet.get(item.getJobCode()))).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getJobCode()))), ArrayList::new));
         else
-            return Result.OK();
+            return vo.getFaceDataList().stream().map(item -> {
+                Driver driver = new Driver();
+                driver.setPosts(item.getPosts());
+                driver.setJobCode(item.getJobCode());
+                driver.setFleetName(item.getFleetName());
+                driver.setLineName(item.getLineName());
+                try {
+                    driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
+                } catch (IOException e) {
+                    log.info(e.getMessage());
+                    throw new RuntimeException(e);
+                }
+                driver.setPersonnelName(item.getName());
+                driver.setUpdateTime(date);
+                return driver;
+            }).filter(item -> Objects.isNull(existsSet.get(item.getJobCode()))).collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(s -> s.getJobCode()))), ArrayList::new));
+
     }
  
     @Override
@@ -181,6 +181,7 @@ public class DriverJob implements InitializingBean {
     }
  
     public Map<String, List<ResponseScheduling>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey) {
+        log.info("开始拉取排班:{}", dateKey);
         List<ResponseScheduling> originSchedulingList = RESTTEMPLATE.exchange(
                 getSchedulingInfoUrl,
                 HttpMethod.GET,
@@ -212,6 +213,7 @@ public class DriverJob implements InitializingBean {
 //        DRIVER_SERVICE.saveDriverScheduling(originSchedulingList);
         // 存入redis
         REDIS_CACHE.setCacheMap(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap, 1, TimeUnit.DAYS);
+        log.info("拉取排班完毕:{}", dateKey);
         return driverSchedulingMap;
     }
  
@@ -252,7 +252,7 @@
     <update id="updateSignStatusDriversByJobCodes">
         <foreach collection="list" item="item" separator=";">
             update driver set face_sign_in = 1,
-                              personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR},image = #{item.image,jdbcType=VARCHAR},update_time = #{item.updateTime}
+                              personnel_name = #{item.personnelName,jdbcType=VARCHAR},posts = #{item.posts,jdbcType=VARCHAR},image = #{item.image,jdbcType=VARCHAR},update_time = #{item.updateTime},fleet_name = #{item.fleetName},line_name = #{item.lineName}
             where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
     </update>
@@ -278,10 +278,10 @@
     </delete>
     <delete id="deleteDeviceIdAssociatedJobCode">
         delete from driver_face_device_id where
-   job_code in
-   ( <foreach collection="jobCodes" item="item" separator=",">
-        #{item}
-    </foreach> )
+       job_code in
+       ( <foreach collection="jobCodes" item="item" separator=",">
+            #{item}
+        </foreach> )
     </delete>
  
  
@@ -332,4 +332,5 @@
         device_id = values(device_id)
     </insert>
  
+
 </mapper>
 \ No newline at end of file