多配置文件

潘钊
1 parent 6d4822f7
Showing 15 changed files with 174 additions and 84 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/realcontrol/buffer/GetSchedulePlanThread.java
src/main/java/com/bsth/service/realcontrol/buffer/ScheduleBuffer.java
src/main/java/com/bsth/util/BatchSaveUtils.java
src/main/java/com/bsth/util/ConfigUtil.java
src/main/java/com/bsth/vehicle/directive/Consts.java
src/main/java/com/bsth/vehicle/directive/util/HttpUtils.java
src/main/java/com/bsth/vehicle/gpsdata/GpsRefreshThread.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/static/pages/control/line/js/drawSvg.js
@@ -4,6 +4,7 @@ package com.bsth;
 import com.bsth.security.SecurityMetadataSourceService;
 import com.bsth.service.realcontrol.buffer.GetSchedulePlanThread;
 import com.bsth.service.realcontrol.buffer.SchedulePersistenceThread;
+import com.bsth.util.DateUtils;
 import com.bsth.vehicle.common.CommonRefreshThread;
 import com.bsth.vehicle.directive.thread.DirectivePersistenceThread;
 import com.bsth.vehicle.directive.thread.FirstScheduleIssuedThread;
@@ -63,13 +64,15 @@ public class StartCommand implements CommandLineRunner{
 			 * GPS实时数据更新 线程
 			 * 每8秒和网关HTTP接口同步一次
 			 */
-			//scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
+			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 8, TimeUnit.SECONDS);
 			/**
 			 * 每天 0点 抓取当天实际排班
 			 */
+			//启动时先run一次
+			getSchedulePlanThread.start();
 			scheduler.scheduleAtFixedRate(getSchedulePlanThread
-					, 0//DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
+					, DateUtils.getTimesnight() + 5 - System.currentTimeMillis() / 1000
 					, 60 * 60 * 24, TimeUnit.SECONDS);
 			/**
@@ -106,7 +109,7 @@ public class StartCommand implements CommandLineRunner{
 			 * 还车线程（2分钟运行一次）
 			 * 将借出的车刷回原线路
 			 */
