Merge branch 'minhang' of http://222.66.0.204:8800/panzhaov5/bsth_control into minhang

徐烜
2 parents 0bc5bc31 54e31c08
Showing 5 changed files with 13 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/entity/StationRoute.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/forecast/sample/main.html
 package com.bsth.controller.realcontrol;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -223,6 +226,8 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 */
 	@RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
 	public Map<String, Object> outgoAdjustAll(@RequestParam String params){
+		//反转义
+		params = StringEscapeUtils.unescapeHtml4(params);
 		return scheduleRealInfoService.outgoAdjustAll(params);
 	}
@@ -127,7 +127,7 @@ public class BasicData implements CommandLineRunner{
 		private void loadStationRouteInfo() {
-			Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+			Iterator<StationRoute> iterator = stationRouteRepository.findAll2().iterator();
 			Map<String, Integer> map = new HashMap<>();
 			StationRoute route;
@@ -21,7 +21,8 @@ import java.util.Date;
 @Table(name = "bsth_c_stationroute")
 @NamedEntityGraphs({
     @NamedEntityGraph(name = "stationRoute_station", attributeNodes = {
-            @NamedAttributeNode("station")
+            @NamedAttributeNode("station"),
+            @NamedAttributeNode("line")
     })
 })
 public class StationRoute {
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 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.url= jdbc:mysql://127.0.0.1:3306/control
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.168.192:8080/transport_server/message/
 \ No newline at end of file
@@ -116,7 +116,7 @@
 			    <div class="row">
 			        <div class="col-md-12" style="">
 			            <button type="submit" class="btn green">开始生成数据</button>
-			            <button type="button" class="btn default">取消</button>
+			            <button type="button" class="btn default layui-layer-close">取消</button>
 			        </div>
 			    </div>
 			</div>