fix: 全量更新人员信息接口

guzijian
1 parent 16f71e97
Showing 4 changed files with 40 additions and 3 deletions
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.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
@@ -213,4 +213,12 @@ public class DriverController extends BaseController {
         return driverService.faceRegistrationFeedback(vo.getDeviceId(), vo.getJobCodes());
     }
  
+    /**
+     * 全量更新信息
+     */
+    @GetMapping("/allUpdateDriverInfo")
+    public AjaxResult allUpdateDriverInfo(HttpServletRequest request) {
+        return driverService.allUpdateDriverInfo(request);
+    }
+
 }
@@ -121,4 +121,6 @@ public interface IDriverService
     List<String> queryEmptyJob(List<String> jobList);
  
     void updateDriverBaseInfoByJobCodes(List<Driver> drivers, int filterImage);
+
+    AjaxResult allUpdateDriverInfo(HttpServletRequest request);
 }
@@ -35,6 +35,8 @@ import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
 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.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.system.domain.SysNotice;
@@ -75,6 +77,9 @@ public class DriverServiceImpl implements IDriverService {
  
     private Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
  
+    @Value("${api.personnel.token.tokenUrl}")
+    private String tokenUrl;
+
     @Resource
     private NowSchedulingCache cache;
  
@@ -588,6 +593,28 @@ public class DriverServiceImpl implements IDriverService {
         driverMapper.updateDriverBaseInfoByJobCodes(drivers, filterImage);
     }
  
+    @Override
+    public AjaxResult allUpdateDriverInfo(HttpServletRequest request) {
+        String header = request.getHeader("X-TOKEN-AUTH");
+        if (!"gzjUse".equals(header)) {
+            throw new RuntimeException("错误的认证");
+        }
+        Date date = new Date();
+        int pageSize = 100;
+        TokenResponseVo tokenVo = DriverJob.getToken(tokenUrl);
+        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);
+        for (int i = 2; i <= countPage; i++) {
+            drivers.addAll(DriverJob.getDrivers(date, DriverJob.getPersonInfo(tokenVo.getAccessToken(), 100, i)));
+        }
+        if (CollectionUtil.isNotEmpty(drivers)) {
+            driverMapper.updateDriverBaseInfoByJobCodes(drivers, 1);
+        }
+        return AjaxResult.success();
+    }
+
     private void sendNotice(List<DriverSignInRecommendation> nowTimerList) {
         List<SysNotice> noticeList = new ArrayList<>(nowTimerList.size());
         for (DriverSignInRecommendation item : nowTimerList) {
@@ -410,7 +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);
+//        DRIVER_SERVICE.updateDriverBaseInfoByJobCodes(drivers, 1);
         // 删除离职员工
         handleNotEmptyJob(jobList);
         // 过滤已经存在的员工工号
@@ -442,7 +442,7 @@ public class DriverJob implements InitializingBean {
         log.info("更新人脸注册状态完毕");
     }
  
-    private static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
+    public static List<Driver> getDrivers(Date date, PersonnelResultResponseVo vo) {
         List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
             FormData formData = item.getFormData();
@@ -460,7 +460,7 @@ public class DriverJob implements InitializingBean {
         return drivers;
     }
  
-    private static PersonnelResultResponseVo getPersonInfo(String accessToken, Integer pageSize, Integer currentPage) {
+    public static PersonnelResultResponseVo getPersonInfo(String accessToken, Integer pageSize, Integer currentPage) {
         RestTemplate restTemplate = new RestTemplate();
         String url = "https://api.dingtalk.com/v1.0/yida/forms/instances/search";
         PersonnelRequestVo vo = new PersonnelRequestVo();