潘钊 / bsth_control · Commits

Commit d5087be13f71bd2c318747c73512dc74a37421b2

Authored by 徐烜
2 parents 0bc5bc31 54e31c08
build: skipped

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

Inline Side-by-side
Showing 5 changed files with 13 additions and 7 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @d5087be
1 1 package com.bsth.controller.realcontrol;
2 2  
  3 +import java.io.UnsupportedEncodingException;
  4 +import java.net.URLDecoder;
3 5 import java.util.Collection;
4 6 import java.util.List;
5 7 import java.util.Map;
6 8  
  9 +import org.apache.commons.lang3.StringEscapeUtils;
7 10 import org.springframework.beans.factory.annotation.Autowired;
8 11 import org.springframework.web.bind.annotation.PathVariable;
9 12 import org.springframework.web.bind.annotation.RequestMapping;
... ... @@ -223,6 +226,8 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo,
223 226 */
224 227 @RequestMapping(value = "/outgoAdjustAll", method = RequestMethod.POST)
225 228 public Map<String, Object> outgoAdjustAll(@RequestParam String params){
  229 + //反转义
  230 + params = StringEscapeUtils.unescapeHtml4(params);
226 231 return scheduleRealInfoService.outgoAdjustAll(params);
227 232 }
228 233  
... ...
src/main/java/com/bsth/data/BasicData.java
  View file @d5087be
... ... @@ -127,7 +127,7 @@ public class BasicData implements CommandLineRunner{
127 127  
128 128  
129 129 private void loadStationRouteInfo() {
130   - Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
  130 + Iterator<StationRoute> iterator = stationRouteRepository.findAll2().iterator();
131 131 Map<String, Integer> map = new HashMap<>();
132 132 StationRoute route;
133 133  
... ...
src/main/java/com/bsth/entity/StationRoute.java
  View file @d5087be
... ... @@ -21,7 +21,8 @@ import java.util.Date;
21 21 @Table(name = "bsth_c_stationroute")
22 22 @NamedEntityGraphs({
23 23 @NamedEntityGraph(name = "stationRoute_station", attributeNodes = {
24   - @NamedAttributeNode("station")
  24 + @NamedAttributeNode("station"),
  25 + @NamedAttributeNode("line")
25 26 })
26 27 })
27 28 public class StationRoute {
... ...
src/main/resources/application-dev.properties
  View file @d5087be
... ... @@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
8 8 spring.jpa.database= MYSQL
9 9 spring.jpa.show-sql= true
10 10 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
11   -spring.datasource.url= jdbc:mysql://192.168.168.201:3306/control
  11 +spring.datasource.url= jdbc:mysql://127.0.0.1:3306/control
12 12 spring.datasource.username= root
13   -spring.datasource.password= 123456
  13 +spring.datasource.password= panzhao
14 14 #DATASOURCE
15 15 spring.datasource.max-active=100
16 16 spring.datasource.max-idle=8
... ... @@ -26,6 +26,6 @@ spring.datasource.validation-query=select 1
26 26 ##
27 27 #222.66.0.204:5555
28 28 ##\u5B9E\u65F6gps
29   -http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
  29 +http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
30 30 ##\u6D88\u606F\u4E0B\u53D1
31   -http.send.directive = http://192.168.168.201:9090/transport_server/message/
32 31 \ No newline at end of file
  32 +http.send.directive = http://192.168.168.192:8080/transport_server/message/
33 33 \ No newline at end of file
... ...
src/main/resources/static/pages/forecast/sample/main.html
  View file @d5087be
... ... @@ -116,7 +116,7 @@
116 116 <div class="row">
117 117 <div class="col-md-12" style="">
118 118 <button type="submit" class="btn green">开始生成数据</button>
119   - <button type="button" class="btn default">取消</button>
  119 + <button type="button" class="btn default layui-layer-close">取消</button>
120 120 </div>
121 121 </div>
122 122 </div>
... ...