潘钊 / bsth_control · Commits

Commit 9759d0ef2b4990796a8dff33fa86e8b2795002e9

Authored by 廖磊
2 parents b22667d3 22cdb082

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into 

minhang
Inline Side-by-side
Showing 10 changed files with 194 additions and 189 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
  View file @9759d0e
... ... @@ -34,6 +34,7 @@ import com.bsth.util.ReportUtils;
34 34 @RequestMapping("mcy_export")
35 35 public class ExportController {
36 36  
  37 +
37 38 @Autowired
38 39 FormsService formsService;
39 40  
... ... @@ -71,9 +72,9 @@ public class ExportController {
71 72  
72 73 try {
73 74 listI.add(resList.iterator());
74   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
75   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\linepasswengerflow.xls",
76   - path + "export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
  75 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  76 + ee.excelReplace(listI, new Object[] { map }, path + "mould/linepasswengerflow.xls",
  77 + path + "export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
77 78 } catch (Exception e) {
78 79 e.printStackTrace();
79 80 }
... ... @@ -111,9 +112,9 @@ public class ExportController {
111 112  
112 113 try {
113 114 listI.add(resList.iterator());
114   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
115   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\shifday.xls",
116   - path + "export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
  115 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  116 + ee.excelReplace(listI, new Object[] { map }, path + "mould/shifday.xls",
  117 + path + "export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
117 118 } catch (Exception e) {
118 119 e.printStackTrace();
119 120 }
... ... @@ -148,9 +149,9 @@ public class ExportController {
148 149 try {
149 150 listI.add(resList.iterator());
150 151  
151   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
152   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\shiftuehiclemanth.xls", path
153   - + "export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
  152 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  153 + ee.excelReplace(listI, new Object[] { map }, path + "mould/shiftuehiclemanth.xls", path
  154 + + "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
154 155  
155 156 } catch (Exception e) {
156 157 e.printStackTrace();
... ... @@ -177,6 +178,9 @@ public class ExportController {
177 178 m.put("clzbh", l.getClzbh());
178 179 m.put("jsy", l.getJsy());
179 180 m.put("jName", l.getjName());
  181 +
  182 +
  183 +
180 184 m.put("sgh", l.getSgh());
181 185 m.put("sName", l.getsName());
182 186 m.put("jhlc", l.getJhlc());
... ... @@ -186,14 +190,15 @@ public class ExportController {
186 190 m.put("unyyyl", l.getUnyyyl());
187 191 m.put("jhjl", l.getJhjl());
188 192 resList.add(m);
  193 +
189 194 i++;
190 195 }
191 196  
192 197 try {
193 198 listI.add(resList.iterator());
194   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
195   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\singledata.xls",
196   - path + "export\\路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
  199 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  200 + ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls",
  201 + path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
197 202 } catch (Exception e) {
198 203 e.printStackTrace();
199 204 }
... ... @@ -231,9 +236,9 @@ public class ExportController {
231 236  
232 237 try {
233 238 listI.add(resList.iterator());
234   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
235   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls",
236   - path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
  239 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  240 + ee.excelReplace(listI, new Object[] { map }, path + "mould/vehicleloading.xls",
  241 + path + "export/车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls");
237 242 } catch (Exception e) {
238 243 e.printStackTrace();
239 244 }
... ... @@ -264,8 +269,8 @@ public class ExportController {
264 269  
265 270 try {
266 271 listI.add(resList.iterator());
267   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
268   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\operationservice.xls", path + "export\\运营服务阶段报表"
  272 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  273 + ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/运营服务阶段报表"
269 274 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
270 275 } catch (Exception e) {
271 276 e.printStackTrace();
... ... @@ -303,8 +308,8 @@ public class ExportController {
303 308  
304 309 try {
305 310 listI.add(resList.iterator());
306   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
307   - ee.excelReplace(listI, new Object[] { map }, path + "mould\\changetochange.xls", path + "export\\换人换车情况日统计"
  311 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  312 + ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/换人换车情况日统计"
308 313 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
309 314 } catch (Exception e) {
310 315 e.printStackTrace();
... ... @@ -383,8 +388,8 @@ public class ExportController {
383 388  
384 389 try {
385 390 listI.add(resList.iterator());
386   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
387   - ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\turnoutrate.xls", path + "export\\营运线路出车率统计表"
  391 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  392 + ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/营运线路出车率统计表"
388 393 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
389 394 } catch (Exception e) {
390 395 e.printStackTrace();
... ... @@ -458,8 +463,8 @@ public class ExportController {
458 463  
459 464 try {
460 465 listI.add(resList.iterator());
461   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
462   - ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\executionrate.xls", path + "export\\班次执行率统计表"
  466 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  467 + ee.excelReplace(listI, new Object[] { map1 }, path + "mould/executionrate.xls", path + "export/班次执行率统计表"
463 468 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
464 469 } catch (Exception e) {
465 470 e.printStackTrace();
... ... @@ -527,8 +532,8 @@ public class ExportController {
527 532  
528 533 try {
529 534 listI.add(resList.iterator());
530   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
531   - ee.excelReplace(listI, new Object[] { map1 }, path + "mould\\allline.xls", path + "export\\营运线路名称统计表"
  535 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  536 + ee.excelReplace(listI, new Object[] { map1 }, path + "mould/allline.xls", path + "export/营运线路名称统计表"
532 537 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
533 538 } catch (Exception e) {
534 539 e.printStackTrace();
... ... @@ -579,8 +584,8 @@ public class ExportController {
579 584 m.put("date", map.get("date").toString());
580 585 try {
581 586 listI.add(resList.iterator());
582   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
583   - ee.excelReplace(listI, new Object[] { m }, path + "mould\\daily.xls", path + "export\\班次日报表"
  587 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  588 + ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls", path + "export/班次日报表"
584 589 + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls");
585 590 } catch (Exception e) {
586 591 e.printStackTrace();
... ...
src/main/java/com/bsth/controller/oil/YlbController.java
  View file @9759d0e
... ... @@ -186,9 +186,9 @@ public class YlbController extends BaseController<Ylb, Integer>{
186 186 }
187 187 try {
188 188 listI.add(resList.iterator());
189   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
190   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\list.xls",
191   - path+"export\\进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
  189 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  190 + ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
  191 + path+"export/进出场存油量" + sdfSimple.format(sdfMonth.parse(map.get("rq").toString())) + ".xls");
192 192 } catch (Exception e) {
193 193 e.printStackTrace();
194 194 }
... ...
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
  View file @9759d0e
1   -package com.bsth.data.gpsdata.arrival.handlers;
2   -
3   -import com.bsth.data.gpsdata.GpsEntity;
4   -import com.bsth.data.gpsdata.arrival.GeoCacheData;
5   -import com.bsth.data.gpsdata.arrival.SignalHandle;
6   -import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
7   -import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
8   -import com.vividsolutions.jts.geom.Coordinate;
9   -import com.vividsolutions.jts.geom.GeometryFactory;
10   -import com.vividsolutions.jts.geom.LineString;
11   -import com.vividsolutions.jts.geom.Point;
12   -import org.springframework.stereotype.Component;
13   -
14   -import java.util.List;
15   -
16   -/**
17   - * GPS异常状态判定 （越界/超速）
18   - * Created by panzhao on 2017/1/10.
19   - */
20   -@Component
21   -public class AbnormalStateHandle extends SignalHandle{
22   -
23   - //默认限速
24   - private static final double DEFAULT_SPEED_LIMIT = 60;
25   - //越界阈值
26   - private static final double OUT_BOUNDS_THRESHOLD = 100;
27   -
28   - GeometryFactory geometryFactory = new GeometryFactory();
29   -
30   - @Override
31   - public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
32   -
33   - if(overspeed(gps))
34   - return true;
35   -
36   - if(outOfBounds((gps)))
37   - return true;
38   -
39   - return false;
40   - }
41   -
42   - /**
43   - * 是否超速
44   - * @param gps
45   - * @return
46   - */
47   - public boolean overspeed(GpsEntity gps){
48   - double maxSpeed = DEFAULT_SPEED_LIMIT;
49   - if(GeoCacheData.speedLimit(gps.getLineId()) != null)
50   - maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
51   -
52   - if(gps.getSpeed() > maxSpeed){
53   - gps.setAbnormalStatus("overspeed");
54   - return true;
55   - }
56   - return false;
57   - }
58   -
59   - /**
60   - * 是否越界
61   - * @param gps
62   - * @return
63   - */
64   - public boolean outOfBounds(GpsEntity gps){
65   - //场内的车不处理
66   - if(gps.getInstation() == 2){
67   - return false;
68   - }
69   -
70   - List<LineString> list = GeoCacheData.getLineStringList(gps);
71   - Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
72   -
73   - double min = -1, distance;
74   -
75   - for(LineString lineString : list){
76   - distance = GeoUtils.getDistanceFromLine(lineString, point);
77   -
78   - if(min == -1 || min > distance)
79   - min = distance;
80   - }
81   -
82   - gps.setOutOfBoundDistance(min);
83   - if(min > OUT_BOUNDS_THRESHOLD){
84   - gps.setAbnormalStatus("outBounds");
85   - return true;
86   - }
87   - return false;
88   - }
89   -}
  1 +package com.bsth.data.gpsdata.arrival.handlers;
  2 +
  3 +import com.bsth.data.gpsdata.GpsEntity;
  4 +import com.bsth.data.gpsdata.arrival.GeoCacheData;
  5 +import com.bsth.data.gpsdata.arrival.SignalHandle;
  6 +import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
  7 +import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
  8 +import com.vividsolutions.jts.geom.Coordinate;
  9 +import com.vividsolutions.jts.geom.GeometryFactory;
  10 +import com.vividsolutions.jts.geom.LineString;
  11 +import com.vividsolutions.jts.geom.Point;
  12 +import org.springframework.stereotype.Component;
  13 +
  14 +import java.util.List;
  15 +
  16 +/**
  17 + * GPS异常状态判定 （越界/超速）
  18 + * Created by panzhao on 2017/1/10.
  19 + */
  20 +@Component
  21 +public class AbnormalStateHandle extends SignalHandle{
  22 +
  23 + //默认限速
  24 + private static final double DEFAULT_SPEED_LIMIT = 60;
  25 + //越界阈值
  26 + private static final double OUT_BOUNDS_THRESHOLD = 100;
  27 +
  28 + GeometryFactory geometryFactory = new GeometryFactory();
  29 +
  30 + @Override
  31 + public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
  32 +
  33 + if(overspeed(gps))
  34 + return true;
  35 +
  36 + if(outOfBounds((gps)))
  37 + return true;
  38 +
  39 + return false;
  40 + }
  41 +
  42 + /**
  43 + * 是否超速
  44 + * @param gps
  45 + * @return
  46 + */
  47 + public boolean overspeed(GpsEntity gps){
  48 + double maxSpeed = DEFAULT_SPEED_LIMIT;
  49 + if(GeoCacheData.speedLimit(gps.getLineId()) != null)
  50 + maxSpeed = GeoCacheData.speedLimit(gps.getLineId());
  51 +
  52 + if(gps.getSpeed() > maxSpeed){
  53 + gps.setAbnormalStatus("overspeed");
  54 + return true;
  55 + }
  56 + return false;
  57 + }
  58 +
  59 + /**
  60 + * 是否越界
  61 + * @param gps
  62 + * @return
  63 + */
  64 + public boolean outOfBounds(GpsEntity gps){
  65 + //场内的车不处理
  66 + if(gps.getInstation() == 2){
  67 + return false;
  68 + }
  69 +
  70 + List<LineString> list = GeoCacheData.getLineStringList(gps);
  71 + Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
  72 +
  73 + double min = -1, distance;
  74 +
  75 + for(LineString lineString : list){
  76 + distance = GeoUtils.getDistanceFromLine(lineString, point);
  77 +
  78 + if(min == -1 || min > distance)
  79 + min = distance;
  80 + }
  81 +
  82 + gps.setOutOfBoundDistance(min);
  83 + if(min > OUT_BOUNDS_THRESHOLD){
  84 + gps.setAbnormalStatus("outBounds");
  85 + return true;
  86 + }
  87 + return false;
  88 + }
  89 +}
... ...
src/main/java/com/bsth/service/forms/impl/ExportServiceImpl.java
  View file @9759d0e
... ... @@ -46,9 +46,9 @@ public class ExportServiceImpl implements ExportService{
46 46  
47 47 try {
48 48 listI.add(resList.iterator());
49   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
50   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\waybillday.xls",
51   - path+"export\\行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  49 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  50 + ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls",
  51 + path+"export/行车路单日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
52 52 } catch (Exception e) {
53 53 e.printStackTrace();
54 54 }
... ... @@ -72,9 +72,9 @@ public class ExportServiceImpl implements ExportService{
72 72  
73 73 try {
74 74 listI.add(resList.iterator());
75   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
76   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\linepasswengerflow.xls",
77   - path+"export\\线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  75 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  76 + ee.excelReplace(listI, new Object[] { map }, path+"mould/linepasswengerflow.xls",
  77 + path+"export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
78 78 } catch (Exception e) {
79 79 e.printStackTrace();
80 80 }
... ... @@ -115,9 +115,9 @@ public class ExportServiceImpl implements ExportService{
115 115  
116 116 try {
117 117 listI.add(resList.iterator());
118   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
119   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\shifday.xls",
120   - path+"export\\班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  118 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  119 + ee.excelReplace(listI, new Object[] { map }, path+"mould/shifday.xls",
  120 + path+"export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
121 121 } catch (Exception e) {
122 122 e.printStackTrace();
123 123 }
... ... @@ -151,9 +151,9 @@ public class ExportServiceImpl implements ExportService{
151 151  
152 152 try {
153 153 listI.add(resList.iterator());
154   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
155   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\shiftuehiclemanth.xls",
156   - path+"export\\班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
  154 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  155 + ee.excelReplace(listI, new Object[] { map }, path+"mould/shiftuehiclemanth.xls",
  156 + path+"export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
157 157 } catch (Exception e) {
158 158 e.printStackTrace();
159 159 }
... ... @@ -191,9 +191,9 @@ public class ExportServiceImpl implements ExportService{
191 191  
192 192 try {
193 193 listI.add(resList.iterator());
194   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
195   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\singledata.xls",
196   - path+"export\\路单日报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
  194 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  195 + ee.excelReplace(listI, new Object[] { map }, path+"mould/singledata.xls",
  196 + path+"export/路单日报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
197 197 } catch (Exception e) {
198 198 e.printStackTrace();
199 199 }
... ... @@ -230,9 +230,9 @@ public class ExportServiceImpl implements ExportService{
230 230  
231 231 try {
232 232 listI.add(resList.iterator());
233   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
234   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\vehicleloading.xls",
235   - path+"export\\车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  233 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  234 + ee.excelReplace(listI, new Object[] { map }, path+"mould/vehicleloading.xls",
  235 + path+"export/车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
236 236 } catch (Exception e) {
237 237 e.printStackTrace();
238 238 }
... ... @@ -261,9 +261,9 @@ public class ExportServiceImpl implements ExportService{
261 261  
262 262 try {
263 263 listI.add(resList.iterator());
264   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
265   - ee.excelReplace(listI, new Object[] { map }, path+"mould\\operationservice.xls",
266   - path+"export\\运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
  264 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  265 + ee.excelReplace(listI, new Object[] { map }, path+"mould/operationservice.xls",
  266 + path+"export/运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
267 267 } catch (Exception e) {
268 268 e.printStackTrace();
269 269 }
... ...
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @9759d0e
... ... @@ -526,9 +526,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
526 526 ReportUtils ee = new ReportUtils();
527 527 try {
528 528 listI.add(resList.iterator());
529   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
530   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\busInterval"+statu+".xls",
531   - path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate))
  529 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  530 + ee.excelReplace(listI, new Object[] { m }, path+"mould/busInterval"+statu+".xls",
  531 + path+"export/班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate))
532 532 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
533 533 } catch (Exception e) {
534 534 // TODO: handle exception
... ... @@ -1076,9 +1076,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1076 1076 modelMap.put("lpType", "路牌名");
1077 1077 try {
1078 1078 listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator());
1079   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
1080   - ee.excelReplace(listI, new Object[] { modelMap }, path+"mould\\timeAndSpeed.xls",
1081   - path+"export\\行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate))
  1079 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1080 + ee.excelReplace(listI, new Object[] { modelMap }, path+"mould/timeAndSpeed.xls",
  1081 + path+"export/行驶时间及车速统计表" + sdfSimple.format(sdfMonth.parse(startDate))
1082 1082 + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
1083 1083 } catch (Exception e) {
1084 1084 // TODO: handle exception
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @9759d0e
... ... @@ -538,11 +538,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
538 538 map.put("ljbc", ljbc);
539 539 map.put("sjbc", jhbc-cjbc+ljbc);
540 540  
541   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
  541 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
542 542  
543 543 list.add(listMap.iterator());
544   - ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould\\waybill_minhang.xls",
545   - path+"export\\" + date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
  544 + ee.excelReplace(list, new Object[] { scheduleRealInfos.get(0),map }, path+"mould/waybill_minhang.xls",
  545 + path+"export/" + date+"-"+jName+"-"+clZbh+"-"+lpName+"-行车路单.xls");
546 546 return scheduleRealInfos;
547 547 }
548 548  
... ... @@ -575,12 +575,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
575 575 map.put("totalYH", totalYH);
576 576 map.put("totalBCS", totalBCS);
577 577  
578   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
  578 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
579 579  
580 580 listI.add(list.iterator());
581 581 try {
582   - ee.excelReplace(listI, new Object[]{map}, path + "mould\\daily.xls",
583   - path + "export\\班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  582 + ee.excelReplace(listI, new Object[]{map}, path + "mould/daily.xls",
  583 + path + "export/班次日报" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
584 584 } catch (ParseException e) {
585 585 e.printStackTrace();
586 586 }
... ... @@ -632,9 +632,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
632 632 }
633 633 try {
634 634 listI.add(newList.iterator());
635   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
636   - ee.excelReplace(listI, new Object[]{m}, path + "mould\\historyMessage.xls",
637   - path + "export\\调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  635 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  636 + ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls",
  637 + path + "export/调度历史消息" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
638 638 } catch (Exception e) {
639 639 // TODO: handle exception
640 640 e.printStackTrace();
... ... @@ -661,9 +661,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
661 661 }
662 662 try {
663 663 listI.add(newList.iterator());
664   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
665   - ee.excelReplace(listI, new Object[]{m}, path + "mould\\message.xls",
666   - path + "export\\调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  664 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  665 + ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls",
  666 + path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
667 667 } catch (Exception e) {
668 668 // TODO: handle exception
669 669 e.printStackTrace();
... ... @@ -1261,9 +1261,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1261 1261 }
1262 1262 try {
1263 1263 listI.add(listMap.iterator());
1264   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
1265   - ee.excelReplace(listI, new Object[]{m}, path + "mould\\account.xls",
1266   - path + "export\\驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  1264 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  1265 + ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls",
  1266 + path + "export/驾驶员请求台账" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1267 1267 } catch (Exception e) {
1268 1268 // TODO: handle exception
1269 1269 e.printStackTrace();
... ... @@ -1316,9 +1316,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1316 1316 }
1317 1317 try {
1318 1318 listI.add(tempList.iterator());
1319   - String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\";
1320   - ee.excelReplace(listI, new Object[]{m}, path + "mould\\correctForm.xls",
1321   - path + "export\\修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
  1319 + String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
  1320 + ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
  1321 + path + "export/修正报表" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
1322 1322 } catch (Exception e) {
1323 1323 // TODO: handle exception
1324 1324 e.printStackTrace();
... ... @@ -1749,9 +1749,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1749 1749 ReportUtils ee = new ReportUtils();
1750 1750 try {
1751 1751 listI.add(lMap.iterator());
1752   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
1753   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\statisticsDaily_.xls",
1754   - path+"export\\统计日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
  1752 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1753 + ee.excelReplace(listI, new Object[] { m }, path+"mould/statisticsDaily_.xls",
  1754 + path+"export/统计日报" + sdfSimple.format(sdfMonth.parse(date))+".xls");
1755 1755 } catch (Exception e) {
1756 1756 // TODO: handle exception
1757 1757 e.printStackTrace();
... ...
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
  View file @9759d0e
... ... @@ -259,9 +259,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
259 259 ReportUtils ee = new ReportUtils();
260 260 try {
261 261 listI.add(resList.iterator());
262   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
263   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\peoCarPlan.xls",
264   - path+"export\\计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  262 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  263 + ee.excelReplace(listI, new Object[] { m }, path+"mould/peoCarPlan.xls",
  264 + path+"export/计划车辆班次人员" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
265 265 } catch (Exception e) {
266 266 // TODO: handle exception
267 267 e.printStackTrace();
... ... @@ -463,9 +463,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
463 463 ReportUtils ee = new ReportUtils();
464 464 try {
465 465 listI.add(resList.iterator());
466   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
467   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\workDaily.xls",
468   - path+"export\\营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
  466 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  467 + ee.excelReplace(listI, new Object[] { m }, path+"mould/workDaily.xls",
  468 + path+"export/营运服务日报表"+ sdfSimple.format(sdfMonth.parse(date))+".xls");
469 469 } catch (Exception e) {
470 470 // TODO: handle exception
471 471 e.printStackTrace();
... ... @@ -735,9 +735,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
735 735 ReportUtils ee = new ReportUtils();
736 736 try {
737 737 listI.add(resList.iterator());
738   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
739   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\scheduleAnaly.xls",
740   - path+"export\\时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
  738 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  739 + ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly.xls",
  740 + path+"export/时刻表分析" + sdfSimple.format(sdfMonth.parse(startDate)) + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls");
741 741 } catch (Exception e) {
742 742 // TODO: handle exception
743 743 e.printStackTrace();
... ... @@ -989,9 +989,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
989 989 ReportUtils ee = new ReportUtils();
990 990 try {
991 991 listI.add(resList.iterator());
992   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
993   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\firstAndLastBus.xls",
994   - path+"export\\线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  992 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  993 + ee.excelReplace(listI, new Object[] { m }, path+"mould/firstAndLastBus.xls",
  994 + path+"export/线路首末班" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
995 995 } catch (Exception e) {
996 996 // TODO: handle exception
997 997 e.printStackTrace();
... ... @@ -1146,9 +1146,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1146 1146 ReportUtils ee = new ReportUtils();
1147 1147 try {
1148 1148 listI.add(resList.iterator());
1149   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
1150   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState.xls",
1151   - path+"export\\指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  1149 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1150 + ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls",
  1151 + path+"export/指令状态分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1152 1152 } catch (Exception e) {
1153 1153 // TODO: handle exception
1154 1154 e.printStackTrace();
... ... @@ -1172,9 +1172,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1172 1172 + " 车辆：" + map1.get("clZbh") + " 人员：" + map1.get("jsy"));
1173 1173 }
1174 1174 }
1175   - String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\";
1176   - ee.excelReplace(listI, new Object[] { m }, path+"mould\\commandState1.xls",
1177   - path+"export\\指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
  1175 + String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
  1176 + ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls",
  1177 + path+"export/指令状态明细" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1178 1178 } catch (Exception e) {
1179 1179 // TODO: handle exception
1180 1180 e.printStackTrace();
... ...
src/main/java/com/bsth/util/ReportUtils.java
  View file @9759d0e
... ... @@ -342,8 +342,8 @@ public class ReportUtils {
342 342 dataList.add(sr);
343 343 list.add(dataList.iterator());
344 344  
345   - ee.excelReplace(list, new Object[] { srr }, "D:\\waybill.xls",
346   - "D:\\22.xls");
  345 + ee.excelReplace(list, new Object[] { srr }, "D:/waybill.xls",
  346 + "D:/22.xls");
347 347 System.out.println("ok");
348 348 } catch (Exception e) {
349 349 e.printStackTrace();
... ...
src/main/resources/static/pages/forms/mould/operationservice.xls
View file @9759d0e
No preview for this file type
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @9759d0e
... ... @@ -281,12 +281,12 @@
281 281 var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
282 282 $('#forms .scheduleDaily_1').html(scheduleDaily_1);
283 283 });
284   - $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2},function(result){
  284 + $.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
285 285 console.log(result);
286 286 var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
287 287 $('#forms .scheduleDaily_2').html(scheduleDaily_2);
288 288 });
289   - $.get('/realSchedule/realScheduleList',{line:line,date:date},function(result){
  289 + $.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
290 290 var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
291 291 $('#forms .scheduleDaily_3').html(scheduleDaily_3);
292 292 });
... ...