潘钊 / bsth_control · Commits

Commit fa1826ca0226d3edecfdbdaf8705fbe47c4f6a7a

Authored by 徐烜
2 parents 099630cd f07c06b3
build: skipped

Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8

Inline Side-by-side
Showing 12 changed files with 142 additions and 104 deletions
src/main/java/com/bsth/common/Constants.java
  View file @fa1826c
... ... @@ -61,4 +61,6 @@ public class Constants {
61 61 public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
62 62  
63 63 public static final String WEAK_CIPHER = "weakCipher";
  64 +
  65 + public static final String FILE_AUTH = "/.well-known/pki-validation/fileauth.txt";
64 66 }
... ...
src/main/java/com/bsth/controller/realcontrol/calc/ReCalcDataController.java
  View file @fa1826c
... ... @@ -20,7 +20,8 @@ import java.util.Map;
20 20 @RequestMapping("/sch/reCalc")
21 21 public class ReCalcDataController {
22 22  
23   - private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
  23 +// private static String reCalcUrl = "http://10.10.150.24:30571/reCalc/scheduleDetail";
  24 + private static String reCalcUrl = "http://127.0.0.1:30571/reCalc/scheduleDetail";
24 25  
25 26 Logger logger = LoggerFactory.getLogger(this.getClass());
26 27  
... ...
src/main/java/com/bsth/filter/BaseFilter.java
  View file @fa1826c
1   -package com.bsth.filter;
2   -
3   -import com.bsth.common.Constants;
4   -import org.springframework.util.AntPathMatcher;
5   -import org.springframework.util.PathMatcher;
6   -
7   -import javax.servlet.*;
8   -import javax.servlet.http.HttpServletRequest;
9   -import javax.servlet.http.HttpServletResponse;
10   -import java.io.IOException;
11   -
12   -public abstract class BaseFilter implements Filter {
13   -
14   - private final PathMatcher pathMatcher = new AntPathMatcher();
15   -
16   - /**
17   - * 白名单
18   - */
19   - private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
20   - Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH,
21   - Constants.VEHICLE_DATA_SYNC_URL };
22   -
23   - @Override
24   - public void destroy() {
25   -
26   - }
27   -
28   - @Override
29   - public void doFilter(ServletRequest request, ServletResponse response,
30   - FilterChain chain) throws IOException, ServletException {
31   -
32   - HttpServletRequest httpRequest = (HttpServletRequest) request;
33   - HttpServletResponse httpResponse = (HttpServletResponse) response;
34   -
35   - String currentURL = httpRequest.getServletPath();
36   -
37   - if (isWhiteURL(currentURL)) {
38   - chain.doFilter(request, response);
39   - return;
40   - }
41   -
42   - doFilter(httpRequest, httpResponse, chain);
43   - return;
44   - }
45   -
46   - public void doFilter(HttpServletRequest request,
47   - HttpServletResponse response, FilterChain chain)
48   - throws IOException, ServletException {
49   - chain.doFilter(request, response);
50   - }
51   -
52   - @Override
53   - public void init(FilterConfig arg0) throws ServletException {
54   -
55   - }
56   -
57   - private boolean isWhiteURL(String currentURL) {
58   - for (String whiteURL : whiteListURLs) {
59   - if (pathMatcher.match(whiteURL, currentURL)) {
60   - return true;
61   - }
62   - }
63   - return false;
64   - }
65   -}
  1 +package com.bsth.filter;
  2 +
  3 +import com.bsth.common.Constants;
  4 +import org.springframework.util.AntPathMatcher;
  5 +import org.springframework.util.PathMatcher;
  6 +
  7 +import javax.servlet.*;
  8 +import javax.servlet.http.HttpServletRequest;
  9 +import javax.servlet.http.HttpServletResponse;
  10 +import java.io.IOException;
  11 +
  12 +public abstract class BaseFilter implements Filter {
  13 +
  14 + private final PathMatcher pathMatcher = new AntPathMatcher();
  15 +
  16 + /**
  17 + * 白名单
  18 + */
  19 + private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
  20 + Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
  21 + Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
  22 + Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
  23 + Constants.FILE_AUTH};
  24 +
  25 + @Override
  26 + public void destroy() {
  27 +
  28 + }
  29 +
  30 + @Override
  31 + public void doFilter(ServletRequest request, ServletResponse response,
  32 + FilterChain chain) throws IOException, ServletException {
  33 +
  34 + HttpServletRequest httpRequest = (HttpServletRequest) request;
  35 + HttpServletResponse httpResponse = (HttpServletResponse) response;
  36 +
  37 + String currentURL = httpRequest.getServletPath();
  38 +
  39 + if (isWhiteURL(currentURL)) {
  40 + chain.doFilter(request, response);
  41 + return;
  42 + }
  43 +
  44 + doFilter(httpRequest, httpResponse, chain);
  45 + return;
  46 + }
  47 +
  48 + public void doFilter(HttpServletRequest request,
  49 + HttpServletResponse response, FilterChain chain)
  50 + throws IOException, ServletException {
  51 + chain.doFilter(request, response);
  52 + }
  53 +
  54 + @Override
  55 + public void init(FilterConfig arg0) throws ServletException {
  56 +
  57 + }
  58 +
  59 + private boolean isWhiteURL(String currentURL) {
  60 + for (String whiteURL : whiteListURLs) {
  61 + if (pathMatcher.match(whiteURL, currentURL)) {
  62 + return true;
  63 + }
  64 + }
  65 + return false;
  66 + }
  67 +}
