Merge branch 'master' of 192.168.168.201:panzhaov5/control_service_data_Interface

娄高锋
2 parents b17080a8 edc8ae49
Showing 3 changed files with 25 additions and 3 deletions
src/main/java/com/bsth/repository/ScheduleRealInfoRepository.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/resources/application-prod.properties
@@ -47,6 +47,16 @@ public interface ScheduleRealInfoRepository extends PagingAndSortingRepository&lt;S
 	 * @return
 	 */
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.gsBm=?2")
+	List<ScheduleRealInfo> findByDateAndCompany(String schDate, String companyCode);
+
+	/**
+	 * 根据日期和公司编码获取班次信息
+	 * @param schDate
+	 * @param companyCode
+	 * @return
+	 */
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.gsBm=?2 and s.updateDate>=?3")
 	List<ScheduleRealInfo> findByDateAndCompany(String schDate, String companyCode, Date timestamp);
@@ -229,6 +229,18 @@ public class ScheduleRealService implements InitializingBean {
     }
     @GET
+    @Path("/sch_jk_db/{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);
+        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company);
+        redisService.calcTime(scheduleRealInfos);
+        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
+
+        return result;
+    }
+
+    @GET
     @Path("/sch_jk4modify/{company}/{rq}/{timestamp}")
     public List<ScheduleRealInfoDTO_JK> sch_jk4modify(@PathParam("company") String company, @PathParam("rq") String rq, @PathParam("timestamp") long timestamp) {
         DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyyMMdd");
@@ -334,7 +346,7 @@ public class ScheduleRealService implements InitializingBean {
                         ObjectMapper mapper = new ObjectMapper();
                         String json = mapper.writeValueAsString(data);
                         logger.info(json);
-                        ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("PDGJ_JQDD", json);
+                        /*ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send("PDGJ_JQDD", json);
                         future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
                             @Override
@@ -346,7 +358,7 @@ public class ScheduleRealService implements InitializingBean {
                             public void onFailure(Throwable ex) {
                                 logger.error("kafka发送电子路单异常", ex);
                             }
-                        });
+                        });*/
                     }
                 } catch (Exception e) {
                     logger.error("kafka发电子路单调度异常", e);
@@ -30,7 +30,7 @@ spring.redis.password=bsth_control_001
 spring.redis.port=28008
 #kafka
-spring.kafka.bootstrap-servers=47.102.42.244:9092
+spring.kafka.bootstrap-servers=47.106.82.232:9092
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.buffer-memory=33554432