1.青浦调度库损坏迁移至GPS库

2.开放数据库实时路单查询

1.青浦调度库损坏迁移至GPS库
2.开放数据库实时路单查询
王通
1 parent 9743706c
Showing 6 changed files with 112 additions and 61 deletions
src/main/java/com/bsth/redis/ScheduleRedisService.java
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
src/main/resources/application.properties
src/main/resources/ms-jdbc.properties
@@ -282,7 +282,7 @@ public class ScheduleRedisService implements CommandLineRunner {
     private static DateTimeFormatter fmtyyyyMMddHHmm = DateTimeFormat.forPattern("yyyy-MM-ddHH:mm"),
             fmtHHmm = DateTimeFormat.forPattern("HH:mm");
-    private void calcTime(List<ScheduleRealInfo> list) {
+    public void calcTime(List<ScheduleRealInfo> list) {
         if (list.size() == 0)
             return;
@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.stereotype.Repository;
+import java.util.Date;
 import java.util.List;
 @Repository
@@ -38,4 +39,24 @@ public interface ScheduleRealInfoRepository extends PagingAndSortingRepository&lt;S
 	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr>?1")
 	List<ScheduleRealInfo> findByDateLT(String schDate);
+
+	/**
+	 * 根据日期和公司编码获取班次信息
+	 * @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")
+	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);
 }
@@ -7,6 +7,7 @@ import com.bsth.common.BasicData;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.ScheduleRealInfo;
 import com.bsth.redis.ScheduleRedisService;
+import com.bsth.repository.ScheduleRealInfoRepository;
 import com.bsth.server_rs.base_info.line.Line;
 import com.bsth.server_rs.base_info.line.buffer.LineBufferData;
 import com.bsth.server_rs.schedule.dto.ScheduleCcInfoConfig;
@@ -16,6 +17,9 @@ import com.bsth.util.ConfigUtil;
 import com.bsth.util.HttpClientUtils;
 import com.google.common.base.Splitter;
 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;
@@ -40,6 +44,9 @@ public class ScheduleRealService {
     @Autowired
     SchRealDataBuffer schRealDataBuffer;
+    @Autowired
+    private ScheduleRealInfoRepository scheduleRealInfoRepository;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     static String url;
@@ -199,6 +206,30 @@ public class ScheduleRealService {
         return all;
     }
+    @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");
+        DateTime dateTime = fmt.parseDateTime(rq);
+        List<ScheduleRealInfo> scheduleRealInfos = scheduleRealInfoRepository.findByDateAndCompany(dateTime.toString("yyyy-MM-dd"), company, new Date(timestamp));
+        redisService.calcTime(scheduleRealInfos);
+        List<ScheduleRealInfoDTO_JK> result = ScheduleRealInfoDTO_JK.getMultiInstance(scheduleRealInfos);
+
+        return result;
+    }
+
     /**
      * 读取指定日期的redis 数据，计算程序调用
      *
-server.port=9089
-management.port= 9001
-management.address= 127.0.0.1
-
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root@JSP2jsp
-#DATASOURCE
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=3
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-#REDIS
-spring.redis.database=0
-spring.redis.host=192.168.50.120
-spring.redis.password=bsth_control_001
-spring.redis.port=28008
-
-http.control.service_data_url= http://192.168.40.82:9088/companyService
-http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
-
+server.port=9089
+management.port= 9001
+management.address= 127.0.0.1
+
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= false
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://192.168.40.82/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= 123456
+#DATASOURCE
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=3
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+#REDIS
+spring.redis.database=0
+spring.redis.host=192.168.50.120
+spring.redis.password=bsth_control_001
+spring.redis.port=28008
+
+http.control.service_data_url= http://192.168.40.82:9088/companyService
+http.control.secret.key= dVPHJkWUt5FhMT7jrM2dLV7QvlHAmZFd42rs1P0usBx8A7HZki
+
 http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
 \ No newline at end of file
-spring.profiles: dev,prod
-spring.profiles.active: prod
-
-spring.view.suffix=.html
-server.session-timeout=-1
-security.basic.enabled=false
-
-# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
-# File size limit
-multipart.maxFileSize = -1
-# Total request size for a multipart/form-data
-multipart.maxRequestSize = -1
-
-server.compression.enabled=true
-server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
-
-#redis
-cache.days=15
+spring.profiles.active= prod
+
+spring.view.suffix=.html
+server.session-timeout=-1
+security.basic.enabled=false
+
+# \u4E0A\u4F20\u6587\u4EF6\u5927\u5C0F\u9650\u5236\u914D\u7F6E
+# File size limit
+multipart.maxFileSize = -1
+# Total request size for a multipart/form-data
+multipart.maxRequestSize = -1
+
+server.compression.enabled=true
+server.compression.mime-types=application/json,application/xml,text/html,text/xml,text/plain,text/javascript,text/css,application/javascript
+
+#redis
+cache.days=15
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
-#ms.mysql.username= root
-#ms.mysql.password= panzhao
-
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= panzhao
+
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://192.168.40.82/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
 ms.mysql.password= 123456
 \ No newline at end of file