... ...
src/main/java/com/bsth/security/WebSecurityConfig.java
  View file @fa1826c
... ... @@ -42,7 +42,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
42 42 public void configure(WebSecurity web) throws Exception {
43 43 // 白名单
44 44 web.ignoring().antMatchers(Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
45   - Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
  45 + Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL,
  46 + Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH);
46 47 }
47 48  
48 49 @Override
... ...
src/main/java/com/bsth/security/filter/LoginInterceptor.java
  View file @fa1826c
... ... @@ -33,8 +33,9 @@ public class LoginInterceptor implements Filter {
33 33 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
34 34 */
35 35 private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
36   - Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT,
37   - Constants.VEHICLE_DATA_SYNC_URL };
  36 + Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN,
  37 + Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,
  38 + Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH };
38 39  
39 40  
40 41 @Override
... ...
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
  View file @fa1826c
... ... @@ -253,6 +253,7 @@ public class ReportServiceImpl implements ReportService{
253 253  
254 254  
255 255 public List<ArrivalInfo> load2(String line,Long date1,Long date2,Date dates1,Date dates2,String zd,String zdlx,String fcsj){
  256 + SimpleDateFormat yearFormat = new SimpleDateFormat("yyyy");
256 257 List<ArrivalInfo> list = new ArrayList<ArrivalInfo>();
257 258 Calendar cal = Calendar.getInstance();
258 259 cal.setTime(dates1);
... ... @@ -264,18 +265,43 @@ public class ReportServiceImpl implements ReportService{
264 265 PreparedStatement ps = null;
265 266 ResultSet rs = null;
266 267 String year=fcsj.substring(0,4);
267   - String sql = "select * from bsth_c_arrival_info_"+year+" where line_id=? AND weeks_year>=? "
268   - + " AND weeks_year<=? AND ts > ? AND ts <=? AND up_down=? AND stop_no like ? order by ts";
  268 +
  269 + String year1 = yearFormat.format(dates1);
  270 + String year2 = yearFormat.format(dates2);
  271 + List<Integer> weeksList = new ArrayList<Integer>();
  272 + if(year1.equals(year2)){
  273 + //把每一周的编号加入list，一年最多五十几周。最多循环60次避免意外死循环
  274 + for(int w = 0, weeks_num = weeks_year1; w < 60 && weeks_num <= weeks_year2; w++, weeks_num++){
  275 + weeksList.add(weeks_num);
  276 + }
  277 + } else {
  278 + weeksList.add(weeks_year1);
  279 + weeksList.add(weeks_year2);
  280 + }
  281 +
  282 + String tempStr = "";
  283 + for(int i = 0; i < weeksList.size(); i++){
  284 + tempStr += "?,";
  285 + }
  286 + if(tempStr.length() > 0){
  287 + tempStr = tempStr.substring(0, tempStr.length() - 1);
  288 + }
  289 +
  290 + String sql = "select * from bsth_c_arrival_info_"+year+" where weeks_year in ("+tempStr+") "
  291 + + " AND line_id=? AND up_down=? AND stop_no like ? AND ts between ? AND ? order by ts";
  292 + System.out.println(sql);
269 293 try{
270 294 conn = DBUtils_MS.getConnection();
271 295 ps = conn.prepareStatement(sql);
272   - ps.setString(1, line);
273   - ps.setInt(2, weeks_year1);
274   - ps.setInt(3, weeks_year2);
275   - ps.setLong(4, date1);
276   - ps.setLong(5, date2);
277   - ps.setString(6, zdlx);
278   - ps.setString(7, "%"+zd+"%");
  296 + int no = 1;
  297 + for(;no <= weeksList.size(); no++){
  298 + ps.setInt(no, weeksList.get(no-1));
  299 + }
  300 + ps.setString(no++, line);
  301 + ps.setString(no++, zdlx);
  302 + ps.setString(no++, ""+zd+"%");
  303 + ps.setLong(no++, date1);
  304 + ps.setLong(no++, date2);
279 305 rs = ps.executeQuery();
280 306  
281 307 list = resultSet2Set(rs);
... ...
src/main/resources/application-test.properties
  View file @fa1826c
... ... @@ -13,9 +13,9 @@ spring.jpa.show-sql= false
13 13  
14 14 #DATABASE
15 15 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
16   -spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
  16 +spring.datasource.url= jdbc:mysql://192.170.100.114/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
17 17 spring.datasource.username= root
18   -spring.datasource.password= root
  18 +spring.datasource.password= root2jsp
19 19 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
20 20  
21 21 #DATASOURCE SETTING
... ... @@ -33,21 +33,26 @@ spring.datasource.hikari.register-mbeans=true
33 33 ## gps client data
34 34 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
35 35 ## gateway real data
36   -http.gps.real.url= http://10.10.200.79:8080/transport_server/rtgps/
  36 +http.gps.real.url= http://192.170.100.252:8080/transport_server/rtgps/
37 37 ## gateway send directive
38   -#http.send.directive = http://10.10.200.79:8080/transport_server/message/
  38 +##http.send.directive = http://192.170.100.252:8080/transport_server/message/
39 39 ## rfid data
40   -http.rfid.url= http://10.10.200.82:9000/rfid
  40 +http.rfid.url= http://192.170.100.80:9000/rfid
  41 +## wxsb
  42 +http.report.url.05= http://116.228.197.222:8081/ygjwsystem_j2ee/clbx/clbx_dd.do
  43 +http.report.url.22= http://116.247.73.122:9098/jgjwsystem_j2ee/clbx/clbx_dd.do
  44 +http.report.url.26= http://116.236.141.34:8088/nhjwsystem_j2ee/clbx/clbx_dd.do
  45 +http.report.url.55= http://180.168.216.248:8088/snjwsystem_j2ee/clbx/clbx_dd.do
41 46 ## http ticketing interface
42 47 http.ticketing.interface= http://112.64.187.3:1080/gjService/request
43 48 http.mtplan.interface= https://112.64.45.51/wxk-prod-api/service-api/pdgj/schedule/byinfo
44 49 ## first last generate
45   -ms.fl.generate=false
  50 +ms.fl.generate=true
46 51 ## dsm ack interface
47 52 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
48 53 ## cp ack interface
49 54 cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
50 55 ## admin mail
51   -admin.mail= 113252620@qq.com
  56 +admin.mail= 3090342880@qq.com
52 57 ## enabled
53   -enabled.whiteip= true
54 58 \ No newline at end of file
  59 +enabled.whiteip= false
55 60 \ No newline at end of file
... ...
src/main/resources/static/pages/forms/calc/calcsingledata.html
  View file @fa1826c
... ... @@ -249,9 +249,9 @@
249 249 var i = layer.load(2);
250 250 $get("/calc_mix/singledatatj",{gsdmSing:gsdmSing,fgsdmSing:fgsdmSing,line:line,startDate:startDate,endDate:endDate,tjtype:tjtype,cont:cont,sfdc:sfdc},function(result){
251 251 layer.close(i);
252   - var singledata = template('singledata',{list:result});
  252 + var calcsingledata = template('calcsingledata',{list:result});
253 253 // 把渲染好的模版html文本追加到表格中
254   - $('#forms tbody').html(singledata);
  254 + $('#forms tbody').html(calcsingledata);
255 255 });
256 256 });
257 257  
... ... @@ -284,7 +284,7 @@
284 284 });
285 285  
286 286 </script>
287   -<script type="text/html" id="singledata">
  287 +<script type="text/html" id="calcsingledata">
