fix: 全量更新人员信息

guzijian
1 parent 2fcb0c4d
Showing 5 changed files with 38 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -134,4 +134,6 @@ public interface DriverMapper
      * @return
      */
     List<String> queryEmptyJob(List<String> list);
+
+    void updateDriverBaseInfoByJobCodes(@Param("list") List<Driver> list,@Param("filterImage") Integer filterImage);
 }
@@ -119,4 +119,6 @@ public interface IDriverService
      * @return
      */
     List<String> queryEmptyJob(List<String> jobList);
+
+    void updateDriverBaseInfoByJobCodes(List<Driver> drivers, int filterImage);
 }
@@ -218,7 +218,7 @@ public class DriverServiceImpl implements IDriverService {
         List<DriverScheduling> driverSchedulings = cache.getCacheScheduling(ConstDateUtil.getStringNowLocalDate("-")).get(driver.getJobCode());
         // 只改变车队信息 其他信息由调度接口 和 人事系统决定  本来是不修改的但是人事数据有问题
         for (DriverScheduling scheduling : driverSchedulings) {
-            if (StringUtil.isNotEmpty(driver.getFleetName())){
+            if (StringUtil.isNotEmpty(driver.getFleetName())) {
                 scheduling.setFleetName(driver.getFleetName());
             }
         }
@@ -373,7 +373,7 @@ public class DriverServiceImpl implements IDriverService {
             } else {
                 // 无排班 工种是驾驶员需要酒测
                 if (Objects.isNull(vo)) {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null,  "驾驶员".equals(item.getPosts()),false, "", "", ""));
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, "驾驶员".equals(item.getPosts()), false, "", "", ""));
                 } else {
                     // 特定设备是无需酒精测试的
                     vo.setCheckAlcohol(needCheckAlcoholDevice ? vo.getCheckAlcohol() : false);
@@ -462,7 +462,7 @@ public class DriverServiceImpl implements IDriverService {
         log.info("开始人员数据更新");
         // 数据更新 更新人脸注册标识 更新基本数据
         for (List<Driver> list : lists) {
-            driverMapper.updateSignStatusDriversByJobCodes(list);
+            driverMapper.updateDriverBaseInfoByJobCodes(list, 0);
         }
         if (insertDrivers.size() > 0) driverMapper.saveDrivers(insertDrivers);
@@ -470,11 +470,11 @@ public class DriverServiceImpl implements IDriverService {
         log.info("开始删除注册表中对应工号的数据");
         List<String> updateImageJobCodes = new ArrayList<>();
         for (Driver driver : updateDrivers) {
-            if (StringUtil.isNotEmpty(driver.getImage())){
+            if (StringUtil.isNotEmpty(driver.getImage())) {
                 updateImageJobCodes.add(driver.getJobCode());
             }
         }
-        if (updateImageJobCodes.size() > 0){
+        if (updateImageJobCodes.size() > 0) {
             driverMapper.deleteDeviceIdAssociatedJobCode(updateImageJobCodes);
         }
         log.info("删除注册表中对应工号的数据结束");
@@ -490,7 +490,7 @@ public class DriverServiceImpl implements IDriverService {
                 driver.setFleetName(item.getFleetName());
                 driver.setLineName(item.getLineName());
                 try {
-                    if (StringUtil.isNotEmpty(item.getImageUrl())){
+                    if (StringUtil.isNotEmpty(item.getImageUrl())) {
                         driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
                     }
                 } catch (IOException e) {
@@ -510,7 +510,7 @@ public class DriverServiceImpl implements IDriverService {
                 driver.setLineName(item.getLineName());
                 driver.setFaceSignIn(SIGN_FACE_ACTIVE);
                 try {
-                    if (StringUtil.isNotEmpty(item.getImageUrl())){
+                    if (StringUtil.isNotEmpty(item.getImageUrl())) {
                         driver.setImage(getNewImageUrl(item.getJobCode(), item.getImageUrl()));
                     }
                 } catch (IOException e) {
@@ -583,6 +583,11 @@ public class DriverServiceImpl implements IDriverService {
         return driverMapper.queryEmptyJob(jobList);
     }
+    @Override
+    public void updateDriverBaseInfoByJobCodes(List<Driver> drivers, int filterImage) {
+        driverMapper.updateDriverBaseInfoByJobCodes(drivers, filterImage);
+    }
+
     private void sendNotice(List<DriverSignInRecommendation> nowTimerList) {
         List<SysNotice> noticeList = new ArrayList<>(nowTimerList.size());
         for (DriverSignInRecommendation item : nowTimerList) {
@@ -410,6 +410,7 @@ public class DriverJob implements InitializingBean {
             drivers.addAll(getDrivers(date, getPersonInfo(accessToken, 100, i)));
         }
         List<String> jobList = drivers.stream().map(Driver::getJobCode).collect(Collectors.toList());
+        DRIVER_SERVICE.updateDriverBaseInfoByJobCodes(drivers, 1);
         // 删除离职员工
         handleNotEmptyJob(jobList);
         // 过滤已经存在的员工工号
@@ -334,6 +334,27 @@
             where job_code = #{item.jobCode,jdbcType=VARCHAR}
         </foreach>
     </update>
+    <update id="updateDriverBaseInfoByJobCodes">
+        <foreach collection="list" item="item" separator=";">
+            update driver set update_time = #{item.updateTime}
+            <if test="item.lineName != null and item.lineName != ''">
+                ,line_name =#{item.lineName}
+            </if>
+            <if test="item.fleetName != null and item.fleetName != ''">
+                ,fleet_name =#{item.fleetName}
+            </if>
+            <if test="item.posts != null and item.posts != ''">
+                ,`posts` =#{item.posts}
+            </if>
+            <if test="item.personnelName != null and item.personnelName != ''">
+                ,`personnel_name` =#{item.personnelName}
+            </if>
+            <if test="item.image != null and item.image != '' and filterImage == 0">
+                ,image = #{item.image},face_sign_in = 1
+            </if>
+            where job_code = #{item.jobCode,jdbcType=VARCHAR}
+        </foreach>
+    </update>
     <delete id="deleteDriverById" parameterType="Long">
         delete