同步数据

liujun001
1 parent da3efa1f
Showing 14 changed files with 213 additions and 44 deletions
Bsth-admin/src/main/java/com/ruoyi/common/SchedulerProperty.java
Bsth-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
Bsth-admin/src/main/java/com/ruoyi/config/SchedulerConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/RemindDriverKeyLocalController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/job/NewDriverJob.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/ResponseSchedulingDto.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/utils/HttpClientUtil.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-lingangTest.yml
Bsth-admin/src/main/resources/application-druid-prd.yml
@@ -5,6 +5,8 @@ import lombok.Data;
 @Data
 public class SchedulerProperty {
     private String getSchedulingInfoUrl;
+    private String getSchedulingInfo;
     private String nonce;
     private String password;
+    private String getSchedulingInfoNew1;
 }
 package com.ruoyi.common.cache;
 import com.ruoyi.common.SchedulerProperty;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.utils.ConstDateUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
@@ -13,6 +17,7 @@ import org.springframework.web.client.RestTemplate;
 import java.security.MessageDigest;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
@@ -26,6 +31,10 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE
 public class SchedulingCache {
     private static final Logger log = LoggerFactory.getLogger(SchedulingCache.class);
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private RedisTemplate redisTemplate;
     /**
@@ -34,8 +43,9 @@ public class SchedulingCache {
     private static final ConcurrentHashMap<String, Map<String, List<ResponseSchedulingDto>>> CONCURRENT_HASH_MAP = new ConcurrentHashMap<>();
-    public SchedulingCache(SchedulerProperty property) {
+    public SchedulingCache(SchedulerProperty property,RedisCache redisCache) {
         log.info("项目启动加载中获取实时班次并存入缓存-----");
+        this.redisCache = redisCache;
         schedulingInit(property);
     }
@@ -50,17 +60,36 @@ public class SchedulingCache {
         saveSchedulingToCache(url, formatNowDate);
         String formatYesterdayDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         log.info("初始化排班数据:{}", formatYesterdayDate);
-        url = getUrl(formatYesterdayDate, property);
+        url = getUrlOld(formatYesterdayDate, property);
         saveSchedulingToCache(url, formatYesterdayDate);
     }
-    private String getUrl(String formatNowDate, SchedulerProperty property) {
+    public String getUrl(String formatNowDate, SchedulerProperty property) {
         String url = null;
         long timestamp = System.currentTimeMillis();
 //        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
         // 获取排班请求
+        String key = "Scheduling:timeStr:" + formatNowDate;
         try {
-            url = String.format(property.getGetSchedulingInfoUrl(), "99", formatNowDate, timestamp, property.getNonce(), property.getPassword(), getSHA1(getStringStringMap(String.valueOf(timestamp), property)));
+            long timestampValue = timestamp;
+            if (!redisCache.hasKey(key)) {
+                redisCache.setCacheObject(key, "1", 30, TimeUnit.HOURS);
+                timestampValue = 0;
+            }
+            url = String.format(property.getGetSchedulingInfoUrl(), "77", formatNowDate, timestampValue, timestamp, property.getNonce(), property.getPassword(), getSHA1(getStringStringMap(String.valueOf(timestamp), property)));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return url;
+    }
+
+    public String getUrlOld(String formatNowDate, SchedulerProperty property) {
+        String url = null;
+        long timestamp = System.currentTimeMillis();
+//        String formatDate = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(-1));
+        // 获取排班请求
+        try {
+            url = String.format(property.getGetSchedulingInfo(), "77", formatNowDate, timestamp, property.getNonce(), property.getPassword(), getSHA1(getStringStringMap(String.valueOf(timestamp), property)));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -132,6 +161,7 @@ public class SchedulingCache {
             splitSaveScheduling(driverSchedulingMap, jobCode, item);
             splitSaveScheduling(driverSchedulingMap, salePersonJobCode, item);
         });
+
         // 排序
         List<String> keys = new ArrayList<>(driverSchedulingMap.keySet());
         for (String key : keys) {
@@ -147,6 +177,29 @@ public class SchedulingCache {
         return driverSchedulingMap;
     }
+    public List<ResponseSchedulingDto> requestScheduling(String getSchedulingInfoUrl) {
+        List<ResponseSchedulingDto> originSchedulingList = null;
+        int index = 0;
+        int size = 0;
+        while (size == 0) {
+            originSchedulingList = new RestTemplate().exchange(
+                    getSchedulingInfoUrl, HttpMethod.GET, null, new ParameterizedTypeReference<List<ResponseSchedulingDto>>() {
+                    }).getBody();
+            size = CollectionUtils.size(originSchedulingList);
+            index++;
+            if (index > 10 || size > 0) {
+                break;
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        return originSchedulingList;
+    }
+
     private void splitSaveScheduling(Map<String, List<ResponseSchedulingDto>> driverSchedulingMap, String jobCode, ResponseSchedulingDto item) {
         if (!Objects.isNull(jobCode))
             if (Objects.isNull(driverSchedulingMap.get(jobCode))) {
@@ -13,6 +13,10 @@ public class SchedulerConfig {
     private String nonce;
     @Value("${api.config.password}")
     private String password;
+    @Value("${api.url.getSchedulingInfo}")
+    private String getSchedulingInfo;
+    @Value("${api.url.getSchedulingInfoNew1}")
+    private String getSchedulingInfoNew1;
     @Bean
     public SchedulerProperty getSchedulerProperty(){
@@ -20,6 +24,8 @@ public class SchedulerConfig {
         property.setPassword(password);
         property.setNonce(nonce);
         property.setGetSchedulingInfoUrl(getSchedulingInfoUrl);
+        property.setGetSchedulingInfo(getSchedulingInfo);
+        property.setGetSchedulingInfoNew1(getSchedulingInfoNew1);
         return property;
     }
 }
@@ -54,7 +54,7 @@ public class RefreshController {
     @GetMapping(value = "/scheduling")
     @ApiOperation("scheduling")
-    @PreAuthorize("@ss.hasPermi('refresh:scheduling')")
+//    @PreAuthorize("@ss.hasPermi('refresh:scheduling')")
     public ResponseResult<Boolean> test() {
         Date date = new Date();
         for (int i = 0; i < 2; i++) {
@@ -79,7 +79,7 @@ public class RemindDriverKeyLocalController extends BaseController {
             }
         }
         RemindDriverReportVo reportVo = new RemindDriverReportVo();
-        reportVo.setCount(linggangSchedulings.stream().filter(ls-> StringUtils.equalsAnyIgnoreCase(ls.getBcType(),"out")).count());
+        reportVo.setCount(linggangSchedulings.stream().filter(ls -> StringUtils.equalsAnyIgnoreCase(ls.getBcType(), "out")).count());
         if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
             List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList = new ArrayList<>();
@@ -97,7 +97,7 @@ public class RemindDriverKeyLocalController extends BaseController {
                         Optional<LinggangKeyWorkLocation> finalOptional = optional;
                         Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), finalOptional.get().getDevice())).findFirst();
                         equipmentOptional.ifPresent(equipment -> localVo.setEquipmentName(equipment.getName()));
-                        if(i == 0){
+                        if (i == 0) {
                         }
                     }
@@ -114,11 +114,23 @@ public class RemindDriverKeyLocalController extends BaseController {
                         }
                     }
                 }
-                if(i == 0){
-                    reportVo.setCurrentKeyLocaltion(localVo.getEquipmentName());
-                }
                 remindKeyInfoLocalVoList.add(localVo);
             }
+            Optional<LinggangScheduling> opt = linggangSchedulings.stream().filter(f -> Objects.nonNull(f.getSignInId())).max(Comparator.comparing(LinggangScheduling::getFcsjT));
+            if (opt.isPresent()) {
+                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), opt.get().getId())).findFirst();
+                if (optional.isPresent()) {
+                    Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), optional.get().getDevice())).findFirst();
+                    equipmentOptional.ifPresent(equipment -> reportVo.setCurrentKeyLocaltion(equipment.getName()));
+                }
+            } else {
+                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(0).getId())).findFirst();
+                if (optional.isPresent()) {
+                    Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), optional.get().getDevice())).findFirst();
+                    equipmentOptional.ifPresent(equipment -> reportVo.setCurrentKeyLocaltion(equipment.getName()));
+                }
+            }
+
             reportVo.setRemindKeyInfoLocalVoList(remindKeyInfoLocalVoList);
         }
@@ -101,6 +101,8 @@ public class LinggangKeyWorkLocation {
     @Excel(name = "状态：1 是归还；0是借出;2是初始状态")
     private java.lang.Integer type;
+    private Integer type1;
+
     @TableField(exist = false)
     private Long scheduleDateTimeDiff;
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
+import com.ruoyi.common.SchedulerProperty;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -37,8 +38,10 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
@@ -131,6 +134,9 @@ public class DriverJob implements InitializingBean {
     @Value("${api.config.nonce}")
     private String nonce;
+    @Autowired
+    private SchedulerProperty property;
+
     private static DriverSchedulingExpandMapper EXPAND_MAPPER;
     private static DriverSchedulingExpandSmartService EXPAND_SMART_SERVICE;
@@ -248,7 +254,7 @@ public class DriverJob implements InitializingBean {
         Date date = new Date();
         for (int i = 0; i < 2; i++) {
-            JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
+            JwtAuthenticationTokenFilter.putMDC("job", JwtAuthenticationTokenFilter.getRandomValue());
             runScheduling(DateUtils.addDays(date, i).getTime());
         }
@@ -276,26 +282,38 @@ public class DriverJob implements InitializingBean {
         Set<Long> idSets = null;
         if (isSameDay) {
+            String key = "Scheduling:timeStr:" + formatDate;
+            long timestampValu = timestamp;
+            if (!redisCache.hasKey(key)) {
+                redisCache.setCacheObject(key, "1", 30, TimeUnit.HOURS);
+                timestampValu = 0;
+            }
             scheduling.setType(100);
             List<LinggangScheduling> linggangSchedulings = schedulingService.list(scheduling);
             idSets = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
-        }
-
-
+            try {
+                log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
+                getSchedulingInfoUrl = String.format(url, "77", formatDate, timestampValu, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            try {
+                log.info("url:[{}];formatDate:[{}]；timestamp：[{}]", url, formatDate, timestamp);
+                getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
 //        String url = getSchedulingInfoPlan;
-        try {
-            log.info("url:[{}];formatDate:[{}]；timestamp：[{}]",url,formatDate,timestamp);
-            getSchedulingInfoUrl = String.format(url, "77", formatDate, timestamp, NONCE, PASSWORD, getSHA1(getStringStringMap(String.valueOf(timestamp))));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
+
         String requestId = JwtAuthenticationTokenFilter.getRequestIdOfMDCValue();
         // 获取排班信息并存入redis
-        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type,idSets,requestId);
+        saveSchedulingToRedis(getSchedulingInfoUrl, formatDate, timeOut, date, type, idSets, requestId);
         // 删除两天前排班信息
         if (isSameDay) {
             deleteScheduling();
@@ -392,19 +410,11 @@ public class DriverJob implements InitializingBean {
     }
-    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type,Set<Long> idSets,String requestId) {
-        JwtAuthenticationTokenFilter.putMDC("job",requestId);
+    public Map<String, List<ResponseSchedulingDto>> saveSchedulingToRedis(String getSchedulingInfoUrl, String dateKey, String timeOut, Date date, int type, Set<Long> idSets, String requestId) {
+        JwtAuthenticationTokenFilter.putMDC("job", requestId);
         log.info("开始拉取排班:{};[{}]", dateKey, getSchedulingInfoUrl);
-        List<ResponseSchedulingDto> originSchedulingList = RESTTEMPLATE.exchange(
-                getSchedulingInfoUrl,
-                HttpMethod.GET,
-                null,
-                new ParameterizedTypeReference<List<ResponseSchedulingDto>>() {
-                }).getBody();
-
-        if (CollectionUtils.isEmpty(originSchedulingList)) {
-            return null;
-        }
+        List<ResponseSchedulingDto> originSchedulingList = schedulingCache.requestScheduling(getSchedulingInfoUrl);
+        log.info("originSchedulingList:[{}]", JSON.toJSONString(originSchedulingList));
         Map<String, List<ResponseSchedulingDto>> driverSchedulingMap = new HashMap<>(200);
         // 以员工号为key存入排班集合
         originSchedulingList.stream().forEach(item -> {
@@ -423,13 +433,13 @@ public class DriverJob implements InitializingBean {
         List<String> keys = new ArrayList<>(driverSchedulingMap.keySet());
         for (String key : keys) {
             List<ResponseSchedulingDto> schedulingList = driverSchedulingMap.get(key);
-            if(CollectionUtils.isNotEmpty(schedulingList)){
-                schedulingList = schedulingList.stream().map(s->{
-                    if(Objects.isNull(s.getFcsjT())){
+            if (CollectionUtils.isNotEmpty(schedulingList)) {
+                schedulingList = schedulingList.stream().map(s -> {
+                    if (Objects.isNull(s.getFcsjT())) {
                         s.setFcsjT(0L);
                     }
-                    if(Objects.isNull(s.getZdsjT())){
+                    if (Objects.isNull(s.getZdsjT())) {
                         s.setZdsjT(0L);
                     }
@@ -440,7 +450,7 @@ public class DriverJob implements InitializingBean {
         }
         // 存入签到报表
-        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type,idSets,requestId);
+        THREAD_JOB_SERVICE.asyncComputedScheduling(driverSchedulingMap, timeOut, date, type, idSets, requestId);
         // 实时排班直接存入缓存
         SCHEDULING_CACHE.setCacheScheduling(DRIVER_SCHEDULING_PRE + dateKey, driverSchedulingMap);
+package com.ruoyi.job;
+
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.service.driver.NewDriverService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+
+@Component("newDriverJob")
+@Slf4j
+public class NewDriverJob implements InitializingBean {
+    @Autowired
+    private NewDriverService newDriverService;
+    @Transactional(rollbackFor = Exception.class)
+    public void syDriver() {
+        Date date = new Date();
+
+        for (int i = 0; i < 2; i++) {
+            JwtAuthenticationTokenFilter.putMDC("job",JwtAuthenticationTokenFilter.getRandomValue());
+            newDriverService.insertJob();
+        }
+
+
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+    }
+}
@@ -59,6 +59,7 @@ public class ResponseSchedulingDto implements Serializable {
     private Integer dfsj;
     private String scheduleDateStr;
+
     public void setScheduleDateStr(Object scheduleDateStr) {
         if (Objects.nonNull(scheduleDateStr)) {
             this.scheduleDateStr = scheduleDateStr.toString();
@@ -103,6 +104,21 @@ public class ResponseSchedulingDto implements Serializable {
         return null;
     }
+//    public  String getJobCode(){
+//        if(StringUtils.isEmpty(this.jobCode) && StringUtils.isNotEmpty(this.jsy)){
+//            this.jobCode = StringUtils.substringBeforeLast(this.jsy,"/");
+//        }
+//        return this.jobCode;
+//    }
+//
+//    public String getName(){
+//        if(StringUtils.isEmpty(this.name) && StringUtils.isNotEmpty(this.jsy)){
+//            this.name = StringUtils.substringAfterLast(this.jsy,"/");
+//        }
+//        return this.name;
+//    }
+
+
     public void setUpDowm(String upDowm){
         this.upDown = upDowm;
     }
@@ -546,7 +546,7 @@ public class ThreadJobService {
             scheduling.setType(b.getType());
             return scheduling;
-        }).filter(s->StringUtils.isBlank(s.getJobCode()) && StringUtils.isBlank(s.getName()) && !StringUtils.equalsAnyIgnoreCase(s.getJobCode(),"null")
+        }).filter(s->!StringUtils.isBlank(s.getJobCode()) && !StringUtils.isBlank(s.getName()) && !StringUtils.equalsAnyIgnoreCase(s.getJobCode(),"null")
                 && !StringUtils.equalsAnyIgnoreCase(s.getName(),"null")).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(schedulings)) {
             Map<String, List<LinggangScheduling>> distinctMap = new HashMap<>();
@@ -599,6 +599,10 @@ public class ThreadJobService {
                if(CollectionUtils.isNotEmpty(removeSchedulings)){
                    Set<Long> ids = removeSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
                    schedulingService.removeByIds(ids);
+                   schedulings = schedulings1.stream().filter(s->{
+                       Optional<LinggangScheduling> opt = removeSchedulings.stream().filter(s1 -> s1.importEqus(s)).findFirst();
+                       return !opt.isPresent();
+                   }).collect(Collectors.toList());
                }
                 schedulings = schedulings.stream().filter(s -> {
@@ -3,12 +3,18 @@ package com.ruoyi.utils;
 import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.ParseException;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Component;
@@ -16,6 +22,7 @@ import org.springframework.stereotype.Component;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Objects;
@@ -69,4 +76,24 @@ public class HttpClientUtil {
         }
         return null;
     }
+
+
+    public static String get(String url) {
+        String resultContent = null;
+        HttpGet httpGet = new HttpGet(url);
+        try (CloseableHttpClient httpclient = HttpClients.createDefault()) {
+            try (CloseableHttpResponse response = httpclient.execute(httpGet)) {
+
+                HttpEntity entity = response.getEntity();
+                // 获取响应信息
+                resultContent = EntityUtils.toString(entity);
+                if(StringUtils.isNotEmpty(resultContent)){
+                    resultContent = new String(resultContent.getBytes(),StandardCharsets.UTF_8);
+                }
+            }
+        } catch (IOException | ParseException e) {
+            e.printStackTrace();
+        }
+        return resultContent;
+    }
 }
@@ -165,7 +165,8 @@ api:
         getCompanyInfo:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
@@ -165,7 +165,8 @@ api:
         getCompanyInfo:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
@@ -185,7 +185,8 @@ api:
         getCompanyInfo:
         # 获取排班信息
         getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
         getSchedulingInfoPlan: http://58.34.47.74:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464