288 288 {{each list as obj i}}
289 289 <tr>
290 290 <td>{{i+1}}</td>
... ...
src/main/resources/static/pages/mforms/singledatas/singledata_date.html
  View file @fa1826c
... ... @@ -219,9 +219,9 @@
219 219  
220 220 $get("/report/singledatatj",params,function(result){
221 221 layer.close(i);
222   - var singledata = template('singledata',{list:result});
  222 + var singledata_date = template('singledata_date',{list:result});
223 223 // 把渲染好的模版html文本追加到表格中
224   - $('#forms tbody').html(singledata);
  224 + $('#forms tbody').html(singledata_date);
225 225  
226 226 });
227 227  
... ... @@ -264,7 +264,7 @@
264 264 });
265 265 });
266 266 </script>
267   -<script type="text/html" id="singledata">
  267 +<script type="text/html" id="singledata_date">
268 268 {{each list as obj i}}
269 269 <tr>
270 270 <td>{{i+1}}</td>
... ... @@ -290,7 +290,7 @@
290 290 </tr>
291 291 {{/if}}
292 292 </script>
293   -<script type="text/html" id="singledata2">
  293 +<script type="text/html" id="singledata_date2">
294 294 {{each list as obj i}}
295 295 <tr>
296 296 <td>{{i+1}}</td>
... ...
src/main/resources/static/pages/mforms/singledatas/singledatanew.html
  View file @fa1826c