-			//scheduler.scheduleWithFixedDelay(revertLineThread, 60 , 60 * 2 , TimeUnit.SECONDS);
+			scheduler.scheduleWithFixedDelay(revertLineThread, 60 , 60 * 2 , TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -18,6 +18,9 @@ public class ScheduleRealInfo {
 	@Id
 	@GeneratedValue
 	private Long id;
+	
+	/** 计划ID */
+	private Long spId;
 	/** 排班计划日期 */
 	private Date scheduleDate;
@@ -141,10 +144,10 @@ public class ScheduleRealInfo {
 	private Integer directiveState = -1;
 	/** 起点站计划到达时间 */
-	private String qdzArrDateJH;
+	private String qdzArrDatejh;
 	/** 起点站实际到达时间 */
-	private String qdzArrDateSJ;
+	private String qdzArrDatesj;
 	public void addRemarks(String remark){
 		String newRem = this.getRemarks();
@@ -500,8 +503,15 @@ public class ScheduleRealInfo {
 			this.setDfsj(this.getFcsj());
 			//发车时间戳
 			this.setFcsjT(sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + this.getFcsj()).getTime());
-			//待发时间
+			//待发时间戳
 			this.setDfsjT(this.getFcsjT());
+			
+			//计划终点时间
+			if(this.getBcsj() != null){
+				Date zdDate = new Date(this.getFcsjT() + (this.getBcsj() * 60 * 1000));
+				this.setZdsjT(zdDate.getTime());
+				this.setZdsj(sdfHHmm.format(zdDate));
+			}
 		}catch(Exception e){
 			e.printStackTrace();
 		}
@@ -521,19 +531,19 @@ public class ScheduleRealInfo {
 	}
 	public String getQdzArrDateJH() {
-		return qdzArrDateJH;
+		return qdzArrDatejh;
 	}
 	public void setQdzArrDateJH(String qdzArrDateJH) {
-		this.qdzArrDateJH = qdzArrDateJH;
+		this.qdzArrDatejh = qdzArrDateJH;
 	}
 	public String getQdzArrDateSJ() {
-		return qdzArrDateSJ;
+		return qdzArrDatesj;
 	}
 	public void setQdzArrDateSJ(String qdzArrDateSJ) {
-		this.qdzArrDateSJ = qdzArrDateSJ;
+		this.qdzArrDatesj = qdzArrDateSJ;
 	}
 	public boolean isSflj() {
@@ -588,5 +598,12 @@ public class ScheduleRealInfo {
 			e.printStackTrace();
 		}
 	}
-	
+
+	public Long getSpId() {
+		return spId;
+	}
+
+	public void setSpId(Long spId) {
+		this.spId = spId;
+	}
 }
@@ -135,11 +135,11 @@ public class SchedulePlanInfo {
     @ManyToOne(cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
-    @JoinTable(
+/*    @JoinTable(
             name = "bsth_c_s_sp_r_info",
             joinColumns = @JoinColumn(name = "sp_info_id"),
             inverseJoinColumns = @JoinColumn(name = "sp_id")
-    )
+    )*/
     private SchedulePlan schedulePlan;
     public SchedulePlanInfo() {}
 package com.bsth.repository.realcontrol;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -34,4 +35,13 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlName = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.clZbh like ?3")
 	List<ScheduleRealInfo> historyMessage(String line,String date,String code);
+	
+	@Query(value = "select max(id) from ScheduleRealInfo")
+	Long getMaxId();
+	
+	@Query(value = "select count(*) from ScheduleRealInfo s where s.scheduleDate = ?1")
+	int countByDate(Date date);
+	
+	@Query(value = "select s from ScheduleRealInfo s where s.scheduleDate = ?1")
+	List<ScheduleRealInfo> findByDate(Date date);
 }
@@ -36,29 +36,39 @@ public class GetSchedulePlanThread  extends Thread{
 	@Autowired
 	ScheduleRealInfoRepository scheduleRealInfoRepository;
-	SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm");
+	SimpleDateFormat sdfyyyyMMdd = new SimpleDateFormat("yyyy-MM-dd");
 	@Override
 	public void run() {
 		try{
+			List<ScheduleRealInfo>  realList = null;
 			String dateStr = /*sdf.format(new Date())*/"2016-06-01";
-			List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
-			
-			//实际排班计划
-			List<ScheduleRealInfo>  realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
-			
-			Date zdDate;
-			for(ScheduleRealInfo item : realList){
-				item.syncTime();
-				//计划终点时间
-				if(item.getBcsj() != null){
-					zdDate = new Date(item.getFcsjT() + (item.getBcsj() * 60 * 1000));
-					item.setZdsjT(zdDate.getTime());
-					item.setZdsj(sdfHHmm.format(zdDate));
+			Date cDate = sdfyyyyMMdd.parse(dateStr);
+			//查询数据库是否有今日排班
+			int size = scheduleRealInfoRepository.countByDate(cDate);
+			if(size > 0){
+				//从数据库恢复当日排班
+				realList = scheduleRealInfoRepository.findByDate(cDate);
+			}
+			else{
+				List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(dateStr);
+				
+				//实际排班计划
+				realList = JSONArray.parseArray(JSON.toJSONString(list), ScheduleRealInfo.class);
+				//查询数据库最大ID
+				Long id = scheduleRealInfoRepository.getMaxId();
+				if(null == id)
+					id = 0L;
+				id ++;
+				
+				for(ScheduleRealInfo item : realList){
+					item.setSpId(item.getId());
+					item.setId(id ++);//设置ID
 				}
+				//入库
+				new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
 			}
-			//new BatchSaveUtils<ScheduleRealInfo>().saveList(realList, ScheduleRealInfo.class);
 			//写入缓存
 			ScheduleBuffer.init(realList);
@@ -77,6 +77,11 @@ public class ScheduleBuffer {
 	public static int init(List<ScheduleRealInfo> list){
 		try{
+			//计算时间戳
+			for(ScheduleRealInfo schedul : list){
+				schedul.syncTime();
+			}
+			
 			//发车时间排序
 			Collections.sort(list, scheduleComparator);
@@ -36,11 +36,10 @@ public class BatchSaveUtils&lt;T&gt; {
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	static {
-		Tools t = new Tools("application.properties");
-		driver = t.getValue("spring.datasource.driver-class-name");
-		url = t.getValue("spring.datasource.url");
-		uname = t.getValue("spring.datasource.username");
-		pwd = t.getValue("spring.datasource.password");
+		driver = ConfigUtil.get("spring.datasource.driver-class-name");
+		url = ConfigUtil.get("spring.datasource.url");
+		uname = ConfigUtil.get("spring.datasource.username");
+		pwd = ConfigUtil.get("spring.datasource.password");
 	}
 	/**
+package com.bsth.util;
+
+public class ConfigUtil {
+
+	static Tools tools;
+	
+	static{
+		tools = new Tools("application.properties");
+		String active = tools.getValue("spring.profiles.active");
+		tools = new Tools("application-"+active+".properties");
+	}
+	
+	public static String get(String key){
+		return tools.getValue(key);
+	}
+}
 package com.bsth.vehicle.directive;
-import com.bsth.util.Tools;
 public class Consts {
-	static Tools tools = new Tools("application.properties");
-	
 	/**
 	 * 调度指令 -多营运状态 [0][0]上行营运 [0][1]上行非营运 [1][0]下行营运 [1][1]下行非营运
 	 */
 	public static final int[][] SERVICE_STATE = { { 0, 0x02000000 }, { 0x10000000, 0x12000000 } };
-	/**
-	 * 消息下发地址
-	 */
-	public static final String SEND_DIRECTIVE_URL = tools.getValue("http.send.directive");
 }
@@ -13,7 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.vehicle.directive.Consts;
+import com.bsth.util.ConfigUtil;
 /**
  * 
@@ -27,6 +27,12 @@ public class HttpUtils {
 	static Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+	static String url;
+	
+	static{
+		url = ConfigUtil.get("http.send.directive");
+	}
+	
 	public static  int postJson(String jsonStr){
 		logger.info("send : " + jsonStr);
@@ -40,7 +46,7 @@ public class HttpUtils {
 			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)  
 			        .setSocketTimeout(3000).build();
-			HttpPost post = new HttpPost(Consts.SEND_DIRECTIVE_URL);
+			HttpPost post = new HttpPost(url);
 			post.setConfig(requestConfig);
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.Tools;
+import com.bsth.util.ConfigUtil;
 import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
 import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.collect.ImmutableMap;
@@ -42,8 +42,7 @@ public class GpsRefreshThread extends Thread{
 	public GpsRefreshThread() {
-		Tools t = new Tools("application.properties");
-		url = t.getValue("http.gps.real.url");
+		url = ConfigUtil.get("http.gps.real.url");
 	}
 	@Autowired
+server.port=9088
+management.port= 9001
+management.address= 127.0.0.1
+
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= true
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
+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=5
+
+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
+
+##
+#222.66.0.204:5555
+##\u5B9E\u65F6gps
+http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+##\u6D88\u606F\u4E0B\u53D1
+http.send.directive = http://192.168.168.192:8080/transport_server/message/
+server.port=9088
+management.port= 9001
+management.address= 127.0.0.1
+
+spring.jpa.hibernate.ddl-auto= update
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= true
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://192.168.168.171:3306/control
+spring.datasource.username= root
+spring.datasource.password= root2jsp
+#DATASOURCE
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=5
+
+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
+
+##
+#222.66.0.204:5555
+##\u5B9E\u65F6gps
+http.gps.real.url= http://192.168.168.171:8080/transport_server/rtgps/
+##\u6D88\u606F\u4E0B\u53D1
+http.send.directive = http://192.168.168.171:8080/transport_server/message/
-server.port=9088
-management.port= 9001
-management.address= 127.0.0.1
-
-spring.jpa.hibernate.ddl-auto= update
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
-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=5
-
-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
+spring.profiles: dev,prod
+spring.profiles.active: dev
 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
-##
-#222.66.0.204:5555
-##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
-##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.192:8080/transport_server/message/
@@ -49,10 +49,12 @@ var drawSvg = (function(){
 				svg = drawSvgObject.init(lineId, data, container, w, 80);
 			//线路编码 和 首页SVG对照
 			homeSvgMapp[lineId] = svg;
-			//双击事件
-			$(svg[0]).dblclick(function(){
-				$('#top-tabs-wrap .nav-tabs a[data-id='+this.id+']').click();
-			});
+			if(svg && svg.length > 0){
+				//双击事件
+				$(svg[0]).dblclick(function(){
+					$('#top-tabs-wrap .nav-tabs a[data-id='+this.id+']').click();
+				});
+			}
 		},
 		initAloneSvg: function(lineId, data, container){
 			var w = $(document).width(),