feat: 修改获取人员数据的方法名

guzijian
1 parent a903de90
Showing 3 changed files with 8 additions and 11 deletions
Bsth-admin/src/main/java/com/ruoyi/common/cache/TempCache.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
@@ -39,6 +39,9 @@ public class TempCache {
         return !Objects.isNull(map.get(jobCode));
     }
+    /**
+     * 整个类中的所有方法全是测试需要
+     */
     public static void resetMapStatus() {
 //        map.put("620001", true);
 //        map.put("620002", true);
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Paths;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -12,8 +11,6 @@ import java.util.stream.Collectors;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
@@ -28,7 +25,6 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
 import com.ruoyi.job.DriverJob;
@@ -42,7 +38,6 @@ import com.ruoyi.pojo.response.DriverResponseVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.pojo.response.personnel.PersonnelResultResponseVo;
 import com.ruoyi.pojo.response.personnel.TokenResponseVo;
-import com.ruoyi.service.AttendanceService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
@@ -70,7 +65,6 @@ import javax.servlet.http.HttpServletResponse;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.ConstDriverProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
-import static com.ruoyi.common.RuleSchedulingProperties.WORK_FLAG;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
@@ -637,9 +631,9 @@ public class DriverServiceImpl implements IDriverService {
         PersonnelResultResponseVo vo = DriverJob.getPersonInfo(tokenVo.getAccessToken(), pageSize, 1);
         int countPage = vo.getTotalCount() / pageSize;
         countPage = vo.getTotalCount() % pageSize == 0 ? countPage : countPage + 1;
-        List<Driver> drivers = DriverJob.getDrivers(date, vo);
+        List<Driver> drivers = DriverJob.handlerDrivers(date, vo);
         for (int i = 2; i <= countPage; i++) {
-            drivers.addAll(DriverJob.getDrivers(date, DriverJob.getPersonInfo(tokenVo.getAccessToken(), 100, i)));
+            drivers.addAll(DriverJob.handlerDrivers(date, DriverJob.getPersonInfo(tokenVo.getAccessToken(), 100, i)));
         }
         if (CollectionUtil.isNotEmpty(drivers)) {
             driverMapper.updateDriverBaseInfoByJobCodes(drivers, 1);
@@ -422,9 +422,9 @@ public class DriverJob implements InitializingBean {
         PersonnelResultResponseVo vo = getPersonInfo(accessToken, pageSize, 1);
         int countPage = vo.getTotalCount() / pageSize;
         countPage = vo.getTotalCount() % pageSize == 0 ? countPage : countPage + 1;
-        List<Driver> drivers = getDrivers(date, vo);
+        List<Driver> drivers = handlerDrivers(date, vo);
         for (int i = 2; i <= countPage; i++) {
-            drivers.addAll(getDrivers(date, getPersonInfo(accessToken, 100, i)));
+            drivers.addAll(handlerDrivers(date, getPersonInfo(accessToken, 100, i)));
         }
         List<String> jobList = drivers.stream().map(Driver::getJobCode).distinct().collect(Collectors.toList());
         // 删除离职员工
@@ -486,7 +486,7 @@ public class DriverJob implements InitializingBean {
         DRIVER_SERVICE.deleteNotEmptyJob(jobList);
     }
-    public static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
+    public static List<Driver> handlerDrivers(Date date, PersonnelResultResponseVo vo) {
         List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
             FormData formData = item.getFormData();