... ... @@ -194,9 +194,9 @@
194 194 }
195 195 obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
196 196 });
197   - var singledata = template('singledata',{list:result});
  197 + var singledatanew = template('singledatanew',{list:result});
198 198 // 把渲染好的模版html文本追加到表格中
199   - $('#forms tbody').html(singledata);
  199 + $('#forms tbody').html(singledatanew);
200 200  
201 201 });
202 202 });
... ... @@ -214,7 +214,7 @@
214 214 });
215 215 });
216 216 </script>
217   -<script type="text/html" id="singledata">
  217 +<script type="text/html" id="singledatanew">
218 218 {{each list as obj i}}
219 219 <tr>
220 220 <td>{{i+1}}</td>
... ...
src/main/resources/static/pages/mforms/singledatas/singledatas.html
  View file @fa1826c
... ... @@ -198,9 +198,9 @@
198 198 if(tjtype=='jsy'){
199 199 $get("/mcy_forms/singledata",{ gsdmSing:gsdmSing,fgsdmSing:fgsdmSing, line:line,startDate:startDate,lpName:lpName,tjtype:tjtype},function(result){
200 200 layer.close(i);
201   - var singledata = template('singledata',{list:result});
  201 + var singledatas = template('singledatas',{list:result});
202 202 // 把渲染好的模版html文本追加到表格中
203   - $('#forms tbody').html(singledata);
  203 + $('#forms tbody').html(singledatas);
204 204  
205 205 });
206 206 }else{
... ... @@ -208,9 +208,9 @@
208 208  
209 209 layer.close(i);
210 210  
211   - var singledata = template('singledata2',{list:result});
  211 + var singledatas2 = template('singledatas2',{list:result});
212 212 // 把渲染好的模版html文本追加到表格中
213   - $('#forms tbody').html(singledata);
  213 + $('#forms tbody').html(singledatas2);
214 214  
215 215 });
216 216 }
... ... @@ -238,7 +238,7 @@
238 238 });
239 239 });
240 240 </script>
241   -<script type="text/html" id="singledata">
  241 +<script type="text/html" id="singledatas">
242 242 {{each list as obj i}}
243 243 <tr>
244 244 <td>{{i+1}}</td>
... ... @@ -264,7 +264,7 @@
264 264 </tr>
265 265 {{/if}}
266 266 </script>
267   -<script type="text/html" id="singledata2">
  267 +<script type="text/html" id="singledatas2">
268 268 {{each list as obj i}}
269 269 <tr>
270 270 <td>{{i+1}}</td>
... ...
src/main/resources/static/pages/oil/checkJyryList.html
  View file @fa1826c
... ... @@ -110,7 +110,7 @@
110 110 </div>
111 111 </div>
112 112  
113   -<script id="check_list_temp" type="text/html">
  113 +<script id="check_list_temp_jsy" type="text/html">
114 114 {{each list as obj i}}
115 115 <tr>
116 116 <td style="vertical-align: middle;">
... ... @@ -318,7 +318,7 @@ $(function(){
318 318 $.each(data.dataList, function(i, obj) {
319 319 obj.yyrq = moment(obj.yyrq).format("YYYY-MM-DD");
320 320 });
321   - var bodyHtm = template('check_list_temp', {list: data.dataList});
  321 + var bodyHtm = template('check_list_temp_jsy', {list: data.dataList});
322 322 $('#datatable_check tbody').html(bodyHtm);
323 323 iCheckChange();
324 324 if(pagination && data.dataList.length > 0){
... ...