1.external加入路单数据

王通
1 parent 130ef664
Showing 1 changed file with 33 additions and 0 deletions
src/main/java/com/bsth/server_rs/dks/BxRestService.java
 package com.bsth.server_rs.dks;
+import com.bsth.entity.ScheduleRealInfo;
+import com.bsth.redis.ScheduleRedisService;
+import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.server_rs.AuthorizeInterceptor_IN;
 import com.bsth.server_rs.base_info.car.Car;
 import com.bsth.server_rs.base_info.car.buffer.CarBufferData;
@@ -16,8 +19,12 @@ import com.bsth.server_rs.gps.buffer.GpsRealDataBuffer;
 import com.bsth.server_rs.gps.dao.HistoryGpsDao;
 import com.bsth.server_rs.gps.entity.GpsEntity;
 import com.bsth.server_rs.gps.entity.HistoryArrivalEntity;
+import com.bsth.server_rs.schedule.dto.ScheduleRealInfoDTO_JK;
 import com.bsth.util.ThreadLocalUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,6 +54,12 @@ public class BxRestService {
     @Autowired
     private AuthorizeInterceptor_IN authorizeInterceptorIn;
+    @Autowired
+    private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
+    @Autowired
+    private ScheduleRedisService scheduleRedisService;
+
     @GET
     @Path("/line")
     public List<Map<String, Object>> findAllLine() {
@@ -282,6 +295,26 @@ public class BxRestService {
     }
     @GET
+    @Path("/waybill/{company}/{rq}")
+    public List<ScheduleRealInfoDTO_JK> sch_jk(@PathParam("company") String company, @PathParam("rq") String rq) {
+        DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyyMMdd");
+        DateTime dateTime = fmt.parseDateTime(rq);
+        if (!dateTime.isBefore(DateTime.now().withTimeAtStartOfDay())) {
+            return new ArrayList<>();
+        }
+        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company);
+        scheduleRedisService.calcTime(scheduleRealInfos);
+        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
+        for (ScheduleRealInfoDTO_JK jk : result) {
+            if (jk.getZdsjActualTime() == null) {
+                jk.setZdsjActualTime(jk.getZdsjT());
+            }
+        }
+
+        return result;
+    }
+
+    @GET
     @Path("/limits/reload")
     public void reload() {
         String password = ThreadLocalUtils.getPassword();