更改调度接口 ip

2c2c2c
1 parent 264b2a7a
Showing 2 changed files with 27 additions and 13 deletions
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/resources/application-druid-prd.yml
@@ -143,7 +143,6 @@ public class DriverJob implements InitializingBean {
      * 通过该定时任务获取驾驶员信息 并保存到数据库
      */
     public void getDriverInfo(String params) throws Exception {
-        try {
 //            String getDriverInfoUrl = String.format(GET_DRIVER_INFO_URL, params);
             //获取token
             log.info("开始获取人事接口token");
@@ -153,10 +152,6 @@ public class DriverJob implements InitializingBean {
             log.info("开始获取驾驶员信息");
             getDrivers(tokenVo.getAccessToken());
             log.info("获取驾驶员信息结束");
-
-        } catch (Exception e) {
-            log.info("执行失败：" + e.getMessage());
-        }
         log.info("执行结束");
     }
@@ -468,8 +463,11 @@ public class DriverJob implements InitializingBean {
                 // 保留需要更新的driver
                 .collect(Collectors.toList());
         // 更新表
-        ATTENDANCE_MAIN_SERVICE.updateAttendanceMainByJobCode(updateDriverList);
-        DRIVER_SERVICE.updateDrivers(updateDriverList);
+        if(!updateDriverList.isEmpty()){
+            ATTENDANCE_MAIN_SERVICE.updateAttendanceMainByJobCode(updateDriverList);
+            DRIVER_SERVICE.updateDrivers(updateDriverList);
+        }
+
     }
@@ -487,24 +485,40 @@ public class DriverJob implements InitializingBean {
         DRIVER_SERVICE.deleteNotEmptyJob(jobList);
     }
+    /**
+     * 处理驾驶员信息
+     * 根据给定的日期和人员结果响应对象，筛选并转换驾驶员数据
+     *
+     * @param date 用于更新驾驶员信息的日期
+     * @param vo 包含人员数据的响应对象
+     * @return 返回转换后的驾驶员信息列表
+     */
     public static List<Driver> handlerDrivers(Date date, PersonnelResultResponseVo vo) {
+        // 检查响应对象及其数据是否非空，如果非空则记录错误日志（这里可能需要修改日志级别）
         if(Objects.nonNull(vo) && CollectionUtils.isNotEmpty(vo.getData())){
-            log.error("refresh driver:[{}]",JSON.toJSONString(vo.getData()));
+            //log.error("refresh driver:[{}]",JSON.toJSONString(vo.getData()));
         }
+
+        // 将输入的数据转换为Driver对象列表
         List<Driver> drivers = vo.getData().stream().map(item -> {
             Driver driver = new Driver();
             FormData formData = item.getFormData();
+            // 设置驾驶员信息的更新时间
             driver.setUpdateTime(date);
+            // 设置驾驶员的工号、姓名和岗位
             driver.setJobCode(formData.getTextField_lk9mk222());
             driver.setPersonnelName(formData.getTextField_lk9mk224());
             driver.setPosts(formData.getTextField_lk9mk226());
-            // 解析JSON字符串
+            // 解析JSON字符串，获取驾驶员的图片信息，并设置第一个图片的预览URL
             List<ImageField_lk9mk228> lists = JSONArray.parseArray(formData.getImageField_lk9mk228(), ImageField_lk9mk228.class);
             driver.setImage(CollectionUtil.isNotEmpty(lists) ? lists.get(0).getPreviewUrl() : "");
+            // 设置驾驶员的线路名称和车队名称
             driver.setLineName(formData.getTextField_lkmgdvnu());
             driver.setFleetName(formData.getTextField_lkmgdvnv());
             return driver;
         }).collect(Collectors.toList());
+
+        // 返回转换后的驾驶员信息列表
         return drivers;
     }
@@ -182,12 +182,12 @@ api:
     template: 车队与线路匹配模板
     url:
         # all 为获取所有驾驶员信息
-        getDriverInfo: http://192.168.50.120:9089/webservice/rest/person/%s
+        getDriverInfo: http://192.168.40.82:9089/webservice/rest/person/%s
         # 获取公司编码下的员工信息 暂时没用
-        getCompanyInfo: http://192.168.50.120:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+        getCompanyInfo: http://192.168.40.82:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
         # 获取排班信息
-        getSchedulingInfo: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://192.168.50.120:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfo: http://192.168.40.82:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://192.168.40.82:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         # 固定密码
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464