Commit 21fda9e1d3373ced1736ecf32bbfeea067c4cfaf
1 parent
618f1827
'1.'
Showing
100 changed files
with
377 additions
and
377 deletions
Too many changes to show.
To preserve performance only 100 of 863 files are displayed.
README.md
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | --dom标签为span div p h1 h2 h3 h4 h5 h6 等等文本元素时,如下写法,text为要转换的代码 | 32 | --dom标签为span div p h1 h2 h3 h4 h5 h6 等等文本元素时,如下写法,text为要转换的代码 |
| 33 | <span class="nt-dictionary" data-group="ScheduleType">out</span> | 33 | <span class="nt-dictionary" data-group="ScheduleType">out</span> |
| 34 | --to | 34 | --to |
| 35 | -<span>出场</span> | 35 | +<span>Out</span> |
| 36 | 36 | ||
| 37 | <!- dom标签为input时,如下 data-code为要转换的代码 --> | 37 | <!- dom标签为input时,如下 data-code为要转换的代码 --> |
| 38 | <input class="nt-dictionary" data-group="ScheduleType" data-code="out"> | 38 | <input class="nt-dictionary" data-group="ScheduleType" data-code="out"> |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | | ---- | ---- | ---- | ---- | | 60 | | ---- | ---- | ---- | ---- | |
| 61 | | groups (获取所有字典组) | 无| | {LineTrend: 线路走向, ScheduleType: 班次类型} | | 61 | | groups (获取所有字典组) | 无| | {LineTrend: 线路走向, ScheduleType: 班次类型} | |
| 62 | | getByGroup (获取字典组下的字典)| (group) |{0: 上行, 1: 下行}| | 62 | | getByGroup (获取字典组下的字典)| (group) |{0: 上行, 1: 下行}| |
| 63 | -| transformCode (转换字典代码)| (group, code) | 上行 | | 63 | +| transformCode (转换字典代码)| (group, code) | Up | |
| 64 | 64 | ||
| 65 | ## 动态jpa查询实现 | 65 | ## 动态jpa查询实现 |
| 66 | ---------- | 66 | ---------- |
| @@ -108,7 +108,7 @@ | @@ -108,7 +108,7 @@ | ||
| 108 | | speed | float | 速度| | 108 | | speed | float | 速度| |
| 109 | | direction | float | 方向(角度) | | 109 | | direction | float | 方向(角度) | |
| 110 | | state | int | 营运状态( 0 营运 ,1 非营运, -1 无效) | | 110 | | state | int | 营运状态( 0 营运 ,1 非营运, -1 无效) | |
| 111 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效)| | 111 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效)| |
| 112 | 112 | ||
| 113 | 113 | ||
| 114 | ### 进站数据 | 114 | ### 进站数据 |
| @@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
| 122 | | lineId | int | 线路编码 | | 122 | | lineId | int | 线路编码 | |
| 123 | | stopNo | long | 站点编码 | | 123 | | stopNo | long | 站点编码 | |
| 124 | | timestamp | long | 时间戳 | | 124 | | timestamp | long | 时间戳 | |
| 125 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 125 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 126 | | createDate | Date | 创建时间 | | 126 | | createDate | Date | 创建时间 | |
| 127 | 127 | ||
| 128 | 128 | ||
| @@ -153,7 +153,7 @@ | @@ -153,7 +153,7 @@ | ||
| 153 | | id | int | 主键 | | 153 | | id | int | 主键 | |
| 154 | | vehicle | String | 车辆编码 | | 154 | | vehicle | String | 车辆编码 | |
| 155 | | line | int | 线路编码 | | 155 | | line | int | 线路编码 | |
| 156 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 156 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 157 | | lon | float | 经度 | | 157 | | lon | float | 经度 | |
| 158 | | lat | float | 纬度| | 158 | | lat | float | 纬度| |
| 159 | | speed | float | 速度 | | 159 | | speed | float | 速度 | |
| @@ -169,7 +169,7 @@ | @@ -169,7 +169,7 @@ | ||
| 169 | | id | int | 主键 | | 169 | | id | int | 主键 | |
| 170 | | vehicle | String | 车辆编码 | | 170 | | vehicle | String | 车辆编码 | |
| 171 | | line | int | 线路编码 | | 171 | | line | int | 线路编码 | |
| 172 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 172 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 173 | | lon | float | 经度 | | 173 | | lon | float | 经度 | |
| 174 | | lat | float | 纬度| | 174 | | lat | float | 纬度| |
| 175 | | location | String | 越界位置(由线调页面进行初始转换)意思是该字段默认为空,页面第一次查看时会写入值| | 175 | | location | String | 越界位置(由线调页面进行初始转换)意思是该字段默认为空,页面第一次查看时会写入值| |
| @@ -185,7 +185,7 @@ | @@ -185,7 +185,7 @@ | ||
| 185 | | ---- | ---- | ---- | | 185 | | ---- | ---- | ---- | |
| 186 | | id | int | 主键 | | 186 | | id | int | 主键 | |
| 187 | | line | int | 线路编码 | | 187 | | line | int | 线路编码 | |
| 188 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 188 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 189 | | station | String | 站点编码 | | 189 | | station | String | 站点编码 | |
| 190 | | vehicle | String | 车辆编码 | | 190 | | vehicle | String | 车辆编码 | |
| 191 | | inData | Date | 进站时间 | | 191 | | inData | Date | 进站时间 | |
| @@ -200,7 +200,7 @@ | @@ -200,7 +200,7 @@ | ||
| 200 | | ---- | ---- | ---- | | 200 | | ---- | ---- | ---- | |
| 201 | | id | int | 主键 | | 201 | | id | int | 主键 | |
| 202 | | line | int | 线路编码 | | 202 | | line | int | 线路编码 | |
| 203 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 203 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 204 | | stations | String | 站点(多个用 , 号分隔。应该是连续站点) | | 204 | | stations | String | 站点(多个用 , 号分隔。应该是连续站点) | |
| 205 | | vehicles | String | 车辆编码(多个用 , 号分隔) | | 205 | | vehicles | String | 车辆编码(多个用 , 号分隔) | |
| 206 | | timestamp | long | 时间戳 | | 206 | | timestamp | long | 时间戳 | |
| @@ -215,7 +215,7 @@ | @@ -215,7 +215,7 @@ | ||
| 215 | | ---- | ---- | ---- | | 215 | | ---- | ---- | ---- | |
| 216 | | id | int | 主键 | | 216 | | id | int | 主键 | |
| 217 | | line | int | 线路编码 | | 217 | | line | int | 线路编码 | |
| 218 | -| upDown | int | 上下行(0 上行 , 1 下行 , -1 无效) | | 218 | +| upDown | int | 上下行(0 Up , 1 Down , -1 无效) | |
| 219 | | vehicle | String | 车辆编码 | | 219 | | vehicle | String | 车辆编码 | |
| 220 | | lon | float | 经度 | | 220 | | lon | float | 经度 | |
| 221 | | lat | float | 纬度| | 221 | | lat | float | 纬度| |
| @@ -415,7 +415,7 @@ | @@ -415,7 +415,7 @@ | ||
| 415 | | status | int | 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读 | | 415 | | status | int | 0x80时无数据 0表示失败 1表示成功或设备确认 2表示驾驶员阅读 | |
| 416 | | operCode | short | 一级协议 消息确认将无数据 | | 416 | | operCode | short | 一级协议 消息确认将无数据 | |
| 417 | | data.operCode | short | 二级协议 | | 417 | | data.operCode | short | 二级协议 | |
| 418 | -| data.requestCode | short | 请求代码0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 | | 418 | +| data.requestCode | short | Request code0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 | |
| 419 | <span style="color: red">Response</span>: | 419 | <span style="color: red">Response</span>: |
| 420 | ```json | 420 | ```json |
| 421 | { | 421 | { |
pom.xml
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <groupId>com.bsth</groupId> | 5 | <groupId>com.bsth</groupId> |
| 6 | <artifactId>bsth_control</artifactId> | 6 | <artifactId>bsth_control</artifactId> |
| 7 | <version>0.0.1-SNAPSHOT</version> | 7 | <version>0.0.1-SNAPSHOT</version> |
| 8 | - <packaging>jar</packaging> | 8 | + <packaging>war</packaging> |
| 9 | 9 | ||
| 10 | <parent> | 10 | <parent> |
| 11 | <groupId>org.springframework.boot</groupId> | 11 | <groupId>org.springframework.boot</groupId> |
| @@ -473,7 +473,7 @@ | @@ -473,7 +473,7 @@ | ||
| 473 | <groupId>org.springframework.boot</groupId> | 473 | <groupId>org.springframework.boot</groupId> |
| 474 | <artifactId>spring-boot-maven-plugin</artifactId> | 474 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 475 | </plugin> | 475 | </plugin> |
| 476 | - <plugin> | 476 | + <!--<plugin> |
| 477 | <groupId>net.roseboy</groupId> | 477 | <groupId>net.roseboy</groupId> |
| 478 | <artifactId>classfinal-maven-plugin</artifactId> | 478 | <artifactId>classfinal-maven-plugin</artifactId> |
| 479 | <version>1.2.1</version> | 479 | <version>1.2.1</version> |
| @@ -492,7 +492,7 @@ | @@ -492,7 +492,7 @@ | ||
| 492 | </goals> | 492 | </goals> |
| 493 | </execution> | 493 | </execution> |
| 494 | </executions> | 494 | </executions> |
| 495 | - </plugin> | 495 | + </plugin>--> |
| 496 | </plugins> | 496 | </plugins> |
| 497 | <resources> | 497 | <resources> |
| 498 | <resource> | 498 | <resource> |
src/main/java/com/bsth/XDApplication.java
| @@ -161,7 +161,7 @@ public class XDApplication implements CommandLineRunner { | @@ -161,7 +161,7 @@ public class XDApplication implements CommandLineRunner { | ||
| 161 | 161 | ||
| 162 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | 162 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 |
| 163 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 | 163 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 |
| 164 | - sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库 | 164 | + sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//Shift correction report入库 |
| 165 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 | 165 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 |
| 166 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) | 166 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) |
| 167 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | 167 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 |
| @@ -206,7 +206,7 @@ public class XDApplication implements CommandLineRunner { | @@ -206,7 +206,7 @@ public class XDApplication implements CommandLineRunner { | ||
| 206 | 206 | ||
| 207 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | 207 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 |
| 208 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 | 208 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 |
| 209 | - sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库 | 209 | + sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//Shift correction report入库 |
| 210 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 | 210 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 |
| 211 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) | 211 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) |
| 212 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | 212 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 |
| @@ -252,7 +252,7 @@ public class XDApplication implements CommandLineRunner { | @@ -252,7 +252,7 @@ public class XDApplication implements CommandLineRunner { | ||
| 252 | 252 | ||
| 253 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 | 253 | sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线 |
| 254 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 | 254 | sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程 |
| 255 | - sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库 | 255 | + sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//Shift correction report入库 |
| 256 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 | 256 | sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库 |
| 257 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) | 257 | sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听(防止重要的线程阻塞、异常结束。以及部分主备切换工作) |
| 258 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 | 258 | sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据 |
src/main/java/com/bsth/controller/SectionSpeedController.java
| @@ -29,7 +29,7 @@ public class SectionSpeedController extends BaseController<SectionSpeed, Integer | @@ -29,7 +29,7 @@ public class SectionSpeedController extends BaseController<SectionSpeed, Integer | ||
| 29 | return sectionSpeedService.roadUpd(map); | 29 | return sectionSpeedService.roadUpd(map); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | - /** @description TODO(根据线路ID与编码及方向查询路段限速信息) */ | 32 | + /** @description TODO(根据线路ID与编码及方向查询Road speed limit info) */ |
| 33 | @RequestMapping(value="getSectionSpeedInfoList",method=RequestMethod.GET) | 33 | @RequestMapping(value="getSectionSpeedInfoList",method=RequestMethod.GET) |
| 34 | public List<Map<String, Object>> getSectionSpeedInfoList(@RequestParam Map<String, Object> map){ | 34 | public List<Map<String, Object>> getSectionSpeedInfoList(@RequestParam Map<String, Object> map){ |
| 35 | return sectionSpeedService.getSectionSpeedInfo(map); | 35 | return sectionSpeedService.getSectionSpeedInfo(map); |
src/main/java/com/bsth/controller/calc/CalcExportController.java
| @@ -170,7 +170,7 @@ public class CalcExportController { | @@ -170,7 +170,7 @@ public class CalcExportController { | ||
| 170 | Map<String, Object> temp = new HashMap<String, Object>(); | 170 | Map<String, Object> temp = new HashMap<String, Object>(); |
| 171 | temp.put("i", "序号"); | 171 | temp.put("i", "序号"); |
| 172 | temp.put("gS", "所属公司"); | 172 | temp.put("gS", "所属公司"); |
| 173 | - temp.put("xlName", "线路"); | 173 | + temp.put("xlName", "Line"); |
| 174 | temp.put("jName", tjtype); | 174 | temp.put("jName", tjtype); |
| 175 | temp.put("jhzlc", "计划公里"); | 175 | temp.put("jhzlc", "计划公里"); |
| 176 | temp.put("sjzlc", "行驶里程(包括空放)"); | 176 | temp.put("sjzlc", "行驶里程(包括空放)"); |
| @@ -204,7 +204,7 @@ public class CalcExportController { | @@ -204,7 +204,7 @@ public class CalcExportController { | ||
| 204 | listI.add(resList.iterator()); | 204 | listI.add(resList.iterator()); |
| 205 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 205 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 206 | ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcsingledata.xls", | 206 | ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcsingledata.xls", |
| 207 | - path+"export/"+date+"-"+lineName+"-路单数据(统计).xls"); | 207 | + path+"export/"+date+"-"+lineName+"-Waybill data(statistics).xls"); |
| 208 | resMap.put("status", ResponseCode.SUCCESS); | 208 | resMap.put("status", ResponseCode.SUCCESS); |
| 209 | } catch (Exception e) { | 209 | } catch (Exception e) { |
| 210 | e.printStackTrace(); | 210 | e.printStackTrace(); |
| @@ -283,7 +283,7 @@ public class CalcExportController { | @@ -283,7 +283,7 @@ public class CalcExportController { | ||
| 283 | listI.add(resList.iterator()); | 283 | listI.add(resList.iterator()); |
| 284 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 284 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 285 | ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcLbStatuAnaly.xls", | 285 | ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcLbStatuAnaly.xls", |
| 286 | - path+"export/"+Data+"-"+lineName+"-烂班情况分析表(统计).xls"); | 286 | + path+"export/"+Data+"-"+lineName+"-Bad shift situation analysis table(summary).xls"); |
| 287 | resMap.put("status", ResponseCode.SUCCESS); | 287 | resMap.put("status", ResponseCode.SUCCESS); |
| 288 | } catch (Exception e) { | 288 | } catch (Exception e) { |
| 289 | e.printStackTrace(); | 289 | e.printStackTrace(); |
src/main/java/com/bsth/controller/forms/ExportController.java
| @@ -42,7 +42,7 @@ public class ExportController { | @@ -42,7 +42,7 @@ public class ExportController { | ||
| 42 | @Autowired | 42 | @Autowired |
| 43 | ExportService exportService; | 43 | ExportService exportService; |
| 44 | 44 | ||
| 45 | - // 行车路单日报表 | 45 | + // Waybill daily report |
| 46 | @RequestMapping(value = "/waybilldayExport", method = RequestMethod.POST) | 46 | @RequestMapping(value = "/waybilldayExport", method = RequestMethod.POST) |
| 47 | public List<Waybillday> waybilldayExport(@RequestParam Map<String, Object> map) { | 47 | public List<Waybillday> waybilldayExport(@RequestParam Map<String, Object> map) { |
| 48 | List<Waybillday> waybillday = formsService.waybillday(map); | 48 | List<Waybillday> waybillday = formsService.waybillday(map); |
| @@ -51,7 +51,7 @@ public class ExportController { | @@ -51,7 +51,7 @@ public class ExportController { | ||
| 51 | return waybillday; | 51 | return waybillday; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | - // 线路客流量报表 | 54 | + // Line passenger flow report |
| 55 | @RequestMapping(value = "/linepasswengerflowExport", method = RequestMethod.POST) | 55 | @RequestMapping(value = "/linepasswengerflowExport", method = RequestMethod.POST) |
| 56 | public List<Map<String, Object>> linepasswengerflowExport(@RequestParam Map<String, Object> map) { | 56 | public List<Map<String, Object>> linepasswengerflowExport(@RequestParam Map<String, Object> map) { |
| 57 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); | 57 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); |
| @@ -76,14 +76,14 @@ public class ExportController { | @@ -76,14 +76,14 @@ public class ExportController { | ||
| 76 | listI.add(resList.iterator()); | 76 | listI.add(resList.iterator()); |
| 77 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 77 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 78 | ee.excelReplace(listI, new Object[] { map }, path + "mould/linepasswengerflow.xls", | 78 | ee.excelReplace(listI, new Object[] { map }, path + "mould/linepasswengerflow.xls", |
| 79 | - path + "export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls"); | 79 | + path + "export/Line passenger flow report" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) + ".xls"); |
| 80 | } catch (Exception e) { | 80 | } catch (Exception e) { |
| 81 | e.printStackTrace(); | 81 | e.printStackTrace(); |
| 82 | } | 82 | } |
| 83 | return resList; | 83 | return resList; |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | - // 班次车辆人员日统计 | 86 | + // Shift vehicle personnel daily statistics |
| 87 | @RequestMapping(value = "/shifdayExport", method = RequestMethod.GET) | 87 | @RequestMapping(value = "/shifdayExport", method = RequestMethod.GET) |
| 88 | public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) { | 88 | public List<Map<String, Object>> shifdayExport(@RequestParam Map<String, Object> map) { |
| 89 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 89 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -126,7 +126,7 @@ public class ExportController { | @@ -126,7 +126,7 @@ public class ExportController { | ||
| 126 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 126 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 127 | ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls", | 127 | ee.excelReplace(listI, new Object[] { map2 }, path + "mould/shifday.xls", |
| 128 | path + "export/" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) | 128 | path + "export/" + sdfSimple.format(sdfMonth.parse(map.get("date").toString())) |
| 129 | - + "-" + lineName + "-班次车辆人员日报表.xls"); | 129 | + + "-" + lineName + "-Shift vehicle personnel daily statistics.xls"); |
| 130 | } catch (Exception e) { | 130 | } catch (Exception e) { |
| 131 | e.printStackTrace(); | 131 | e.printStackTrace(); |
| 132 | } | 132 | } |
| @@ -184,7 +184,7 @@ public class ExportController { | @@ -184,7 +184,7 @@ public class ExportController { | ||
| 184 | listI.add(resList.iterator()); | 184 | listI.add(resList.iterator()); |
| 185 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 185 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 186 | ee.excelReplace(listI, new Object[] { map }, path +mouldurl, | 186 | ee.excelReplace(listI, new Object[] { map }, path +mouldurl, |
| 187 | - path + "export/" + dateTime + "-" + lineName + "-班次车辆人员月报表.xls"); | 187 | + path + "export/" + dateTime + "-" + lineName + "-Shift vehicle personnel monthly statistics.xls"); |
| 188 | } catch (Exception e) { | 188 | } catch (Exception e) { |
| 189 | e.printStackTrace(); | 189 | e.printStackTrace(); |
| 190 | } | 190 | } |
| @@ -229,7 +229,7 @@ public class ExportController { | @@ -229,7 +229,7 @@ public class ExportController { | ||
| 229 | listI.add(resList.iterator()); | 229 | listI.add(resList.iterator()); |
| 230 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 230 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 231 | ee.excelReplace(listI, new Object[] { map }, path +mouldurl, | 231 | ee.excelReplace(listI, new Object[] { map }, path +mouldurl, |
| 232 | - path + "export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); | 232 | + path + "export/Shift vehicle personnel monthly statistics" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); |
| 233 | } catch (Exception e) { | 233 | } catch (Exception e) { |
| 234 | e.printStackTrace(); | 234 | e.printStackTrace(); |
| 235 | } | 235 | } |
| @@ -237,7 +237,7 @@ public class ExportController { | @@ -237,7 +237,7 @@ public class ExportController { | ||
| 237 | return resList; | 237 | return resList; |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | - // 路单数据报表 | 240 | + // Waybill报表 |
| 241 | @RequestMapping(value = "/singledataExport", method = RequestMethod.GET) | 241 | @RequestMapping(value = "/singledataExport", method = RequestMethod.GET) |
| 242 | public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map) { | 242 | public List<Map<String, Object>> singledataExport(@RequestParam Map<String, Object> map) { |
| 243 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); | 243 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); |
| @@ -272,7 +272,7 @@ public class ExportController { | @@ -272,7 +272,7 @@ public class ExportController { | ||
| 272 | listI.add(resList.iterator()); | 272 | listI.add(resList.iterator()); |
| 273 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 273 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 274 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", | 274 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", |
| 275 | - path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); | 275 | + path + "export/Waybill data" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); |
| 276 | } catch (Exception e) { | 276 | } catch (Exception e) { |
| 277 | e.printStackTrace(); | 277 | e.printStackTrace(); |
| 278 | } | 278 | } |
| @@ -280,7 +280,7 @@ public class ExportController { | @@ -280,7 +280,7 @@ public class ExportController { | ||
| 280 | return resList; | 280 | return resList; |
| 281 | } | 281 | } |
| 282 | 282 | ||
| 283 | - // 路单数据报表 | 283 | + // Waybill报表 |
| 284 | @RequestMapping(value = "/singledataExport2", method = RequestMethod.GET) | 284 | @RequestMapping(value = "/singledataExport2", method = RequestMethod.GET) |
| 285 | public List<Map<String, Object>> singledataExport2(@RequestParam Map<String, Object> map) { | 285 | public List<Map<String, Object>> singledataExport2(@RequestParam Map<String, Object> map) { |
| 286 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); | 286 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); |
| @@ -315,7 +315,7 @@ public class ExportController { | @@ -315,7 +315,7 @@ public class ExportController { | ||
| 315 | listI.add(resList.iterator()); | 315 | listI.add(resList.iterator()); |
| 316 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 316 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 317 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", | 317 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", |
| 318 | - path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); | 318 | + path + "export/Waybill data" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); |
| 319 | } catch (Exception e) { | 319 | } catch (Exception e) { |
| 320 | e.printStackTrace(); | 320 | e.printStackTrace(); |
| 321 | } | 321 | } |
| @@ -363,7 +363,7 @@ public class ExportController { | @@ -363,7 +363,7 @@ public class ExportController { | ||
| 363 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 363 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 364 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", | 364 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", |
| 365 | path + "export/" + sdfSimple.format(sdfMonth.parse(startDate)) | 365 | path + "export/" + sdfSimple.format(sdfMonth.parse(startDate)) |
| 366 | - + "-" + lineName + "-路单数据.xls"); | 366 | + + "-" + lineName + "-Waybill data.xls"); |
| 367 | } catch (Exception e) { | 367 | } catch (Exception e) { |
| 368 | e.printStackTrace(); | 368 | e.printStackTrace(); |
| 369 | } | 369 | } |
| @@ -405,14 +405,14 @@ public class ExportController { | @@ -405,14 +405,14 @@ public class ExportController { | ||
| 405 | listI.add(resList.iterator()); | 405 | listI.add(resList.iterator()); |
| 406 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 406 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 407 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", | 407 | ee.excelReplace(listI, new Object[] { map }, path + "mould/singledata.xls", |
| 408 | - path + "export/路单数据" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); | 408 | + path + "export/Waybill" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); |
| 409 | } catch (Exception e) { | 409 | } catch (Exception e) { |
| 410 | e.printStackTrace(); | 410 | e.printStackTrace(); |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | return resList; | 413 | return resList; |
| 414 | } | 414 | } |
| 415 | - // 车辆加注 | 415 | + // Vehicle refueling |
| 416 | @RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.GET) | 416 | @RequestMapping(value = "/vehicleloadingExport", method = RequestMethod.GET) |
| 417 | public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map) { | 417 | public List<Map<String, Object>> vehicleloadingExport(@RequestParam Map<String, Object> map) { |
| 418 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 418 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -450,14 +450,14 @@ public class ExportController { | @@ -450,14 +450,14 @@ public class ExportController { | ||
| 450 | listI.add(resList.iterator()); | 450 | listI.add(resList.iterator()); |
| 451 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 451 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 452 | ee.excelReplace(listI, new Object[] { map }, path + "mould/vehicleloading.xls", | 452 | ee.excelReplace(listI, new Object[] { map }, path + "mould/vehicleloading.xls", |
| 453 | - path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + "-" + lineName + "-车辆加注.xls"); | 453 | + path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + "-" + lineName + "-Vehicle refueling.xls"); |
| 454 | } catch (Exception e) { | 454 | } catch (Exception e) { |
| 455 | e.printStackTrace(); | 455 | e.printStackTrace(); |
| 456 | } | 456 | } |
| 457 | return resList; | 457 | return resList; |
| 458 | } | 458 | } |
| 459 | 459 | ||
| 460 | - // 运营服务阶段报表 | 460 | + // Operation service stage report |
| 461 | @RequestMapping(value = "/operationserviceExport", method = RequestMethod.GET) | 461 | @RequestMapping(value = "/operationserviceExport", method = RequestMethod.GET) |
| 462 | public List<Map<String, Object>> operationserviceExport(@RequestParam Map<String, Object> map) { | 462 | public List<Map<String, Object>> operationserviceExport(@RequestParam Map<String, Object> map) { |
| 463 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); | 463 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); |
| @@ -497,14 +497,14 @@ public class ExportController { | @@ -497,14 +497,14 @@ public class ExportController { | ||
| 497 | listI.add(resList.iterator()); | 497 | listI.add(resList.iterator()); |
| 498 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 498 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 499 | ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/" | 499 | ee.excelReplace(listI, new Object[] { map }, path + "mould/operationservice.xls", path + "export/" |
| 500 | - + dateTime + "-" + lineName + "-运营服务阶段报表.xls"); | 500 | + + dateTime + "-" + lineName + "-Operation service stage report.xls"); |
| 501 | } catch (Exception e) { | 501 | } catch (Exception e) { |
| 502 | e.printStackTrace(); | 502 | e.printStackTrace(); |
| 503 | } | 503 | } |
| 504 | return resList; | 504 | return resList; |
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | - // 换人换车情况日统计 | 507 | + // Daily report on personnel and vehicle replacement |
| 508 | @RequestMapping(value = "/changetochangeExport", method = RequestMethod.POST) | 508 | @RequestMapping(value = "/changetochangeExport", method = RequestMethod.POST) |
| 509 | public List<Map<String, Object>> changetochangeExport(@RequestParam Map<String, Object> map) { | 509 | public List<Map<String, Object>> changetochangeExport(@RequestParam Map<String, Object> map) { |
| 510 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 510 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -548,14 +548,14 @@ public class ExportController { | @@ -548,14 +548,14 @@ public class ExportController { | ||
| 548 | listI.add(resList.iterator()); | 548 | listI.add(resList.iterator()); |
| 549 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 549 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 550 | ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/" | 550 | ee.excelReplace(listI, new Object[] { map }, path + "mould/changetochange.xls", path + "export/" |
| 551 | - + dateTime + "-" + lineName + "-换人换车情况日统计.xls"); | 551 | + + dateTime + "-" + lineName + "-Daily report on personnel and vehicle replacement.xls"); |
| 552 | } catch (Exception e) { | 552 | } catch (Exception e) { |
| 553 | e.printStackTrace(); | 553 | e.printStackTrace(); |
| 554 | } | 554 | } |
| 555 | return resList; | 555 | return resList; |
| 556 | } | 556 | } |
| 557 | 557 | ||
| 558 | - // 营运线路出车率统计表 | 558 | + // Operating line vehicle rate statistics table |
| 559 | @RequestMapping(value = "/turnoutrateExport", method = RequestMethod.POST) | 559 | @RequestMapping(value = "/turnoutrateExport", method = RequestMethod.POST) |
| 560 | public List<Map<String, Object>> turnoutrateExport(@RequestParam Map<String, Object> map) { | 560 | public List<Map<String, Object>> turnoutrateExport(@RequestParam Map<String, Object> map) { |
| 561 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 561 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -595,7 +595,7 @@ public class ExportController { | @@ -595,7 +595,7 @@ public class ExportController { | ||
| 595 | listI.add(resList.iterator()); | 595 | listI.add(resList.iterator()); |
| 596 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 596 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 597 | ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/" | 597 | ee.excelReplace(listI, new Object[] { map1 }, path + "mould/turnoutrate.xls", path + "export/" |
| 598 | - + dateTime + "-" + lineName + "-营运线路出车率统计表.xls"); | 598 | + + dateTime + "-" + lineName + "-Operating line vehicle rate statistics table.xls"); |
| 599 | } catch (Exception e) { | 599 | } catch (Exception e) { |
| 600 | e.printStackTrace(); | 600 | e.printStackTrace(); |
| 601 | } | 601 | } |
| @@ -748,7 +748,7 @@ public class ExportController { | @@ -748,7 +748,7 @@ public class ExportController { | ||
| 748 | 748 | ||
| 749 | 749 | ||
| 750 | 750 | ||
| 751 | - //班次日报表 | 751 | + //Daily report of shift |
| 752 | @RequestMapping(value = "/dailyExport", method = RequestMethod.POST) | 752 | @RequestMapping(value = "/dailyExport", method = RequestMethod.POST) |
| 753 | public List<Map<String, Object>> dailyExport(@RequestParam Map<String, Object> map) { | 753 | public List<Map<String, Object>> dailyExport(@RequestParam Map<String, Object> map) { |
| 754 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); | 754 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); |
| @@ -794,7 +794,7 @@ public class ExportController { | @@ -794,7 +794,7 @@ public class ExportController { | ||
| 794 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 794 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 795 | ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls", | 795 | ee.excelReplace(listI, new Object[] { m }, path + "mould/daily.xls", |
| 796 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) | 796 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 797 | - + "-" + lineName + "-班次日报表.xls"); | 797 | + + "-" + lineName + "-Daily report of shift.xls"); |
| 798 | } catch (Exception e) { | 798 | } catch (Exception e) { |
| 799 | e.printStackTrace(); | 799 | e.printStackTrace(); |
| 800 | } | 800 | } |
src/main/java/com/bsth/controller/forms/MCY_FormsController.java
| @@ -34,7 +34,7 @@ public class MCY_FormsController { | @@ -34,7 +34,7 @@ public class MCY_FormsController { | ||
| 34 | @Autowired | 34 | @Autowired |
| 35 | ScheduleRealInfoService scheduleRealInfoService; | 35 | ScheduleRealInfoService scheduleRealInfoService; |
| 36 | 36 | ||
| 37 | - // 行车路单日报表 | 37 | + // Waybill daily report |
| 38 | 38 | ||
| 39 | @RequestMapping(value = "/waybillday", method = RequestMethod.POST) | 39 | @RequestMapping(value = "/waybillday", method = RequestMethod.POST) |
| 40 | public List<Waybillday> waybillday(@RequestParam Map<String, Object> map) { | 40 | public List<Waybillday> waybillday(@RequestParam Map<String, Object> map) { |
| @@ -43,7 +43,7 @@ public class MCY_FormsController { | @@ -43,7 +43,7 @@ public class MCY_FormsController { | ||
| 43 | return formsService.waybillday(map); | 43 | return formsService.waybillday(map); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | - // 线路客流量报表 | 46 | + // Line passenger flow report |
| 47 | 47 | ||
| 48 | @RequestMapping(value = "/linepasswengerflow", method = RequestMethod.POST) | 48 | @RequestMapping(value = "/linepasswengerflow", method = RequestMethod.POST) |
| 49 | public List<Linepasswengerflow> linepasswengerflow(@RequestParam Map<String, Object> map) { | 49 | public List<Linepasswengerflow> linepasswengerflow(@RequestParam Map<String, Object> map) { |
| @@ -51,49 +51,49 @@ public class MCY_FormsController { | @@ -51,49 +51,49 @@ public class MCY_FormsController { | ||
| 51 | return formsService.linepasswengerflow(map); | 51 | return formsService.linepasswengerflow(map); |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | - // 班次车辆人员月报表 | 54 | + // Shift vehicle personnel monthly statistics |
| 55 | @RequestMapping(value = "/shiftuehiclemanth", method = RequestMethod.GET) | 55 | @RequestMapping(value = "/shiftuehiclemanth", method = RequestMethod.GET) |
| 56 | public List<Shiftuehiclemanth> shiftuehiclemanth(@RequestParam Map<String, Object> map) { | 56 | public List<Shiftuehiclemanth> shiftuehiclemanth(@RequestParam Map<String, Object> map) { |
| 57 | 57 | ||
| 58 | return formsService.shiftuehiclemanth(map); | 58 | return formsService.shiftuehiclemanth(map); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | - // 班次车辆人员月报表 | 61 | + // Shift vehicle personnel monthly statistics |
| 62 | @RequestMapping(value = "/shiftuehiclemanth2", method = RequestMethod.GET) | 62 | @RequestMapping(value = "/shiftuehiclemanth2", method = RequestMethod.GET) |
| 63 | public List<Shiftuehiclemanth> shiftuehiclemanth2(@RequestParam Map<String, Object> map) { | 63 | public List<Shiftuehiclemanth> shiftuehiclemanth2(@RequestParam Map<String, Object> map) { |
| 64 | 64 | ||
| 65 | return formsService.shiftuehiclemanth2(map); | 65 | return formsService.shiftuehiclemanth2(map); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | - // 班次车辆人员日统计 | 68 | + // Shift vehicle personnel daily statistics |
| 69 | @RequestMapping(value = "/shifday", method = RequestMethod.GET) | 69 | @RequestMapping(value = "/shifday", method = RequestMethod.GET) |
| 70 | public List<Shifday> shifday(@RequestParam Map<String, Object> map) { | 70 | public List<Shifday> shifday(@RequestParam Map<String, Object> map) { |
| 71 | 71 | ||
| 72 | return formsService.shifday(map); | 72 | return formsService.shifday(map); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | - // 换人换车情况统计表 | 75 | + // Daily report on personnel and vehicle replacement |
| 76 | @RequestMapping(value = "/changetochange", method = RequestMethod.GET) | 76 | @RequestMapping(value = "/changetochange", method = RequestMethod.GET) |
| 77 | public List<Changetochange> changetochange(@RequestParam Map<String, Object> map) { | 77 | public List<Changetochange> changetochange(@RequestParam Map<String, Object> map) { |
| 78 | 78 | ||
| 79 | return formsService.changetochange(map); | 79 | return formsService.changetochange(map); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | - // 路单数据 | 82 | + // Waybill |
| 83 | @RequestMapping(value = "/singledata", method = RequestMethod.GET) | 83 | @RequestMapping(value = "/singledata", method = RequestMethod.GET) |
| 84 | public List<Singledata> singledata(@RequestParam Map<String, Object> map) { | 84 | public List<Singledata> singledata(@RequestParam Map<String, Object> map) { |
| 85 | 85 | ||
| 86 | return formsService.singledata(map); | 86 | return formsService.singledata(map); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | - // 路单数据 | 89 | + // Waybill |
| 90 | @RequestMapping(value = "/singledata2", method = RequestMethod.GET) | 90 | @RequestMapping(value = "/singledata2", method = RequestMethod.GET) |
| 91 | public List<Singledata> singledata2(@RequestParam Map<String, Object> map) { | 91 | public List<Singledata> singledata2(@RequestParam Map<String, Object> map) { |
| 92 | 92 | ||
| 93 | return formsService.singledata2(map); | 93 | return formsService.singledata2(map); |
| 94 | } | 94 | } |
| 95 | 95 | ||
| 96 | - // 路单数据 | 96 | + // Waybill |
| 97 | @RequestMapping(value = "/singledatanew", method = RequestMethod.GET) | 97 | @RequestMapping(value = "/singledatanew", method = RequestMethod.GET) |
| 98 | public List<Singledata> singledatanew(@RequestParam Map<String, Object> map) { | 98 | public List<Singledata> singledatanew(@RequestParam Map<String, Object> map) { |
| 99 | 99 | ||
| @@ -112,20 +112,20 @@ public class MCY_FormsController { | @@ -112,20 +112,20 @@ public class MCY_FormsController { | ||
| 112 | 112 | ||
| 113 | return formsService.singledatatj2(map); | 113 | return formsService.singledatatj2(map); |
| 114 | } | 114 | } |
| 115 | - // 车辆加注 | 115 | + // Vehicle refueling |
| 116 | @RequestMapping(value = "/vehicleloading", method = RequestMethod.GET) | 116 | @RequestMapping(value = "/vehicleloading", method = RequestMethod.GET) |
| 117 | public List<Vehicleloading> vehicleloading(@RequestParam String line, @RequestParam String data) { | 117 | public List<Vehicleloading> vehicleloading(@RequestParam String line, @RequestParam String data) { |
| 118 | return formsService.vehicleloading(line, data); | 118 | return formsService.vehicleloading(line, data); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | - // 运营服务阶段报表 | 121 | + // Operation service stage report |
| 122 | @RequestMapping(value = "/operationservice", method = RequestMethod.GET) | 122 | @RequestMapping(value = "/operationservice", method = RequestMethod.GET) |
| 123 | public List<Operationservice> operationservice(@RequestParam Map<String, Object> map) { | 123 | public List<Operationservice> operationservice(@RequestParam Map<String, Object> map) { |
| 124 | 124 | ||
| 125 | return formsService.operationservice(map); | 125 | return formsService.operationservice(map); |
| 126 | } | 126 | } |
| 127 | 127 | ||
| 128 | - // 营运线路出车率统计表 | 128 | + // Operating line vehicle rate statistics table |
| 129 | @RequestMapping(value = "/turnoutrate", method = RequestMethod.POST) | 129 | @RequestMapping(value = "/turnoutrate", method = RequestMethod.POST) |
| 130 | public List<Map<String, Object>> turnoutrate(@RequestParam Map<String, Object> map) { | 130 | public List<Map<String, Object>> turnoutrate(@RequestParam Map<String, Object> map) { |
| 131 | 131 |
src/main/java/com/bsth/controller/gps/GpsController.java
| @@ -149,7 +149,7 @@ public class GpsController { | @@ -149,7 +149,7 @@ public class GpsController { | ||
| 149 | } | 149 | } |
| 150 | 150 | ||
| 151 | /** | 151 | /** |
| 152 | - * 轨迹导出 | 152 | + * 轨迹export |
| 153 | * @param nbbm | 153 | * @param nbbm |
| 154 | * @param st | 154 | * @param st |
| 155 | * @param et | 155 | * @param et |
| @@ -161,7 +161,7 @@ public class GpsController { | @@ -161,7 +161,7 @@ public class GpsController { | ||
| 161 | } | 161 | } |
| 162 | 162 | ||
| 163 | /** | 163 | /** |
| 164 | - * 轨迹异常数据导出 | 164 | + * 轨迹异常数据export |
| 165 | * @param nbbm | 165 | * @param nbbm |
| 166 | * @param st | 166 | * @param st |
| 167 | * @param et | 167 | * @param et |
| @@ -173,7 +173,7 @@ public class GpsController { | @@ -173,7 +173,7 @@ public class GpsController { | ||
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | /** | 175 | /** |
| 176 | - * 到离站数据导出 | 176 | + * 到离站数据export |
| 177 | * @param nbbm | 177 | * @param nbbm |
| 178 | * @param st | 178 | * @param st |
| 179 | * @param et | 179 | * @param et |
src/main/java/com/bsth/controller/jdtest/JdTestController.java
| @@ -33,7 +33,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | @@ -33,7 +33,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | ||
| 33 | JdtestService jdtestService; | 33 | JdtestService jdtestService; |
| 34 | 34 | ||
| 35 | /* | 35 | /* |
| 36 | - * 油量平衡表导出 | 36 | + * 油量平衡表export |
| 37 | */ | 37 | */ |
| 38 | @RequestMapping(value = "/listExport",method = RequestMethod.POST) | 38 | @RequestMapping(value = "/listExport",method = RequestMethod.POST) |
| 39 | public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){ | 39 | public List<Map<String, Object>> listExport(@RequestParam Map<String, Object> map){ |
| @@ -102,7 +102,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | @@ -102,7 +102,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | ||
| 102 | listI.add(resList.iterator()); | 102 | listI.add(resList.iterator()); |
| 103 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 103 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 104 | ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", | 104 | ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", |
| 105 | - path+"export/"+map.get("rq").toString()+ "进出场存油量.xls"); | 105 | + path+"export/"+map.get("rq").toString()+ "Entry and exit fuel reserve.xls"); |
| 106 | } catch (Exception e) { | 106 | } catch (Exception e) { |
| 107 | e.printStackTrace(); | 107 | e.printStackTrace(); |
| 108 | } | 108 | } |
| @@ -141,7 +141,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | @@ -141,7 +141,7 @@ public class JdTestController extends BaseController<Ylb, Integer>{ | ||
| 141 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 141 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 142 | ee.excelReplace(listI, new Object[] { m }, path + "mould/jd_daily.xls", | 142 | ee.excelReplace(listI, new Object[] { m }, path + "mould/jd_daily.xls", |
| 143 | path + "export/" + date | 143 | path + "export/" + date |
| 144 | - + "-" + lineName + "-班次日报表.xls"); | 144 | + + "-" + lineName + "-Daily report of shift.xls"); |
| 145 | } catch (Exception e) { | 145 | } catch (Exception e) { |
| 146 | e.printStackTrace(); | 146 | e.printStackTrace(); |
| 147 | } | 147 | } |
src/main/java/com/bsth/controller/oil/DlbController.java
| @@ -193,7 +193,7 @@ public class DlbController extends BaseController<Dlb, Integer>{ | @@ -193,7 +193,7 @@ public class DlbController extends BaseController<Dlb, Integer>{ | ||
| 193 | listI.add(resList.iterator()); | 193 | listI.add(resList.iterator()); |
| 194 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 194 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 195 | ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls", | 195 | ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls", |
| 196 | - path+"export/"+map.get("rq").toString()+ "进出场存电量.xls"); | 196 | + path+"export/"+map.get("rq").toString()+ "Entry and exit power.xls"); |
| 197 | } catch (Exception e) { | 197 | } catch (Exception e) { |
| 198 | e.printStackTrace(); | 198 | e.printStackTrace(); |
| 199 | } | 199 | } |
src/main/java/com/bsth/controller/oil/LsylbController.java
| @@ -124,10 +124,10 @@ public class LsylbController extends BaseController<Ylb, Integer>{ | @@ -124,10 +124,10 @@ public class LsylbController extends BaseController<Ylb, Integer>{ | ||
| 124 | 124 | ||
| 125 | if(nylx.equals("0")){ | 125 | if(nylx.equals("0")){ |
| 126 | xls="list.xls"; | 126 | xls="list.xls"; |
| 127 | - name="进出场存油量.xls"; | 127 | + name="Entry and exit fuel reserve.xls"; |
| 128 | }else{ | 128 | }else{ |
| 129 | xls="listDl.xls"; | 129 | xls="listDl.xls"; |
| 130 | - name="进出场存电量.xls"; | 130 | + name="Entry and exit power.xls"; |
| 131 | } | 131 | } |
| 132 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 132 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 133 | ee.excelReplace(listI, new Object[] { map }, path+"mould/"+xls, | 133 | ee.excelReplace(listI, new Object[] { map }, path+"mould/"+xls, |
src/main/java/com/bsth/controller/oil/QlbController.java
| @@ -192,7 +192,7 @@ public class QlbController extends BaseController<Qlb, Integer>{ | @@ -192,7 +192,7 @@ public class QlbController extends BaseController<Qlb, Integer>{ | ||
| 192 | listI.add(resList.iterator()); | 192 | listI.add(resList.iterator()); |
| 193 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 193 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 194 | ee.excelReplace(listI, new Object[] { map }, path+"mould/listQl.xls", | 194 | ee.excelReplace(listI, new Object[] { map }, path+"mould/listQl.xls", |
| 195 | - path+"export/"+map.get("rq").toString()+ "进出场存氢量.xls"); | 195 | + path+"export/"+map.get("rq").toString()+ "Hydrogen quantity balance sheet.xls"); |
| 196 | } catch (Exception e) { | 196 | } catch (Exception e) { |
| 197 | e.printStackTrace(); | 197 | e.printStackTrace(); |
| 198 | } | 198 | } |
src/main/java/com/bsth/controller/oil/YlbController.java
| @@ -334,7 +334,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | @@ -334,7 +334,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | ||
| 334 | listI.add(resList.iterator()); | 334 | listI.add(resList.iterator()); |
| 335 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 335 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 336 | ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", | 336 | ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", |
| 337 | - path+"export/"+map.get("rq").toString()+ "进出场存油量.xls"); | 337 | + path+"export/"+map.get("rq").toString()+ "Entry and exit fuel reserve.xls"); |
| 338 | } catch (Exception e) { | 338 | } catch (Exception e) { |
| 339 | e.printStackTrace(); | 339 | e.printStackTrace(); |
| 340 | } | 340 | } |
| @@ -344,7 +344,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | @@ -344,7 +344,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ | ||
| 344 | } | 344 | } |
| 345 | 345 | ||
| 346 | /* | 346 | /* |
| 347 | - * 历史修改行车路单后重新统计油量信息 (传参:line --线路编码 date --日期) | 347 | + * 历史修改Waybill后重新统计油量信息 (传参:line --线路编码 date --日期) |
| 348 | */ | 348 | */ |
| 349 | 349 | ||
| 350 | @RequestMapping(value = "/updateHistory",method = RequestMethod.POST) | 350 | @RequestMapping(value = "/updateHistory",method = RequestMethod.POST) |
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
| @@ -76,7 +76,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -76,7 +76,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 76 | 76 | ||
| 77 | /** | 77 | /** |
| 78 | * | 78 | * |
| 79 | - * @Title: outgoAdjust @Description: TODO(待发调整) @param @param id | 79 | + * @Title: outgoAdjust @Description: TODO(Departure time adjustment) @param @param id |
| 80 | * 主键 @param @param remarks 备注 @param @param dfsj 待发时间(HH:mm) @throws | 80 | * 主键 @param @param remarks 备注 @param @param dfsj 待发时间(HH:mm) @throws |
| 81 | */ | 81 | */ |
| 82 | @RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST) | 82 | @RequestMapping(value = "/outgoAdjust", method = RequestMethod.POST) |
| @@ -147,7 +147,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -147,7 +147,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 147 | /** | 147 | /** |
| 148 | * | 148 | * |
| 149 | * @Title: realOutAdjust | 149 | * @Title: realOutAdjust |
| 150 | - * @Description: TODO(实发调整) | 150 | + * @Description: TODO(Actual dep-time adjustment) |
| 151 | * @param @param id 班次ID | 151 | * @param @param id 班次ID |
| 152 | * @param @param fcsjActual 实际发车时间 HH:mm | 152 | * @param @param fcsjActual 实际发车时间 HH:mm |
| 153 | * @param @param remarks 备注 | 153 | * @param @param remarks 备注 |
| @@ -161,7 +161,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -161,7 +161,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 161 | /** | 161 | /** |
| 162 | * | 162 | * |
| 163 | * @Title: revokeDestroy | 163 | * @Title: revokeDestroy |
| 164 | - * @Description: TODO(撤销烂班) | 164 | + * @Description: TODO(Revoke destroy) |
| 165 | * @param @param id | 165 | * @param @param id |
| 166 | * @throws | 166 | * @throws |
| 167 | */ | 167 | */ |
| @@ -173,7 +173,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -173,7 +173,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 173 | /** | 173 | /** |
| 174 | * | 174 | * |
| 175 | * @Title: revokeRealOutgo | 175 | * @Title: revokeRealOutgo |
| 176 | - * @Description: TODO(撤销实发) | 176 | + * @Description: TODO(Revoke actual dep-time) |
| 177 | * @param @param id | 177 | * @param @param id |
| 178 | * @throws | 178 | * @throws |
| 179 | */ | 179 | */ |
| @@ -183,7 +183,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -183,7 +183,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 183 | } | 183 | } |
| 184 | 184 | ||
| 185 | /** | 185 | /** |
| 186 | - * 撤销执行 | 186 | + * Revoke executed |
| 187 | * @param id | 187 | * @param id |
| 188 | * @return | 188 | * @return |
| 189 | */ | 189 | */ |
| @@ -208,7 +208,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -208,7 +208,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 208 | /** | 208 | /** |
| 209 | * | 209 | * |
| 210 | * @Title: schInfoFineTune | 210 | * @Title: schInfoFineTune |
| 211 | - * @Description: TODO(发车信息微调) | 211 | + * @Description: TODO(Departure time fine-tune) |
| 212 | * @param @param map | 212 | * @param @param map |
| 213 | * @throws | 213 | * @throws |
| 214 | */ | 214 | */ |
| @@ -220,7 +220,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -220,7 +220,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 220 | /** | 220 | /** |
| 221 | * | 221 | * |
| 222 | * @Title: outgoAdjustAll | 222 | * @Title: outgoAdjustAll |
| 223 | - * @Description: TODO(批量待发调整) | 223 | + * @Description: TODO(批量Departure time adjustment) |
| 224 | * @param @param list | 224 | * @param @param list |
| 225 | * @throws | 225 | * @throws |
| 226 | */ | 226 | */ |
| @@ -372,7 +372,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -372,7 +372,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 372 | } | 372 | } |
| 373 | /** | 373 | /** |
| 374 | * @Title queryListWaybill | 374 | * @Title queryListWaybill |
| 375 | - * @Description 查询行车路单列表 | 375 | + * @Description 查询Waybill列表 |
| 376 | * @param jGh 驾驶员名字 | 376 | * @param jGh 驾驶员名字 |
| 377 | * @param clZbh 车辆自编号(内部编号) | 377 | * @param clZbh 车辆自编号(内部编号) |
| 378 | * @param lpName 路牌 | 378 | * @param lpName 路牌 |
| @@ -386,7 +386,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -386,7 +386,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 386 | 386 | ||
| 387 | /** | 387 | /** |
| 388 | * @Title queryListWaybill | 388 | * @Title queryListWaybill |
| 389 | - * @Description 查询行车路单列表(闵行审计专用路单) | 389 | + * @Description 查询Waybill列表(闵行审计专用路单) |
| 390 | * @param jName 驾驶员名字 | 390 | * @param jName 驾驶员名字 |
| 391 | * @param clZbh 车辆自编号(内部编号) | 391 | * @param clZbh 车辆自编号(内部编号) |
| 392 | * @param lpName 路牌 | 392 | * @param lpName 路牌 |
| @@ -507,7 +507,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -507,7 +507,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 507 | } | 507 | } |
| 508 | 508 | ||
| 509 | /* | 509 | /* |
| 510 | - * 班次修正报表 | 510 | + * Shift correction report |
| 511 | */ | 511 | */ |
| 512 | @RequestMapping(value="/scheduleCorrectionReport") | 512 | @RequestMapping(value="/scheduleCorrectionReport") |
| 513 | public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){ | 513 | public List<Map<String,Object>> scheduleCorrectionReport(@RequestParam Map<String, Object> map){ |
| @@ -550,7 +550,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -550,7 +550,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 550 | 550 | ||
| 551 | /** | 551 | /** |
| 552 | * @Title: scheduleDaily | 552 | * @Title: scheduleDaily |
| 553 | - * @Description: TODO(调度日报表) | 553 | + * @Description: TODO(Dispatch daily report表) |
| 554 | * @param line 线路 | 554 | * @param line 线路 |
| 555 | * @param date 时间 | 555 | * @param date 时间 |
| 556 | * @return | 556 | * @return |
| @@ -656,7 +656,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -656,7 +656,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 656 | } | 656 | } |
| 657 | 657 | ||
| 658 | /** | 658 | /** |
| 659 | - * 获取当日计划排班 , 从计划表抓取数据 | 659 | + * 获取Today planned shift , 从计划表抓取数据 |
| 660 | * @return | 660 | * @return |
| 661 | */ | 661 | */ |
| 662 | @RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET) | 662 | @RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET) |
| @@ -702,7 +702,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -702,7 +702,7 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 702 | } | 702 | } |
| 703 | 703 | ||
| 704 | /** | 704 | /** |
| 705 | - * 误点调整 | 705 | + * Late adjustment |
| 706 | * @param idx | 706 | * @param idx |
| 707 | * @param minute | 707 | * @param minute |
| 708 | * @return | 708 | * @return |
| @@ -983,9 +983,9 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | @@ -983,9 +983,9 @@ public class ScheduleRealInfoController extends BaseController<ScheduleRealInfo, | ||
| 983 | public String getXlDirStr() { | 983 | public String getXlDirStr() { |
| 984 | xlDirStr = ""; | 984 | xlDirStr = ""; |
| 985 | if (xlDir == 0) { | 985 | if (xlDir == 0) { |
| 986 | - xlDirStr = "上行"; | 986 | + xlDirStr = "Up"; |
| 987 | } else if (xlDir == 1) { | 987 | } else if (xlDir == 1) { |
| 988 | - xlDirStr = "下行"; | 988 | + xlDirStr = "Down"; |
| 989 | } | 989 | } |
| 990 | return xlDirStr; | 990 | return xlDirStr; |
| 991 | } | 991 | } |
src/main/java/com/bsth/controller/realcontrol/dto/DfsjChange.java
| @@ -3,7 +3,7 @@ package com.bsth.controller.realcontrol.dto; | @@ -3,7 +3,7 @@ package com.bsth.controller.realcontrol.dto; | ||
| 3 | /** | 3 | /** |
| 4 | * | 4 | * |
| 5 | * @ClassName: DfsjChange | 5 | * @ClassName: DfsjChange |
| 6 | - * @Description: TODO(待发调整) | 6 | + * @Description: TODO(Departure time adjustment) |
| 7 | * @author PanZhao | 7 | * @author PanZhao |
| 8 | * @date 2016年10月31日 上午1:00:11 | 8 | * @date 2016年10月31日 上午1:00:11 |
| 9 | * | 9 | * |
src/main/java/com/bsth/controller/realcontrol/summary/FastAndSlowController.java
| @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; | @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest; | ||
| 13 | import javax.servlet.http.HttpServletResponse; | 13 | import javax.servlet.http.HttpServletResponse; |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | - * 快慢误点统计 | 16 | + * Fast and slow delay statistics |
| 17 | * Created by panzhao on 2017/10/24. | 17 | * Created by panzhao on 2017/10/24. |
| 18 | */ | 18 | */ |
| 19 | @RestController | 19 | @RestController |
src/main/java/com/bsth/controller/report/ReportController.java
| @@ -59,7 +59,7 @@ public class ReportController { | @@ -59,7 +59,7 @@ public class ReportController { | ||
| 59 | m.put("jzsj", a.getJzsj()); | 59 | m.put("jzsj", a.getJzsj()); |
| 60 | m.put("czsj", a.getCzsj()); | 60 | m.put("czsj", a.getCzsj()); |
| 61 | m.put("kgm", ""); | 61 | m.put("kgm", ""); |
| 62 | - m.put("upDown", a.getUpDown()==0?"上行":"下行"); | 62 | + m.put("upDown", a.getUpDown()==0?"Up":"Down"); |
| 63 | m.put("kmsd", ""); | 63 | m.put("kmsd", ""); |
| 64 | m.put("bufa", ""); | 64 | m.put("bufa", ""); |
| 65 | m.put("skcs", ""); | 65 | m.put("skcs", ""); |
| @@ -77,7 +77,7 @@ public class ReportController { | @@ -77,7 +77,7 @@ public class ReportController { | ||
| 77 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 77 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 78 | ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls", | 78 | ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls", |
| 79 | path + "export/"+sdfSimple.format(sdfMonth.parse(date)) | 79 | path + "export/"+sdfSimple.format(sdfMonth.parse(date)) |
| 80 | - +"-"+clzbh+"-班次到离站.xls"); | 80 | + +"-"+clzbh+"-Shift arrival and departure.xls"); |
| 81 | } catch (Exception e) { | 81 | } catch (Exception e) { |
| 82 | e.printStackTrace(); | 82 | e.printStackTrace(); |
| 83 | } | 83 | } |
| @@ -132,7 +132,7 @@ public class ReportController { | @@ -132,7 +132,7 @@ public class ReportController { | ||
| 132 | m.put("jzsj", a.getJzsj()); | 132 | m.put("jzsj", a.getJzsj()); |
| 133 | m.put("czsj", a.getCzsj()); | 133 | m.put("czsj", a.getCzsj()); |
| 134 | m.put("kgm", ""); | 134 | m.put("kgm", ""); |
| 135 | - m.put("upDown", a.getUpDown()==0?"上行":"下行"); | 135 | + m.put("upDown", a.getUpDown()==0?"Up":"Down"); |
| 136 | m.put("kmsd", ""); | 136 | m.put("kmsd", ""); |
| 137 | m.put("bufa", ""); | 137 | m.put("bufa", ""); |
| 138 | m.put("skcs", ""); | 138 | m.put("skcs", ""); |
| @@ -160,7 +160,7 @@ public class ReportController { | @@ -160,7 +160,7 @@ public class ReportController { | ||
| 160 | listI.add(resList.iterator()); | 160 | listI.add(resList.iterator()); |
| 161 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 161 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 162 | ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls", | 162 | ee.excelReplace(listI, new Object[] { map }, path + "mould/inoutstation.xls", |
| 163 | - path + "export/"+dateTime+"-"+lineName+"-班次到离站.xls"); | 163 | + path + "export/"+dateTime+"-"+lineName+"-Shift arrival and departure.xls"); |
| 164 | } catch (Exception e) { | 164 | } catch (Exception e) { |
| 165 | e.printStackTrace(); | 165 | e.printStackTrace(); |
| 166 | } | 166 | } |
| @@ -211,7 +211,7 @@ public class ReportController { | @@ -211,7 +211,7 @@ public class ReportController { | ||
| 211 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 211 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 212 | ee.excelReplace(listI, new Object[] { map }, path + "mould/jobSummary.xls", | 212 | ee.excelReplace(listI, new Object[] { map }, path + "mould/jobSummary.xls", |
| 213 | path + "export/"+sdfSimple.format(sdfMonth.parse(date)) | 213 | path + "export/"+sdfSimple.format(sdfMonth.parse(date)) |
| 214 | - +"-"+lineName+"-调度员工作汇总日报.xls"); | 214 | + +"-"+lineName+"-Daily work summary.xls"); |
| 215 | } catch (Exception e) { | 215 | } catch (Exception e) { |
| 216 | e.printStackTrace(); | 216 | e.printStackTrace(); |
| 217 | } | 217 | } |
| @@ -367,7 +367,7 @@ public class ReportController { | @@ -367,7 +367,7 @@ public class ReportController { | ||
| 367 | listI.add(lMap.iterator()); | 367 | listI.add(lMap.iterator()); |
| 368 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 368 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 369 | ee.excelReplace(listI, new Object[]{m}, path + "mould/countIntervalXx.xls", | 369 | ee.excelReplace(listI, new Object[]{m}, path + "mould/countIntervalXx.xls", |
| 370 | - path + "export/大间隔统计表详细.xls"); | 370 | + path + "export/Large interval statistics detail.xls"); |
| 371 | } catch (Exception e) { | 371 | } catch (Exception e) { |
| 372 | // TODO: handle exception | 372 | // TODO: handle exception |
| 373 | e.printStackTrace(); | 373 | e.printStackTrace(); |
| @@ -396,7 +396,7 @@ public class ReportController { | @@ -396,7 +396,7 @@ public class ReportController { | ||
| 396 | } | 396 | } |
| 397 | 397 | ||
| 398 | /** | 398 | /** |
| 399 | - * @Description :TODO(路单线路明细月报表导出数据) | 399 | + * @Description :TODO(Waybill line details monthly reportexport数据) |
| 400 | * | 400 | * |
| 401 | * @param map <tables> | 401 | * @param map <tables> |
| 402 | * | 402 | * |
src/main/java/com/bsth/controller/schedule/BController.java
| @@ -221,12 +221,12 @@ public class BController<T, ID extends Serializable> { | @@ -221,12 +221,12 @@ public class BController<T, ID extends Serializable> { | ||
| 221 | return rtn; | 221 | return rtn; |
| 222 | } | 222 | } |
| 223 | 223 | ||
| 224 | - // 导出数据到xls文件 | 224 | + // export数据到xls文件 |
| 225 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 225 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 226 | public void exportFile(HttpServletResponse response, | 226 | public void exportFile(HttpServletResponse response, |
| 227 | @RequestParam Map<String, Object> params) throws Exception { | 227 | @RequestParam Map<String, Object> params) throws Exception { |
| 228 | DataToolsFile dataToolsFile = bService.exportData(params); | 228 | DataToolsFile dataToolsFile = bService.exportData(params); |
| 229 | - // 流输出导出文件 | 229 | + // 流输出export文件 |
| 230 | response.setHeader("content-type", "application/octet-stream"); | 230 | response.setHeader("content-type", "application/octet-stream"); |
| 231 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 231 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 232 | response.setContentType("application/octet-stream"); | 232 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/basicinfo/CarController_facade.java
| @@ -136,7 +136,7 @@ public class CarController_facade extends BController_facade<Integer, CarDto> { | @@ -136,7 +136,7 @@ public class CarController_facade extends BController_facade<Integer, CarDto> { | ||
| 136 | return rtn; | 136 | return rtn; |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 139 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 140 | @Autowired | 140 | @Autowired |
| 141 | private CarsService carsService; | 141 | private CarsService carsService; |
| 142 | // 上传excel文件 | 142 | // 上传excel文件 |
| @@ -209,12 +209,12 @@ public class CarController_facade extends BController_facade<Integer, CarDto> { | @@ -209,12 +209,12 @@ public class CarController_facade extends BController_facade<Integer, CarDto> { | ||
| 209 | return rtn; | 209 | return rtn; |
| 210 | } | 210 | } |
| 211 | 211 | ||
| 212 | - // 导出数据到xls文件 | 212 | + // export数据到xls文件 |
| 213 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 213 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 214 | public void exportFile(HttpServletResponse response, | 214 | public void exportFile(HttpServletResponse response, |
| 215 | @RequestParam Map<String, Object> params) throws Exception { | 215 | @RequestParam Map<String, Object> params) throws Exception { |
| 216 | DataToolsFile dataToolsFile = carsService.exportData(params); | 216 | DataToolsFile dataToolsFile = carsService.exportData(params); |
| 217 | - // 流输出导出文件 | 217 | + // 流输出export文件 |
| 218 | response.setHeader("content-type", "application/octet-stream"); | 218 | response.setHeader("content-type", "application/octet-stream"); |
| 219 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 219 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 220 | response.setContentType("application/octet-stream"); | 220 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/basicinfo/EmployeeController_facade.java
| @@ -78,7 +78,7 @@ public class EmployeeController_facade extends BController_facade<Integer, Perso | @@ -78,7 +78,7 @@ public class EmployeeController_facade extends BController_facade<Integer, Perso | ||
| 78 | return rtn; | 78 | return rtn; |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 81 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 82 | @Autowired | 82 | @Autowired |
| 83 | private EmployeeService employeeService; | 83 | private EmployeeService employeeService; |
| 84 | // 上传excel文件 | 84 | // 上传excel文件 |
| @@ -151,12 +151,12 @@ public class EmployeeController_facade extends BController_facade<Integer, Perso | @@ -151,12 +151,12 @@ public class EmployeeController_facade extends BController_facade<Integer, Perso | ||
| 151 | return rtn; | 151 | return rtn; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | - // 导出数据到xls文件 | 154 | + // export数据到xls文件 |
| 155 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 155 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 156 | public void exportFile(HttpServletResponse response, | 156 | public void exportFile(HttpServletResponse response, |
| 157 | @RequestParam Map<String, Object> params) throws Exception { | 157 | @RequestParam Map<String, Object> params) throws Exception { |
| 158 | DataToolsFile dataToolsFile = employeeService.exportData(params); | 158 | DataToolsFile dataToolsFile = employeeService.exportData(params); |
| 159 | - // 流输出导出文件 | 159 | + // 流输出export文件 |
| 160 | response.setHeader("content-type", "application/octet-stream"); | 160 | response.setHeader("content-type", "application/octet-stream"); |
| 161 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 161 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 162 | response.setContentType("application/octet-stream"); | 162 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController_facade.java
| @@ -238,7 +238,7 @@ public class CarConfigInfoController_facade extends BController_facade<Long, Veh | @@ -238,7 +238,7 @@ public class CarConfigInfoController_facade extends BController_facade<Long, Veh | ||
| 238 | return rtn; | 238 | return rtn; |
| 239 | } | 239 | } |
| 240 | 240 | ||
| 241 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 241 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 242 | @Autowired | 242 | @Autowired |
| 243 | private CarConfigInfoService carConfigInfoService; | 243 | private CarConfigInfoService carConfigInfoService; |
| 244 | // 上传excel文件 | 244 | // 上传excel文件 |
| @@ -311,12 +311,12 @@ public class CarConfigInfoController_facade extends BController_facade<Long, Veh | @@ -311,12 +311,12 @@ public class CarConfigInfoController_facade extends BController_facade<Long, Veh | ||
| 311 | return rtn; | 311 | return rtn; |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | - // 导出数据到xls文件 | 314 | + // export数据到xls文件 |
| 315 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 315 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 316 | public void exportFile(HttpServletResponse response, | 316 | public void exportFile(HttpServletResponse response, |
| 317 | @RequestParam Map<String, Object> params) throws Exception { | 317 | @RequestParam Map<String, Object> params) throws Exception { |
| 318 | DataToolsFile dataToolsFile = carConfigInfoService.exportData(params); | 318 | DataToolsFile dataToolsFile = carConfigInfoService.exportData(params); |
| 319 | - // 流输出导出文件 | 319 | + // 流输出export文件 |
| 320 | response.setHeader("content-type", "application/octet-stream"); | 320 | response.setHeader("content-type", "application/octet-stream"); |
| 321 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 321 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 322 | response.setContentType("application/octet-stream"); | 322 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController_facade.java
| @@ -357,7 +357,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade<Long | @@ -357,7 +357,7 @@ public class EmployeeConfigInfoController_facade extends BController_facade<Long | ||
| 357 | return rtn; | 357 | return rtn; |
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 360 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 361 | @Autowired | 361 | @Autowired |
| 362 | private EmployeeConfigInfoService employeeConfigInfoService; | 362 | private EmployeeConfigInfoService employeeConfigInfoService; |
| 363 | // 上传excel文件 | 363 | // 上传excel文件 |
| @@ -430,12 +430,12 @@ public class EmployeeConfigInfoController_facade extends BController_facade<Long | @@ -430,12 +430,12 @@ public class EmployeeConfigInfoController_facade extends BController_facade<Long | ||
| 430 | return rtn; | 430 | return rtn; |
| 431 | } | 431 | } |
| 432 | 432 | ||
| 433 | - // 导出数据到xls文件 | 433 | + // export数据到xls文件 |
| 434 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 434 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 435 | public void exportFile(HttpServletResponse response, | 435 | public void exportFile(HttpServletResponse response, |
| 436 | @RequestParam Map<String, Object> params) throws Exception { | 436 | @RequestParam Map<String, Object> params) throws Exception { |
| 437 | DataToolsFile dataToolsFile = employeeConfigInfoService.exportData(params); | 437 | DataToolsFile dataToolsFile = employeeConfigInfoService.exportData(params); |
| 438 | - // 流输出导出文件 | 438 | + // 流输出export文件 |
| 439 | response.setHeader("content-type", "application/octet-stream"); | 439 | response.setHeader("content-type", "application/octet-stream"); |
| 440 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 440 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 441 | response.setContentType("application/octet-stream"); | 441 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController_facade.java
| @@ -119,7 +119,7 @@ public class GuideboardInfoController_facade extends BController_facade<Long, Lp | @@ -119,7 +119,7 @@ public class GuideboardInfoController_facade extends BController_facade<Long, Lp | ||
| 119 | return rtn; | 119 | return rtn; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 122 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 123 | @Autowired | 123 | @Autowired |
| 124 | private GuideboardInfoService guideboardInfoService; | 124 | private GuideboardInfoService guideboardInfoService; |
| 125 | // 上传excel文件 | 125 | // 上传excel文件 |
| @@ -192,12 +192,12 @@ public class GuideboardInfoController_facade extends BController_facade<Long, Lp | @@ -192,12 +192,12 @@ public class GuideboardInfoController_facade extends BController_facade<Long, Lp | ||
| 192 | return rtn; | 192 | return rtn; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | - // 导出数据到xls文件 | 195 | + // export数据到xls文件 |
| 196 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 196 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 197 | public void exportFile(HttpServletResponse response, | 197 | public void exportFile(HttpServletResponse response, |
| 198 | @RequestParam Map<String, Object> params) throws Exception { | 198 | @RequestParam Map<String, Object> params) throws Exception { |
| 199 | DataToolsFile dataToolsFile = guideboardInfoService.exportData(params); | 199 | DataToolsFile dataToolsFile = guideboardInfoService.exportData(params); |
| 200 | - // 流输出导出文件 | 200 | + // 流输出export文件 |
| 201 | response.setHeader("content-type", "application/octet-stream"); | 201 | response.setHeader("content-type", "application/octet-stream"); |
| 202 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 202 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 203 | response.setContentType("application/octet-stream"); | 203 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java
| @@ -189,7 +189,7 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | @@ -189,7 +189,7 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | ||
| 189 | return ttInfoDetailService.skbDetailMxSave(entities); | 189 | return ttInfoDetailService.skbDetailMxSave(entities); |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | - //------------------ TODO:导入导出逻辑,之后会服务化 -----------------// | 192 | + //------------------ TODO:导入export逻辑,之后会服务化 -----------------// |
| 193 | 193 | ||
| 194 | // 上传excel文件 | 194 | // 上传excel文件 |
| 195 | @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) | 195 | @RequestMapping(value = "/uploadFile", method = RequestMethod.POST) |
| @@ -261,12 +261,12 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | @@ -261,12 +261,12 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | ||
| 261 | return rtn; | 261 | return rtn; |
| 262 | } | 262 | } |
| 263 | 263 | ||
| 264 | - // 导出数据到xls文件 | 264 | + // export数据到xls文件 |
| 265 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) | 265 | @RequestMapping(value = "/exportFile", method = RequestMethod.GET) |
| 266 | public void exportFile(HttpServletResponse response, | 266 | public void exportFile(HttpServletResponse response, |
| 267 | @RequestParam Map<String, Object> params) throws Exception { | 267 | @RequestParam Map<String, Object> params) throws Exception { |
| 268 | DataToolsFile dataToolsFile = ttInfoDetailService.exportData(params); | 268 | DataToolsFile dataToolsFile = ttInfoDetailService.exportData(params); |
| 269 | - // 流输出导出文件 | 269 | + // 流输出export文件 |
| 270 | response.setHeader("content-type", "application/octet-stream"); | 270 | response.setHeader("content-type", "application/octet-stream"); |
| 271 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 271 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 272 | response.setContentType("application/octet-stream"); | 272 | response.setContentType("application/octet-stream"); |
| @@ -298,10 +298,10 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | @@ -298,10 +298,10 @@ public class TTInfoDetailController_facade extends BController_facade<Long, TTIn | ||
| 298 | } else if ("xlsx".equals(type)) { | 298 | } else if ("xlsx".equals(type)) { |
| 299 | dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLSX); | 299 | dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLSX); |
| 300 | } else { | 300 | } else { |
| 301 | - throw new Exception("未知的导出格式==>" + type); | 301 | + throw new Exception("未知的export格式==>" + type); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | - // 流输出导出文件 | 304 | + // 流输出export文件 |
| 305 | response.setHeader("content-type", "application/octet-stream"); | 305 | response.setHeader("content-type", "application/octet-stream"); |
| 306 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 306 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 307 | response.setContentType("application/octet-stream"); | 307 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
| @@ -75,7 +75,7 @@ public class EmployeeConfigInfoController extends BController<EmployeeConfigInfo | @@ -75,7 +75,7 @@ public class EmployeeConfigInfoController extends BController<EmployeeConfigInfo | ||
| 75 | } | 75 | } |
| 76 | @GetMapping(value = "/validate_get_destroy_info/download") | 76 | @GetMapping(value = "/validate_get_destroy_info/download") |
| 77 | public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception { | 77 | public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception { |
| 78 | - // 流输出导出文件 | 78 | + // 流输出export文件 |
| 79 | response.setHeader("content-type", "application/octet-stream"); | 79 | response.setHeader("content-type", "application/octet-stream"); |
| 80 | response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("排班人员停用信息.txt", "UTF-8")); | 80 | response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode("排班人员停用信息.txt", "UTF-8")); |
| 81 | response.setContentType("application/octet-stream"); | 81 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/schedule/core/legacy/TTInfoDetailController.java
| @@ -132,7 +132,7 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | @@ -132,7 +132,7 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | ||
| 132 | return ttInfoDetailService.skbDetailMxSave(entities); | 132 | return ttInfoDetailService.skbDetailMxSave(entities); |
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | - // 导出预览视图数据 | 135 | + // export预览视图数据 |
| 136 | @GetMapping(value = "/exportPvInfo/{id}") | 136 | @GetMapping(value = "/exportPvInfo/{id}") |
| 137 | public void exportPvInfo(@PathVariable("id") Long ttInfoId, HttpServletResponse response) throws Exception { | 137 | public void exportPvInfo(@PathVariable("id") Long ttInfoId, HttpServletResponse response) throws Exception { |
| 138 | DataToolsFile dataToolsFile = this.ttInfoDetailService.exportPvInfo(ttInfoId); | 138 | DataToolsFile dataToolsFile = this.ttInfoDetailService.exportPvInfo(ttInfoId); |
| @@ -197,10 +197,10 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | @@ -197,10 +197,10 @@ public class TTInfoDetailController extends BController<TTInfoDetail, Long> { | ||
| 197 | } else if ("xlsx".equals(type)) { | 197 | } else if ("xlsx".equals(type)) { |
| 198 | dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLSX); | 198 | dataToolsFile = ttInfoDetailService.exportDynamicTTinfo(dtInfos, DataToolsFileType.XLSX); |
| 199 | } else { | 199 | } else { |
| 200 | - throw new Exception("未知的导出格式==>" + type); | 200 | + throw new Exception("未知的export格式==>" + type); |
| 201 | } | 201 | } |
| 202 | 202 | ||
| 203 | - // 流输出导出文件 | 203 | + // 流输出export文件 |
| 204 | response.setHeader("content-type", "application/octet-stream"); | 204 | response.setHeader("content-type", "application/octet-stream"); |
| 205 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); | 205 | response.setHeader("Content-Disposition", "attachment; filename=" + dataToolsFile.getFile().getName()); |
| 206 | response.setContentType("application/octet-stream"); | 206 | response.setContentType("application/octet-stream"); |
src/main/java/com/bsth/controller/sys/UserController.java
| @@ -80,7 +80,7 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -80,7 +80,7 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 80 | userName = RSAUtils.decryptBase64(userName); | 80 | userName = RSAUtils.decryptBase64(userName); |
| 81 | password = RSAUtils.decryptBase64(password); | 81 | password = RSAUtils.decryptBase64(password); |
| 82 | } catch (RuntimeException e) { | 82 | } catch (RuntimeException e) { |
| 83 | - return put(rs, "msg", "decrypt RSA fail!可能页面已过期,尝试刷新页面。"); | 83 | + return put(rs, "msg", "Decrypt RSA failed! Maybe the page is expired, press F5 to refresh."); |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | SysUser user = sysUserService.findByUserName(userName); | 86 | SysUser user = sysUserService.findByUserName(userName); |
| @@ -93,22 +93,22 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -93,22 +93,22 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 93 | 93 | ||
| 94 | // 校验用户状态 | 94 | // 校验用户状态 |
| 95 | if (!user.isEnabled()) { | 95 | if (!user.isEnabled()) { |
| 96 | - return put(rs, "msg", "该用户已被锁定,请联系管理员"); | 96 | + return put(rs, "msg", "The user is locked, please contact the administrator."); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | // 校验临时状态 | 99 | // 校验临时状态 |
| 100 | if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) { | 100 | if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) { |
| 101 | - return put(rs, "msg", "您的账户因密码错误次数过多,处于锁定状态中"); | 101 | + return put(rs, "msg", "The user is locked cause too many attempts."); |
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | // 校验验证码 | 104 | // 校验验证码 |
| 105 | if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) { | 105 | if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) { |
| 106 | String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY); | 106 | String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY); |
| 107 | if (StringUtils.isBlank(captcha)) { | 107 | if (StringUtils.isBlank(captcha)) { |
| 108 | - return put(rs, "msg", "请输入验证码"); | 108 | + return put(rs, "msg", "Enter captcha"); |
| 109 | } | 109 | } |
| 110 | if (!verCode.equals(captcha)) { | 110 | if (!verCode.equals(captcha)) { |
| 111 | - return put(rs, "msg", "验证码有误,请刷新后重新输入"); | 111 | + return put(rs, "msg", "Captcha isn't match, please enter again after refresh."); |
| 112 | } | 112 | } |
| 113 | } | 113 | } |
| 114 | 114 | ||
| @@ -141,13 +141,13 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -141,13 +141,13 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 141 | logger.error("用户:" + user.getUserName() + "登录"); | 141 | logger.error("用户:" + user.getUserName() + "登录"); |
| 142 | } catch (Exception e) { | 142 | } catch (Exception e) { |
| 143 | logger.error("", e); | 143 | logger.error("", e); |
| 144 | - rs.put("msg", "服务器出现异常,请联系管理员"); | 144 | + rs.put("msg", "Server occur exception, please contact the administrator."); |
| 145 | } | 145 | } |
| 146 | return rs; | 146 | return rs; |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | private void userOrPasswordInvalid(Map<String, Object> rs, String userName) { | 149 | private void userOrPasswordInvalid(Map<String, Object> rs, String userName) { |
| 150 | - rs.put("msg", "密码有误"); | 150 | + rs.put("msg", "Password isn't match."); |
| 151 | 151 | ||
| 152 | Integer errTimes = USER_ERRTIMES.get(userName); | 152 | Integer errTimes = USER_ERRTIMES.get(userName); |
| 153 | if (null == errTimes) { | 153 | if (null == errTimes) { |
| @@ -157,7 +157,7 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -157,7 +157,7 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 157 | if (errTimes > 3) { | 157 | if (errTimes > 3) { |
| 158 | USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000); | 158 | USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000); |
| 159 | USER_ERRTIMES.put(userName, 0); | 159 | USER_ERRTIMES.put(userName, 0); |
| 160 | - put(rs, "msg", "密码错误4次,账户将被锁定10分钟"); | 160 | + put(rs, "msg", "Password isn't match four times,the user will be locked ten minutes."); |
| 161 | } | 161 | } |
| 162 | } | 162 | } |
| 163 | 163 | ||
| @@ -172,15 +172,15 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -172,15 +172,15 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 172 | 172 | ||
| 173 | SysUser user = sysUserService.findByUserName(userName); | 173 | SysUser user = sysUserService.findByUserName(userName); |
| 174 | if (null == user) | 174 | if (null == user) |
| 175 | - return put(rs, "msg", "不存在的用户"); | 175 | + return put(rs, "msg", "The user isn't exist."); |
| 176 | 176 | ||
| 177 | if (!user.isEnabled()) | 177 | if (!user.isEnabled()) |
| 178 | - return put(rs, "msg", "该用户已被锁定,请联系管理员"); | 178 | + return put(rs, "msg", "The user is locked, please contact the administrator."); |
| 179 | 179 | ||
| 180 | // 校验密码 | 180 | // 校验密码 |
| 181 | boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword()); | 181 | boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword()); |
| 182 | if (!matchStatus) | 182 | if (!matchStatus) |
| 183 | - return put(rs, "msg", "密码有误"); | 183 | + return put(rs, "msg", "Password isn't match."); |
| 184 | 184 | ||
| 185 | // 登录 | 185 | // 登录 |
| 186 | SecurityUtils.login(user, request); | 186 | SecurityUtils.login(user, request); |
| @@ -193,7 +193,7 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -193,7 +193,7 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 193 | rs.put("status", ResponseCode.SUCCESS); | 193 | rs.put("status", ResponseCode.SUCCESS); |
| 194 | } catch (Exception e) { | 194 | } catch (Exception e) { |
| 195 | logger.error("", e); | 195 | logger.error("", e); |
| 196 | - rs.put("msg", "服务器出现异常,请联系管理员"); | 196 | + rs.put("msg", "Server occur exception, please contact the administrator."); |
| 197 | } | 197 | } |
| 198 | return rs; | 198 | return rs; |
| 199 | } | 199 | } |
| @@ -259,9 +259,9 @@ public class UserController extends BaseController<SysUser, Integer> { | @@ -259,9 +259,9 @@ public class UserController extends BaseController<SysUser, Integer> { | ||
| 259 | Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION"); | 259 | Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION"); |
| 260 | 260 | ||
| 261 | if (obj instanceof BadCredentialsException) | 261 | if (obj instanceof BadCredentialsException) |
| 262 | - msg = "登录失败,用户名或密码错误."; | 262 | + msg = "Login failed, username or password isn't match."; |
| 263 | else if (obj instanceof SessionAuthenticationException) | 263 | else if (obj instanceof SessionAuthenticationException) |
| 264 | - msg = "登录失败,当前策略不允许重复登录."; | 264 | + msg = "Login failed, can't login duplicate."; |
| 265 | session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION"); | 265 | session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION"); |
| 266 | return msg; | 266 | return msg; |
| 267 | } | 267 | } |
src/main/java/com/bsth/data/directive/DirectiveCreator.java
| @@ -36,7 +36,7 @@ public class DirectiveCreator { | @@ -36,7 +36,7 @@ public class DirectiveCreator { | ||
| 36 | * @param @param nbbm 车辆内部编码 | 36 | * @param @param nbbm 车辆内部编码 |
| 37 | * @param @param text 文本 | 37 | * @param @param text 文本 |
| 38 | * @param @param dispatchInstruct 指令类型(0X00表示信息短语,0X01表示取消上次指令+调度指令(闹钟有效),0x02表示为调度指令(闹钟有效); 0x03表示运营状态指令(闹钟无效);0x04表示其他指令) | 38 | * @param @param dispatchInstruct 指令类型(0X00表示信息短语,0X01表示取消上次指令+调度指令(闹钟有效),0x02表示为调度指令(闹钟有效); 0x03表示运营状态指令(闹钟无效);0x04表示其他指令) |
| 39 | - * @param @param upDown 上下行(0 上行 1 下行) | 39 | + * @param @param upDown 上下行(0 Up 1 下行) |
| 40 | * @param @param state 营运状态(0 营运 1 非营运) | 40 | * @param @param state 营运状态(0 营运 1 非营运) |
| 41 | * @param @return 设定文件 | 41 | * @param @return 设定文件 |
| 42 | * @return Directive60 返回类型 | 42 | * @return Directive60 返回类型 |
src/main/java/com/bsth/data/forecast/entity/ArrivalEntity.java
| @@ -90,7 +90,7 @@ public class ArrivalEntity { | @@ -90,7 +90,7 @@ public class ArrivalEntity { | ||
| 90 | try { | 90 | try { |
| 91 | SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm"); | 91 | SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm"); |
| 92 | return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+", "+sdfHHmm.format(new Date(this.ts)) | 92 | return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+", "+sdfHHmm.format(new Date(this.ts)) |
| 93 | - +","+(this.getUpDown()==0?"上行":"下行")+","+(this.inOut==0?"进":"出")+","+this.stopNo+" ("+this.stopName+")]"; | 93 | + +","+(this.getUpDown()==0?"Up":"Down")+","+(this.inOut==0?"进":"出")+","+this.stopNo+" ("+this.stopName+")]"; |
| 94 | } catch (Exception e) { | 94 | } catch (Exception e) { |
| 95 | return ""; | 95 | return ""; |
| 96 | } | 96 | } |
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
| @@ -56,7 +56,7 @@ public class GpsEntity implements Cloneable{ | @@ -56,7 +56,7 @@ public class GpsEntity implements Cloneable{ | ||
| 56 | /** 营运状态( 0 营运 ,1 非营运, -1 无效) */ | 56 | /** 营运状态( 0 营运 ,1 非营运, -1 无效) */ |
| 57 | private Integer state; | 57 | private Integer state; |
| 58 | 58 | ||
| 59 | - /** 上下行(0 上行 , 1 下行 , -1 无效) */ | 59 | + /** 上下行(0 Up , 1 Down , -1 无效) */ |
| 60 | private Byte upDown; | 60 | private Byte upDown; |
| 61 | 61 | ||
| 62 | /** | 62 | /** |
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
| @@ -175,7 +175,7 @@ public class InStationProcess { | @@ -175,7 +175,7 @@ public class InStationProcess { | ||
| 175 | 175 | ||
| 176 | logger.info("车辆:" + nbbm + " 班次:" + sch.getDfsj() + "到终点, 时间:" + sch.getZdsjActual() + " -stopNo: " + gps.getStopNo()); | 176 | logger.info("车辆:" + nbbm + " 班次:" + sch.getDfsj() + "到终点, 时间:" + sch.getZdsjActual() + " -stopNo: " + gps.getStopNo()); |
| 177 | 177 | ||
| 178 | - //清除车辆误点调整监听 | 178 | + //清除车辆Late adjustment监听 |
| 179 | LateAdjustHandle.remove(sch); | 179 | LateAdjustHandle.remove(sch); |
| 180 | 180 | ||
| 181 | //将gps转换成下一个班次走向的站内信号(应对只有一个站内信号 即 发出时) | 181 | //将gps转换成下一个班次走向的站内信号(应对只有一个站内信号 即 发出时) |
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
| @@ -45,7 +45,7 @@ public class GatewayHttpLoader implements ApplicationContextAware{ | @@ -45,7 +45,7 @@ public class GatewayHttpLoader implements ApplicationContextAware{ | ||
| 45 | static GpsRealData gpsRealData; | 45 | static GpsRealData gpsRealData; |
| 46 | 46 | ||
| 47 | static{ | 47 | static{ |
| 48 | - url = "http://127.0.0.1:8080/transport_server/rtgps/"; | 48 | + url = "http://47.76.243.65:18080/transport_server/rtgps/"; |
| 49 | list = new ArrayList<>(); | 49 | list = new ArrayList<>(); |
| 50 | httpClient = HttpClients.createDefault(); | 50 | httpClient = HttpClients.createDefault(); |
| 51 | get = new HttpGet(url); | 51 | get = new HttpGet(url); |
src/main/java/com/bsth/data/report_register/ReportRegisterServiceImpl.java
| @@ -39,7 +39,7 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl<ReportRegister, L | @@ -39,7 +39,7 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl<ReportRegister, L | ||
| 39 | String date1 = "",date2 = ""; | 39 | String date1 = "",date2 = ""; |
| 40 | String isFindDelete = ""; | 40 | String isFindDelete = ""; |
| 41 | if(type!=null && (type.equals("query") || type.equals("export"))){ | 41 | if(type!=null && (type.equals("query") || type.equals("export"))){ |
| 42 | - // 导出是不要删除的 | 42 | + // export是不要删除的 |
| 43 | if(type.equals("export")) | 43 | if(type.equals("export")) |
| 44 | isFindDelete = " and STATUS !=2 "; | 44 | isFindDelete = " and STATUS !=2 "; |
| 45 | date1 = map.get("date1") == null ? "" : map.get("date1").toString()+" 00:00:00"; | 45 | date1 = map.get("date1") == null ? "" : map.get("date1").toString()+" 00:00:00"; |
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
| @@ -27,8 +27,8 @@ public class ScheduleModifyLogger { | @@ -27,8 +27,8 @@ public class ScheduleModifyLogger { | ||
| 27 | static Logger log = LoggerFactory.getLogger(ScheduleModifyLogger.class); | 27 | static Logger log = LoggerFactory.getLogger(ScheduleModifyLogger.class); |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | - * 待发调整 | ||
| 31 | - * opType 0: 双击调整、 1:待发调整、2:批量待发调整、3:间隔调整、4:调派系统调整 | 30 | + * Departure time adjustment |
| 31 | + * opType 0: 双击调整、 1:Departure time adjustment、2:批量Departure time adjustment、3:间隔调整、4:调派系统调整 | ||
| 32 | */ | 32 | */ |
| 33 | public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks, String userId) { | 33 | public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks, String userId) { |
| 34 | try { | 34 | try { |
| @@ -54,7 +54,7 @@ public class ScheduleModifyLogger { | @@ -54,7 +54,7 @@ public class ScheduleModifyLogger { | ||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | /** | 56 | /** |
| 57 | - * 发车信息微调记录器 | 57 | + * Departure time fine-tune记录器 |
| 58 | */ | 58 | */ |
| 59 | public static void fcxxwt(ScheduleRealInfo sch, String remarks, JSONArray jsonArray) { | 59 | public static void fcxxwt(ScheduleRealInfo sch, String remarks, JSONArray jsonArray) { |
| 60 | 60 | ||
| @@ -74,7 +74,7 @@ public class ScheduleModifyLogger { | @@ -74,7 +74,7 @@ public class ScheduleModifyLogger { | ||
| 74 | } | 74 | } |
| 75 | 75 | ||
| 76 | /** | 76 | /** |
| 77 | - * 计划烂班 | 77 | + * Planned destroy shift |
| 78 | * | 78 | * |
| 79 | * @param remarks | 79 | * @param remarks |
| 80 | */ | 80 | */ |
| @@ -91,7 +91,7 @@ public class ScheduleModifyLogger { | @@ -91,7 +91,7 @@ public class ScheduleModifyLogger { | ||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | /** | 93 | /** |
| 94 | - * 实发调整 | 94 | + * Actual dep-time adjustment |
| 95 | * | 95 | * |
| 96 | * @param sch | 96 | * @param sch |
| 97 | * @param nowSfsj | 97 | * @param nowSfsj |
| @@ -115,7 +115,7 @@ public class ScheduleModifyLogger { | @@ -115,7 +115,7 @@ public class ScheduleModifyLogger { | ||
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | /** | 117 | /** |
| 118 | - * 撤销烂班 | 118 | + * Revoke destroy |
| 119 | * | 119 | * |
| 120 | * @param sch | 120 | * @param sch |
| 121 | */ | 121 | */ |
| @@ -131,7 +131,7 @@ public class ScheduleModifyLogger { | @@ -131,7 +131,7 @@ public class ScheduleModifyLogger { | ||
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | /** | 133 | /** |
| 134 | - * 撤销执行 | 134 | + * Revoke executed |
| 135 | * | 135 | * |
| 136 | * @param sch | 136 | * @param sch |
| 137 | */ | 137 | */ |
| @@ -156,7 +156,7 @@ public class ScheduleModifyLogger { | @@ -156,7 +156,7 @@ public class ScheduleModifyLogger { | ||
| 156 | } | 156 | } |
| 157 | 157 | ||
| 158 | /** | 158 | /** |
| 159 | - * 撤销实发 | 159 | + * Revoke actual dep-time |
| 160 | * | 160 | * |
| 161 | * @param sch | 161 | * @param sch |
| 162 | */ | 162 | */ |
| @@ -177,7 +177,7 @@ public class ScheduleModifyLogger { | @@ -177,7 +177,7 @@ public class ScheduleModifyLogger { | ||
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | /** | 179 | /** |
| 180 | - * 调整人车 | 180 | + * Adjustment staff or vehicle |
| 181 | * | 181 | * |
| 182 | * @param sch | 182 | * @param sch |
| 183 | * @param cpc | 183 | * @param cpc |
src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
| @@ -12,7 +12,7 @@ import java.util.LinkedList; | @@ -12,7 +12,7 @@ import java.util.LinkedList; | ||
| 12 | import java.util.List; | 12 | import java.util.List; |
| 13 | 13 | ||
| 14 | /** | 14 | /** |
| 15 | - * 班次修正日志入库 | 15 | + * Shift correction report入库 |
| 16 | * Created by panzhao on 2017/5/19. | 16 | * Created by panzhao on 2017/5/19. |
| 17 | */ | 17 | */ |
| 18 | @Component | 18 | @Component |
src/main/java/com/bsth/data/schedule/edit_logs/loggers/FcxxwtLogger.java
| @@ -8,7 +8,7 @@ import org.slf4j.Logger; | @@ -8,7 +8,7 @@ import org.slf4j.Logger; | ||
| 8 | import org.slf4j.LoggerFactory; | 8 | import org.slf4j.LoggerFactory; |
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | - * 发车信息微调记录 | 11 | + * Departure time fine-tune记录 |
| 12 | * Created by panzhao on 2017/5/19. | 12 | * Created by panzhao on 2017/5/19. |
| 13 | */ | 13 | */ |
| 14 | public class FcxxwtLogger { | 14 | public class FcxxwtLogger { |
src/main/java/com/bsth/data/schedule/external/TccExternalService.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
| @@ -59,7 +59,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | @@ -59,7 +59,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | ||
| 59 | 59 | ||
| 60 | //班次压入 | 60 | //班次压入 |
| 61 | if (!lateSchMap.containsKey(sch.getId())) { | 61 | if (!lateSchMap.containsKey(sch.getId())) { |
| 62 | - logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整!"); | 62 | + logger.info("29【应发未到 班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入Late adjustment!"); |
| 63 | 63 | ||
| 64 | sch.setLate2(true); | 64 | sch.setLate2(true); |
| 65 | lateSchMap.put(sch.getId(), sch); | 65 | lateSchMap.put(sch.getId(), sch); |
| @@ -92,7 +92,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | @@ -92,7 +92,7 @@ public class LateAdjustHandle implements ApplicationContextAware { | ||
| 92 | sch.setLateMinute(0); | 92 | sch.setLateMinute(0); |
| 93 | sch.setDfAuto(false); | 93 | sch.setDfAuto(false); |
| 94 | 94 | ||
| 95 | - logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId()); | 95 | + logger.info("移除Late adjustment -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId()); |
| 96 | } | 96 | } |
| 97 | } catch (Exception e) { | 97 | } catch (Exception e) { |
| 98 | logger.error("", e); | 98 | logger.error("", e); |
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
| @@ -63,7 +63,7 @@ public class ScheduleLateThread extends Thread{ | @@ -63,7 +63,7 @@ public class ScheduleLateThread extends Thread{ | ||
| 63 | ScheduleRealInfo prev = dayOfSchedule.prev(sch); | 63 | ScheduleRealInfo prev = dayOfSchedule.prev(sch); |
| 64 | //上一个班次也没有实际终点到达时间 | 64 | //上一个班次也没有实际终点到达时间 |
| 65 | if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){ | 65 | if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){ |
| 66 | - //进入误点调整程序 | 66 | + //进入Late adjustment程序 |
| 67 | LateAdjustHandle.putLate(sch); | 67 | LateAdjustHandle.putLate(sch); |
| 68 | } | 68 | } |
| 69 | } | 69 | } |
src/main/java/com/bsth/data/schedule/thread/CalcOilThread.java
| @@ -65,11 +65,11 @@ public class CalcOilThread extends Thread{ | @@ -65,11 +65,11 @@ public class CalcOilThread extends Thread{ | ||
| 65 | logger.error("计算路单里程失败",e); | 65 | logger.error("计算路单里程失败",e); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | - logger.info("开始保存统计日报...."); | 68 | + logger.info("开始保存Statistical daily report...."); |
| 69 | try{ | 69 | try{ |
| 70 | calcWaybillService.calcDaily("", ""); | 70 | calcWaybillService.calcDaily("", ""); |
| 71 | }catch(Exception e){ | 71 | }catch(Exception e){ |
| 72 | - logger.error("统计日报失败",e); | 72 | + logger.error("Statistical daily report失败",e); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | logger.info("开始获取营收人次...."); | 75 | logger.info("开始获取营收人次...."); |
src/main/java/com/bsth/data/schedule/thread/SubmitToTrafficManage.java
| @@ -50,10 +50,10 @@ public class SubmitToTrafficManage extends Thread{ | @@ -50,10 +50,10 @@ public class SubmitToTrafficManage extends Thread{ | ||
| 50 | logger.error("提交车辆里程、油耗到运管处失败", e); | 50 | logger.error("提交车辆里程、油耗到运管处失败", e); |
| 51 | } | 51 | } |
| 52 | try { | 52 | try { |
| 53 | - //线路调度日报 | 53 | + //Dispatch daily report |
| 54 | trafficManageService.setDDRB(); | 54 | trafficManageService.setDDRB(); |
| 55 | } catch (Exception e) { | 55 | } catch (Exception e) { |
| 56 | - logger.error("提交线路调度日报到运管处失败", e); | 56 | + logger.error("提交Dispatch daily report到运管处失败", e); |
| 57 | } | 57 | } |
| 58 | try { | 58 | try { |
| 59 | //线路计划班次表 | 59 | //线路计划班次表 |
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
| @@ -94,7 +94,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | @@ -94,7 +94,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | ||
| 94 | 94 | ||
| 95 | //输出excel | 95 | //输出excel |
| 96 | String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); | 96 | String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); |
| 97 | - String filePath = basePath + "/static/pages/summary/excel/烂班明细情况.xls"; | 97 | + String filePath = basePath + "/static/pages/summary/excel/Details of bad shifts.xls"; |
| 98 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath)); | 98 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath)); |
| 99 | HSSFWorkbook wb = new HSSFWorkbook(fs); | 99 | HSSFWorkbook wb = new HSSFWorkbook(fs); |
| 100 | 100 | ||
| @@ -121,7 +121,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | @@ -121,7 +121,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl<DestroySituatio | ||
| 121 | String name = "";//list.get(0).getLineName(); | 121 | String name = "";//list.get(0).getLineName(); |
| 122 | wb.setSheetName(0, name + "烂班明细"); | 122 | wb.setSheetName(0, name + "烂班明细"); |
| 123 | //response 输出 | 123 | //response 输出 |
| 124 | - String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "烂班明细情况.xls"; | 124 | + String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "Details of bad shifts.xls"; |
| 125 | response.setContentType("application/x-msdownload"); | 125 | response.setContentType("application/x-msdownload"); |
| 126 | response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); | 126 | response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); |
| 127 | 127 |
src/main/java/com/bsth/data/summary/service/impl/TempSchSituationServiceImpl.java
| @@ -84,7 +84,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituatio | @@ -84,7 +84,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituatio | ||
| 84 | 84 | ||
| 85 | //输出excel | 85 | //输出excel |
| 86 | String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); | 86 | String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath(); |
| 87 | - String filePath = basePath + "/static/pages/summary/excel/临加明细情况.xls"; | 87 | + String filePath = basePath + "/static/pages/summary/excel/Details of temporary additions.xls"; |
| 88 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath)); | 88 | POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath)); |
| 89 | HSSFWorkbook wb = new HSSFWorkbook(fs); | 89 | HSSFWorkbook wb = new HSSFWorkbook(fs); |
| 90 | 90 | ||
| @@ -110,7 +110,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituatio | @@ -110,7 +110,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituatio | ||
| 110 | String name = "";//list.get(0).getLineName(); | 110 | String name = "";//list.get(0).getLineName(); |
| 111 | wb.setSheetName(0, name + "临加明细"); | 111 | wb.setSheetName(0, name + "临加明细"); |
| 112 | //response 输出 | 112 | //response 输出 |
| 113 | - String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "临加明细情况.xls"; | 113 | + String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "Details of temporary additions.xls"; |
| 114 | response.setContentType("application/x-msdownload"); | 114 | response.setContentType("application/x-msdownload"); |
| 115 | response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); | 115 | response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); |
| 116 | 116 |
src/main/java/com/bsth/entity/directive/D80.java
| @@ -119,7 +119,7 @@ public class D80 { | @@ -119,7 +119,7 @@ public class D80 { | ||
| 119 | private Short operCode2; | 119 | private Short operCode2; |
| 120 | 120 | ||
| 121 | /** | 121 | /** |
| 122 | - * 请求代码 0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 | 122 | + * Request code 0xa1 恢复运营 0xa2 申请调档 0xa3 出场请求 0xa5 进场请求 0xa7 加油请求 0x50 车辆故障 0x70 |
| 123 | * 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 | 123 | * 路阻报告 0x60 事故报告 0x11 扣证纠纷 0x12 报警 |
| 124 | */ | 124 | */ |
| 125 | private Short requestCode; | 125 | private Short requestCode; |
src/main/java/com/bsth/entity/excep/Abnormal.java
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
| @@ -99,7 +99,7 @@ public class ArrivalInfo { | @@ -99,7 +99,7 @@ public class ArrivalInfo { | ||
| 99 | try { | 99 | try { |
| 100 | SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm"); | 100 | SimpleDateFormat sdfHHmm = new SimpleDateFormat("HH:mm"); |
| 101 | return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+", "+sdfHHmm.format(new Date(this.ts)) | 101 | return "["+BasicData.deviceId2NbbmMap.get(this.deviceId)+", "+sdfHHmm.format(new Date(this.ts)) |
| 102 | - +","+(this.getUpDown()==0?"上行":"下行")+","+(this.inOut==0?"进":"出")+","+this.stopNo+" ("+this.stopName+")]"; | 102 | + +","+(this.getUpDown()==0?"Up":"Down")+","+(this.inOut==0?"进":"出")+","+this.stopNo+" ("+this.stopName+")]"; |
| 103 | } catch (Exception e) { | 103 | } catch (Exception e) { |
| 104 | return ""; | 104 | return ""; |
| 105 | } | 105 | } |
src/main/java/com/bsth/entity/excep/Offline.java
src/main/java/com/bsth/entity/excep/Outbound.java
src/main/java/com/bsth/entity/excep/Speeding.java
src/main/java/com/bsth/entity/mcy_forms/Waybillday.java
src/main/java/com/bsth/entity/realcontrol/SvgAttribute.java
| @@ -5,7 +5,7 @@ import javax.persistence.Id; | @@ -5,7 +5,7 @@ import javax.persistence.Id; | ||
| 5 | import javax.persistence.Table; | 5 | import javax.persistence.Table; |
| 6 | 6 | ||
| 7 | /** | 7 | /** |
| 8 | - * 主页SVG模拟图属性设置 | 8 | + * 主页SVGSimulated diagram属性设置 |
| 9 | * Created by panzhao on 2017/1/6. | 9 | * Created by panzhao on 2017/1/6. |
| 10 | */ | 10 | */ |
| 11 | @Entity | 11 | @Entity |
src/main/java/com/bsth/service/SectionSpeedService.java
| @@ -10,10 +10,10 @@ import com.bsth.entity.SectionSpeed; | @@ -10,10 +10,10 @@ import com.bsth.entity.SectionSpeed; | ||
| 10 | */ | 10 | */ |
| 11 | public interface SectionSpeedService extends BaseService<SectionSpeed, Integer> { | 11 | public interface SectionSpeedService extends BaseService<SectionSpeed, Integer> { |
| 12 | 12 | ||
| 13 | - /** @description TODO(新增路段限速) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (路段限速信息)*/ | 13 | + /** @description TODO(新增路段限速) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (Road speed limit info)*/ |
| 14 | Map<String, Object> add(Map<String, Object> map); | 14 | Map<String, Object> add(Map<String, Object> map); |
| 15 | 15 | ||
| 16 | - /** @description TODO(修改路段) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (路段限速信息)*/ | 16 | + /** @description TODO(修改路段) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (Road speed limit info)*/ |
| 17 | Map<String, Object> roadUpd(Map<String, Object> map); | 17 | Map<String, Object> roadUpd(Map<String, Object> map); |
| 18 | 18 | ||
| 19 | List<Map<String, Object>> getSectionSpeedInfo(Map<String, Object> map); | 19 | List<Map<String, Object>> getSectionSpeedInfo(Map<String, Object> map); |
src/main/java/com/bsth/service/calc/CalcIntervalService.java
| @@ -17,7 +17,7 @@ public interface CalcIntervalService extends BaseService<CalcInterval,Integer> { | @@ -17,7 +17,7 @@ public interface CalcIntervalService extends BaseService<CalcInterval,Integer> { | ||
| 17 | List<Map<String,Object>> interval(Map<String, Object> map); | 17 | List<Map<String,Object>> interval(Map<String, Object> map); |
| 18 | //根据预统计表查询 | 18 | //根据预统计表查询 |
| 19 | List<Map<String,Object>> intervalDetail(Map<String, Object> map); | 19 | List<Map<String,Object>> intervalDetail(Map<String, Object> map); |
| 20 | - //导出全部天数大间隔详细 | 20 | + //export全部天数大间隔详细 |
| 21 | List<Map<String,Object>> exportDetail(Map<String, Object> map); | 21 | List<Map<String,Object>> exportDetail(Map<String, Object> map); |
| 22 | //大间隔统计表(大间隔发生次数统计表) | 22 | //大间隔统计表(大间隔发生次数统计表) |
| 23 | List<Map<String,Object>> sumInterval(Map<String, Object> map); | 23 | List<Map<String,Object>> sumInterval(Map<String, Object> map); |
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
| @@ -89,7 +89,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -89,7 +89,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 89 | // TODO: handle exception | 89 | // TODO: handle exception |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | - //D级线路显示发车准点率 | 92 | + //D级线路显示Shift punctuality |
| 93 | if(level.equals("D") && false){ //新的计算规则D级也显示大间隔 | 93 | if(level.equals("D") && false){ //新的计算规则D级也显示大间隔 |
| 94 | String sql1=" select xl_bm,gsbm,fgsbm,xl_name from bsth_c_calc_interval where date >='"+sDate+"' and date <= '"+eDate+"' and `level`='D'"; | 94 | String sql1=" select xl_bm,gsbm,fgsbm,xl_name from bsth_c_calc_interval where date >='"+sDate+"' and date <= '"+eDate+"' and `level`='D'"; |
| 95 | if(line.equals("")){ | 95 | if(line.equals("")){ |
| @@ -128,7 +128,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -128,7 +128,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 128 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); | 128 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); |
| 129 | m.put("xlBm", rs.getString("xl")); | 129 | m.put("xlBm", rs.getString("xl")); |
| 130 | m.put("line", rs.getString("xl_name")); | 130 | m.put("line", rs.getString("xl_name")); |
| 131 | - m.put("xlName", rs.getString("xl_name"));//与另一个导出通用 | 131 | + m.put("xlName", rs.getString("xl_name"));//与另一个export通用 |
| 132 | m.put("id", rs.getInt("id")); | 132 | m.put("id", rs.getInt("id")); |
| 133 | m.put("bcs", rs.getString("jhszfcs")); | 133 | m.put("bcs", rs.getString("jhszfcs")); |
| 134 | m.put("zdbcs", rs.getString("sjszfczds")); | 134 | m.put("zdbcs", rs.getString("sjszfczds")); |
| @@ -566,7 +566,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -566,7 +566,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 566 | if(sub_time >25) | 566 | if(sub_time >25) |
| 567 | isAdd=true; | 567 | isAdd=true; |
| 568 | }else { | 568 | }else { |
| 569 | - //D类不计算大间隔时间,通过发车准点率 | 569 | + //D类不计算大间隔时间,通过Shift punctuality |
| 570 | } | 570 | } |
| 571 | }else if("wgf".equals(type) && type.equals(p_type)){ | 571 | }else if("wgf".equals(type) && type.equals(p_type)){ |
| 572 | if(level.equals("A")){ | 572 | if(level.equals("A")){ |
| @@ -579,7 +579,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -579,7 +579,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 579 | if(sub_time >25) | 579 | if(sub_time >25) |
| 580 | isAdd=true; | 580 | isAdd=true; |
| 581 | }else { | 581 | }else { |
| 582 | - //D类不计算大间隔时间,通过发车准点率 | 582 | + //D类不计算大间隔时间,通过Shift punctuality |
| 583 | } | 583 | } |
| 584 | } | 584 | } |
| 585 | }else{ | 585 | }else{ |
| @@ -594,7 +594,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -594,7 +594,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 594 | if(sub_time >40) | 594 | if(sub_time >40) |
| 595 | isAdd=true; | 595 | isAdd=true; |
| 596 | }else { | 596 | }else { |
| 597 | - //D类不计算大间隔时间,通过发车准点率 | 597 | + //D类不计算大间隔时间,通过Shift punctuality |
| 598 | max_time=0; | 598 | max_time=0; |
| 599 | } | 599 | } |
| 600 | } | 600 | } |
| @@ -665,7 +665,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -665,7 +665,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 665 | if(sub_time >25) | 665 | if(sub_time >25) |
| 666 | isAdd=true; | 666 | isAdd=true; |
| 667 | }else { | 667 | }else { |
| 668 | - //D类不计算大间隔时间,通过发车准点率 | 668 | + //D类不计算大间隔时间,通过Shift punctuality |
| 669 | } | 669 | } |
| 670 | }else if("wgf".equals(type) && type.equals(p_type)){ | 670 | }else if("wgf".equals(type) && type.equals(p_type)){ |
| 671 | if(level.equals("A")){ | 671 | if(level.equals("A")){ |
| @@ -678,7 +678,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -678,7 +678,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 678 | if(sub_time >25) | 678 | if(sub_time >25) |
| 679 | isAdd=true; | 679 | isAdd=true; |
| 680 | }else { | 680 | }else { |
| 681 | - //D类不计算大间隔时间,通过发车准点率 | 681 | + //D类不计算大间隔时间,通过Shift punctuality |
| 682 | } | 682 | } |
| 683 | } | 683 | } |
| 684 | }else{ | 684 | }else{ |
| @@ -693,7 +693,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -693,7 +693,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 693 | if(sub_time >40) | 693 | if(sub_time >40) |
| 694 | isAdd=true; | 694 | isAdd=true; |
| 695 | }else { | 695 | }else { |
| 696 | - //D类不计算大间隔时间,通过发车准点率 | 696 | + //D类不计算大间隔时间,通过Shift punctuality |
| 697 | max_time=0; | 697 | max_time=0; |
| 698 | } | 698 | } |
| 699 | } | 699 | } |
| @@ -1096,7 +1096,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -1096,7 +1096,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 1096 | m.put("sDate", sDate); | 1096 | m.put("sDate", sDate); |
| 1097 | m.put("eDate", eDate); | 1097 | m.put("eDate", eDate); |
| 1098 | xls="calcIntervalSum.xls"; | 1098 | xls="calcIntervalSum.xls"; |
| 1099 | - xlsName="大间隔发生次数汇总.xls"; | 1099 | + xlsName="Summary of large interval occurrences.xls"; |
| 1100 | 1100 | ||
| 1101 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + xls, | 1101 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + xls, |
| 1102 | path + "export/"+dateTime+"-"+lineName+"-"+xlsName); | 1102 | path + "export/"+dateTime+"-"+lineName+"-"+xlsName); |
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
| @@ -145,7 +145,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -145,7 +145,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 145 | m.put("busMileage", calcBusMileage); | 145 | m.put("busMileage", calcBusMileage); |
| 146 | } catch (Exception e) { | 146 | } catch (Exception e) { |
| 147 | // TODO: handle exception | 147 | // TODO: handle exception |
| 148 | - logger.info("date="+d+";line="+line+";路单数据审计保存失败!"); | 148 | + logger.info("date="+d+";line="+line+";Waybill审计保存失败!"); |
| 149 | } | 149 | } |
| 150 | } | 150 | } |
| 151 | 151 | ||
| @@ -457,7 +457,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -457,7 +457,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 457 | listI.add(resList.iterator()); | 457 | listI.add(resList.iterator()); |
| 458 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 458 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 459 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", | 459 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", |
| 460 | - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); | 460 | + path + "export/" + dateTime + "-" + xlName + "-Statistical daily report.xls"); |
| 461 | } catch (Exception e) { | 461 | } catch (Exception e) { |
| 462 | // TODO: handle exception | 462 | // TODO: handle exception |
| 463 | //e.printStackTrace(); | 463 | //e.printStackTrace(); |
| @@ -883,7 +883,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -883,7 +883,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 883 | listI.add(mapList.iterator()); | 883 | listI.add(mapList.iterator()); |
| 884 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 884 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 885 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", | 885 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", |
| 886 | - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); | 886 | + path + "export/" + dateTime + "-" + xlName + "-Statistical daily report.xls"); |
| 887 | } catch (Exception e) { | 887 | } catch (Exception e) { |
| 888 | // TODO: handle exception | 888 | // TODO: handle exception |
| 889 | //e.printStackTrace(); | 889 | //e.printStackTrace(); |
| @@ -946,7 +946,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -946,7 +946,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 946 | listI.add(mapList.iterator()); | 946 | listI.add(mapList.iterator()); |
| 947 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 947 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 948 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", | 948 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", |
| 949 | - path + "export/" + dateTime + "-全部公司-统计日报.xls"); | 949 | + path + "export/" + dateTime + "-all companies-Statistical daily report.xls"); |
| 950 | } catch (Exception e) { | 950 | } catch (Exception e) { |
| 951 | // TODO: handle exception | 951 | // TODO: handle exception |
| 952 | //e.printStackTrace(); | 952 | //e.printStackTrace(); |
| @@ -1266,7 +1266,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -1266,7 +1266,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 1266 | listI.add(mapListHj.iterator()); | 1266 | listI.add(mapListHj.iterator()); |
| 1267 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1267 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1268 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", | 1268 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", |
| 1269 | - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); | 1269 | + path + "export/" + dateTime + "-" + xlName + "-Statistical daily report.xls"); |
| 1270 | } catch (Exception e) { | 1270 | } catch (Exception e) { |
| 1271 | // TODO: handle exception | 1271 | // TODO: handle exception |
| 1272 | //e.printStackTrace(); | 1272 | //e.printStackTrace(); |
| @@ -1690,7 +1690,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -1690,7 +1690,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 1690 | listI.add(lMap.iterator()); | 1690 | listI.add(lMap.iterator()); |
| 1691 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1691 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1692 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, | 1692 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, |
| 1693 | - path + "export/"+dateTime+"-"+xlName+"-线路公里统计表.xls"); | 1693 | + path + "export/"+dateTime+"-"+xlName+"-Line mileage statistics.xls"); |
| 1694 | } catch (Exception e) { | 1694 | } catch (Exception e) { |
| 1695 | // TODO: handle exception | 1695 | // TODO: handle exception |
| 1696 | e.printStackTrace(); | 1696 | e.printStackTrace(); |
| @@ -1856,7 +1856,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -1856,7 +1856,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 1856 | listI.add(lMap.iterator()); | 1856 | listI.add(lMap.iterator()); |
| 1857 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1857 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1858 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, | 1858 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, |
| 1859 | - path + "export/"+dateTime+"-"+xlName+"-路单数据统计表.xls"); | 1859 | + path + "export/"+dateTime+"-"+xlName+"-Waybill statistics.xls"); |
| 1860 | } catch (Exception e) { | 1860 | } catch (Exception e) { |
| 1861 | // TODO: handle exception | 1861 | // TODO: handle exception |
| 1862 | e.printStackTrace(); | 1862 | e.printStackTrace(); |
| @@ -2289,12 +2289,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -2289,12 +2289,12 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 2289 | List<String> list1 = new ArrayList<>(); | 2289 | List<String> list1 = new ArrayList<>(); |
| 2290 | list1.add("序号"); | 2290 | list1.add("序号"); |
| 2291 | list1.add("所属公司"); | 2291 | list1.add("所属公司"); |
| 2292 | - list1.add("线路"); | 2292 | + list1.add("Line"); |
| 2293 | if(flag==1 ||flag==2 ){ | 2293 | if(flag==1 ||flag==2 ){ |
| 2294 | list1.add("工号"); | 2294 | list1.add("工号"); |
| 2295 | list1.add("姓名"); | 2295 | list1.add("姓名"); |
| 2296 | } else if(flag==3){ | 2296 | } else if(flag==3){ |
| 2297 | - list1.add("自编号"); | 2297 | + list1.add("Internal code"); |
| 2298 | list1.add("车牌号"); | 2298 | list1.add("车牌号"); |
| 2299 | list1.add("燃油类型"); | 2299 | list1.add("燃油类型"); |
| 2300 | } | 2300 | } |
src/main/java/com/bsth/service/directive/DirectiveService.java
| @@ -63,7 +63,7 @@ public interface DirectiveService extends BaseService<D60, Integer>{ | @@ -63,7 +63,7 @@ public interface DirectiveService extends BaseService<D60, Integer>{ | ||
| 63 | * @Title: upDownChange | 63 | * @Title: upDownChange |
| 64 | * @Description: TODO(切换上下行) | 64 | * @Description: TODO(切换上下行) |
| 65 | * @param @param nbbm 车辆内部编码 | 65 | * @param @param nbbm 车辆内部编码 |
| 66 | - * @param @param upDonw 上下行 0 上行 1 下行 | 66 | + * @param @param upDonw 上下行 0 Up 1 下行 |
| 67 | * @throws | 67 | * @throws |
| 68 | */ | 68 | */ |
| 69 | //int upDownChange(String nbbm, Integer upDown, String sender); | 69 | //int upDownChange(String nbbm, Integer upDown, String sender); |
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
| @@ -209,7 +209,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | @@ -209,7 +209,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl<D60, Integer> implemen | ||
| 209 | public int send60Operation(String nbbm, int state, int upDown, String sender) { | 209 | public int send60Operation(String nbbm, int state, int upDown, String sender) { |
| 210 | logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown); | 210 | logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown); |
| 211 | 211 | ||
| 212 | - String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运"); | 212 | + String text = "切换为 " + (upDown == 0 ? "Up" : "Down") + (state == 0 ? "营运" : "未营运"); |
| 213 | D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null); | 213 | D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null); |
| 214 | 214 | ||
| 215 | if (null == d60) | 215 | if (null == d60) |
src/main/java/com/bsth/service/excep/impl/NowOfflineServiceImpl.java
| @@ -397,9 +397,9 @@ public class NowOfflineServiceImpl implements NowOfflineService { | @@ -397,9 +397,9 @@ public class NowOfflineServiceImpl implements NowOfflineService { | ||
| 397 | while(rs.next()){ | 397 | while(rs.next()){ |
| 398 | Map<String, Object> newMap=new HashMap<String,Object>(); | 398 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 399 | if(rs.getObject("xAxis").toString().equals("0")) | 399 | if(rs.getObject("xAxis").toString().equals("0")) |
| 400 | - newMap.put("xAxis", "上行"); | 400 | + newMap.put("xAxis", "Up"); |
| 401 | else if(rs.getObject("xAxis").toString().equals("1")) | 401 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 402 | - newMap.put("xAxis", "下行"); | 402 | + newMap.put("xAxis", "Down"); |
| 403 | else | 403 | else |
| 404 | newMap.put("xAxis", "无效"); | 404 | newMap.put("xAxis", "无效"); |
| 405 | 405 |
src/main/java/com/bsth/service/excep/impl/NowOutboundServiceImpl.java
| @@ -301,9 +301,9 @@ public class NowOutboundServiceImpl implements NowOutboundService{ | @@ -301,9 +301,9 @@ public class NowOutboundServiceImpl implements NowOutboundService{ | ||
| 301 | while(rs.next()){ | 301 | while(rs.next()){ |
| 302 | Map<String, Object> newMap=new HashMap<String,Object>(); | 302 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 303 | if(rs.getObject("xAxis").toString().equals("0")) | 303 | if(rs.getObject("xAxis").toString().equals("0")) |
| 304 | - newMap.put("xAxis", "上行"); | 304 | + newMap.put("xAxis", "Up"); |
| 305 | else if(rs.getObject("xAxis").toString().equals("1")) | 305 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 306 | - newMap.put("xAxis", "下行"); | 306 | + newMap.put("xAxis", "Down"); |
| 307 | else | 307 | else |
| 308 | newMap.put("xAxis", "无效"); | 308 | newMap.put("xAxis", "无效"); |
| 309 | 309 |
src/main/java/com/bsth/service/excep/impl/NowSpeedingServiceImpl.java
| @@ -276,9 +276,9 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { | @@ -276,9 +276,9 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { | ||
| 276 | while(rs.next()){ | 276 | while(rs.next()){ |
| 277 | Map<String, Object> newMap=new HashMap<String,Object>(); | 277 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 278 | if(rs.getObject("xAxis").toString().equals("0")) | 278 | if(rs.getObject("xAxis").toString().equals("0")) |
| 279 | - newMap.put("xAxis", "上行"); | 279 | + newMap.put("xAxis", "Up"); |
| 280 | else if(rs.getObject("xAxis").toString().equals("1")) | 280 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 281 | - newMap.put("xAxis", "下行"); | 281 | + newMap.put("xAxis", "Down"); |
| 282 | else | 282 | else |
| 283 | newMap.put("xAxis", "无效"); | 283 | newMap.put("xAxis", "无效"); |
| 284 | 284 |
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
| @@ -399,9 +399,9 @@ public class OfflineServiceImpl implements OfflineService { | @@ -399,9 +399,9 @@ public class OfflineServiceImpl implements OfflineService { | ||
| 399 | while(rs.next()){ | 399 | while(rs.next()){ |
| 400 | Map<String, Object> newMap=new HashMap<String,Object>(); | 400 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 401 | if(rs.getObject("xAxis").toString().equals("0")) | 401 | if(rs.getObject("xAxis").toString().equals("0")) |
| 402 | - newMap.put("xAxis", "上行"); | 402 | + newMap.put("xAxis", "Up"); |
| 403 | else if(rs.getObject("xAxis").toString().equals("1")) | 403 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 404 | - newMap.put("xAxis", "下行"); | 404 | + newMap.put("xAxis", "Down"); |
| 405 | else | 405 | else |
| 406 | newMap.put("xAxis", "无效"); | 406 | newMap.put("xAxis", "无效"); |
| 407 | 407 |
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
| @@ -290,9 +290,9 @@ public class OutboundServiceImpl implements OutboundService{ | @@ -290,9 +290,9 @@ public class OutboundServiceImpl implements OutboundService{ | ||
| 290 | while(rs.next()){ | 290 | while(rs.next()){ |
| 291 | Map<String, Object> newMap=new HashMap<String,Object>(); | 291 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 292 | if(rs.getObject("xAxis").toString().equals("0")) | 292 | if(rs.getObject("xAxis").toString().equals("0")) |
| 293 | - newMap.put("xAxis", "上行"); | 293 | + newMap.put("xAxis", "Up"); |
| 294 | else if(rs.getObject("xAxis").toString().equals("1")) | 294 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 295 | - newMap.put("xAxis", "下行"); | 295 | + newMap.put("xAxis", "Down"); |
| 296 | else | 296 | else |
| 297 | newMap.put("xAxis", "无效"); | 297 | newMap.put("xAxis", "无效"); |
| 298 | 298 |
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
| @@ -278,9 +278,9 @@ public class SpeedingServiceImpl implements SpeedingService { | @@ -278,9 +278,9 @@ public class SpeedingServiceImpl implements SpeedingService { | ||
| 278 | while(rs.next()){ | 278 | while(rs.next()){ |
| 279 | Map<String, Object> newMap=new HashMap<String,Object>(); | 279 | Map<String, Object> newMap=new HashMap<String,Object>(); |
| 280 | if(rs.getObject("xAxis").toString().equals("0")) | 280 | if(rs.getObject("xAxis").toString().equals("0")) |
| 281 | - newMap.put("xAxis", "上行"); | 281 | + newMap.put("xAxis", "Up"); |
| 282 | else if(rs.getObject("xAxis").toString().equals("1")) | 282 | else if(rs.getObject("xAxis").toString().equals("1")) |
| 283 | - newMap.put("xAxis", "下行"); | 283 | + newMap.put("xAxis", "Down"); |
| 284 | else | 284 | else |
| 285 | newMap.put("xAxis", "无效"); | 285 | newMap.put("xAxis", "无效"); |
| 286 | 286 |
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
| @@ -3154,7 +3154,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | @@ -3154,7 +3154,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | ||
| 3154 | listI.add(list.iterator()); | 3154 | listI.add(list.iterator()); |
| 3155 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3155 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3156 | ee.excelReplace(listI, new Object[]{m}, path + "mould/timeAnaly.xls", | 3156 | ee.excelReplace(listI, new Object[]{m}, path + "mould/timeAnaly.xls", |
| 3157 | - path + "export/" + date + "-" + BasicData.lineCodeAllNameMap.get(line) + "-线路时刻表分析明细.xls"); | 3157 | + path + "export/" + date + "-" + BasicData.lineCodeAllNameMap.get(line) + "-Line timetable analysis details.xls"); |
| 3158 | } catch (Exception e) { | 3158 | } catch (Exception e) { |
| 3159 | // TODO: handle exception | 3159 | // TODO: handle exception |
| 3160 | e.printStackTrace(); | 3160 | e.printStackTrace(); |
| @@ -3185,19 +3185,19 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | @@ -3185,19 +3185,19 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | ||
| 3185 | } else if("26".equals(sp[0])){ | 3185 | } else if("26".equals(sp[0])){ |
| 3186 | gs = "南汇公司"; | 3186 | gs = "南汇公司"; |
| 3187 | } else if("all".equals(sp[0])){ | 3187 | } else if("all".equals(sp[0])){ |
| 3188 | - gs = "共和县公交合计"; | 3188 | + gs = "公交合计"; |
| 3189 | num = "0"; | 3189 | num = "0"; |
| 3190 | } | 3190 | } |
| 3191 | if("1".equals(sp[1])){ | 3191 | if("1".equals(sp[1])){ |
| 3192 | - type = "营运线路"; | 3192 | + type = "Service line"; |
| 3193 | } else if("0".equals(sp[1])){ | 3193 | } else if("0".equals(sp[1])){ |
| 3194 | - type = "非营运线路"; | 3194 | + type = "Internal line"; |
| 3195 | } else if("all".equals(sp[1])){ | 3195 | } else if("all".equals(sp[1])){ |
| 3196 | type = "全部线路"; | 3196 | type = "全部线路"; |
| 3197 | } | 3197 | } |
| 3198 | if(sp.length > 2){ | 3198 | if(sp.length > 2){ |
| 3199 | if("1".equals(sp[2])){ | 3199 | if("1".equals(sp[2])){ |
| 3200 | - item = "营运线路"; | 3200 | + item = "Service line"; |
| 3201 | } else if("0".equals(sp[2])){ | 3201 | } else if("0".equals(sp[2])){ |
| 3202 | item = "机场线路"; | 3202 | item = "机场线路"; |
| 3203 | } else if("all".equals(sp[2])){ | 3203 | } else if("all".equals(sp[2])){ |
| @@ -3242,7 +3242,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | @@ -3242,7 +3242,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen | ||
| 3242 | } else if("26".equals(sp[0])){ | 3242 | } else if("26".equals(sp[0])){ |
| 3243 | gs = "南汇公司"; | 3243 | gs = "南汇公司"; |
| 3244 | } else if("all".equals(sp[0])){ | 3244 | } else if("all".equals(sp[0])){ |
| 3245 | - gs = "共和县公交合计"; | 3245 | + gs = "公交合计"; |
| 3246 | num = "0"; | 3246 | num = "0"; |
| 3247 | } | 3247 | } |
| 3248 | if("1".equals(sp[1])){ | 3248 | if("1".equals(sp[1])){ |
| @@ -3294,9 +3294,9 @@ public String[] createBudgetMap_sum2(List<Map<String, Object>> list, Map<String, | @@ -3294,9 +3294,9 @@ public String[] createBudgetMap_sum2(List<Map<String, Object>> list, Map<String, | ||
| 3294 | num = "0"; | 3294 | num = "0"; |
| 3295 | } | 3295 | } |
| 3296 | if("1".equals(sp[1])){ | 3296 | if("1".equals(sp[1])){ |
| 3297 | - type = "营运线路"; | 3297 | + type = "Service line"; |
| 3298 | } else if("2".equals(sp[1])){ | 3298 | } else if("2".equals(sp[1])){ |
| 3299 | - type = "非营运线路"; | 3299 | + type = "Internal line"; |
| 3300 | } else if("0".equals(sp[1])){ | 3300 | } else if("0".equals(sp[1])){ |
| 3301 | type = "小计"; | 3301 | type = "小计"; |
| 3302 | } | 3302 | } |
src/main/java/com/bsth/service/forms/impl/ExportServiceImpl.java
| @@ -22,7 +22,7 @@ import com.bsth.util.ReportUtils; | @@ -22,7 +22,7 @@ import com.bsth.util.ReportUtils; | ||
| 22 | public class ExportServiceImpl implements ExportService{ | 22 | public class ExportServiceImpl implements ExportService{ |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | - //行车路单日报表 | 25 | + //Waybill daily report |
| 26 | @Override | 26 | @Override |
| 27 | public void waybillday(String date, String lineName, List<Waybillday> list) { | 27 | public void waybillday(String date, String lineName, List<Waybillday> list) { |
| 28 | 28 | ||
| @@ -51,13 +51,13 @@ public class ExportServiceImpl implements ExportService{ | @@ -51,13 +51,13 @@ public class ExportServiceImpl implements ExportService{ | ||
| 51 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 51 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 52 | ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls", | 52 | ee.excelReplace(listI, new Object[] { map }, path+"mould/waybillday.xls", |
| 53 | path+"export/"+sdfSimple.format(sdfMonth.parse(date)) | 53 | path+"export/"+sdfSimple.format(sdfMonth.parse(date)) |
| 54 | - +"-"+lineName+"-行车路单日报表.xls"); | 54 | + +"-"+lineName+"-Waybill daily report.xls"); |
| 55 | } catch (Exception e) { | 55 | } catch (Exception e) { |
| 56 | e.printStackTrace(); | 56 | e.printStackTrace(); |
| 57 | } | 57 | } |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | - //线路客流量报表 | 60 | + //Line passenger flow report |
| 61 | @Override | 61 | @Override |
| 62 | public void linepasswengerflow(String date, List<Linepasswengerflow> list) { | 62 | public void linepasswengerflow(String date, List<Linepasswengerflow> list) { |
| 63 | 63 | ||
| @@ -77,7 +77,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -77,7 +77,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 77 | listI.add(resList.iterator()); | 77 | listI.add(resList.iterator()); |
| 78 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 78 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 79 | ee.excelReplace(listI, new Object[] { map }, path+"mould/linepasswengerflow.xls", | 79 | ee.excelReplace(listI, new Object[] { map }, path+"mould/linepasswengerflow.xls", |
| 80 | - path+"export/线路客流量报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); | 80 | + path+"export/Line passenger flow report" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); |
| 81 | } catch (Exception e) { | 81 | } catch (Exception e) { |
| 82 | e.printStackTrace(); | 82 | e.printStackTrace(); |
| 83 | } | 83 | } |
| @@ -85,7 +85,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -85,7 +85,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 85 | } | 85 | } |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | - //班次车辆人员日统计 | 88 | + //Shift vehicle personnel daily statistics |
| 89 | @Override | 89 | @Override |
| 90 | public void shifday(String date,List<Shifday> list) { | 90 | public void shifday(String date,List<Shifday> list) { |
| 91 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 91 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -120,7 +120,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -120,7 +120,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 120 | listI.add(resList.iterator()); | 120 | listI.add(resList.iterator()); |
| 121 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 121 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 122 | ee.excelReplace(listI, new Object[] { map }, path+"mould/shifday.xls", | 122 | ee.excelReplace(listI, new Object[] { map }, path+"mould/shifday.xls", |
| 123 | - path+"export/班次车辆人员日报表" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); | 123 | + path+"export/Shift vehicle personnel daily statistics" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); |
| 124 | } catch (Exception e) { | 124 | } catch (Exception e) { |
| 125 | e.printStackTrace(); | 125 | e.printStackTrace(); |
| 126 | } | 126 | } |
| @@ -156,7 +156,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -156,7 +156,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 156 | listI.add(resList.iterator()); | 156 | listI.add(resList.iterator()); |
| 157 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 157 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 158 | ee.excelReplace(listI, new Object[] { map }, path+"mould/shiftuehiclemanth.xls", | 158 | ee.excelReplace(listI, new Object[] { map }, path+"mould/shiftuehiclemanth.xls", |
| 159 | - path+"export/班次车辆人员月报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls"); | 159 | + path+"export/Shift vehicle personnel monthly statistics" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls"); |
| 160 | } catch (Exception e) { | 160 | } catch (Exception e) { |
| 161 | e.printStackTrace(); | 161 | e.printStackTrace(); |
| 162 | } | 162 | } |
| @@ -205,7 +205,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -205,7 +205,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | 207 | ||
| 208 | - //车辆加注 | 208 | + //Vehicle refueling |
| 209 | @Override | 209 | @Override |
| 210 | public void vehicleloading(String date, List<Vehicleloading> list) { | 210 | public void vehicleloading(String date, List<Vehicleloading> list) { |
| 211 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 211 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -235,13 +235,13 @@ public class ExportServiceImpl implements ExportService{ | @@ -235,13 +235,13 @@ public class ExportServiceImpl implements ExportService{ | ||
| 235 | listI.add(resList.iterator()); | 235 | listI.add(resList.iterator()); |
| 236 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 236 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 237 | ee.excelReplace(listI, new Object[] { map }, path+"mould/vehicleloading.xls", | 237 | ee.excelReplace(listI, new Object[] { map }, path+"mould/vehicleloading.xls", |
| 238 | - path+"export/车辆加注" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); | 238 | + path+"export/Vehicle refueling" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); |
| 239 | } catch (Exception e) { | 239 | } catch (Exception e) { |
| 240 | e.printStackTrace(); | 240 | e.printStackTrace(); |
| 241 | } | 241 | } |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | - //运营服务阶段报表 | 244 | + //Operation service stage report |
| 245 | @Override | 245 | @Override |
| 246 | public void operationservice(String startDate,String endDate,String lpName,List<Operationservice> list) { | 246 | public void operationservice(String startDate,String endDate,String lpName,List<Operationservice> list) { |
| 247 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), | 247 | SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), |
| @@ -266,7 +266,7 @@ public class ExportServiceImpl implements ExportService{ | @@ -266,7 +266,7 @@ public class ExportServiceImpl implements ExportService{ | ||
| 266 | listI.add(resList.iterator()); | 266 | listI.add(resList.iterator()); |
| 267 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 267 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 268 | ee.excelReplace(listI, new Object[] { map }, path+"mould/operationservice.xls", | 268 | ee.excelReplace(listI, new Object[] { map }, path+"mould/operationservice.xls", |
| 269 | - path+"export/运营服务阶段报表" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls"); | 269 | + path+"export/Operation service stage report" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls"); |
| 270 | } catch (Exception e) { | 270 | } catch (Exception e) { |
| 271 | e.printStackTrace(); | 271 | e.printStackTrace(); |
| 272 | } | 272 | } |
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| @@ -82,7 +82,7 @@ public class FormsServiceImpl implements FormsService { | @@ -82,7 +82,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 82 | LineRepository lineRepository; | 82 | LineRepository lineRepository; |
| 83 | 83 | ||
| 84 | 84 | ||
| 85 | - // 行车路单日报表 | 85 | + // Waybill daily report |
| 86 | @Override | 86 | @Override |
| 87 | public List<Waybillday> waybillday(Map<String, Object> map) { | 87 | public List<Waybillday> waybillday(Map<String, Object> map) { |
| 88 | String line=map.get("line").toString(); | 88 | String line=map.get("line").toString(); |
| @@ -207,7 +207,7 @@ public class FormsServiceImpl implements FormsService { | @@ -207,7 +207,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 207 | return list; | 207 | return list; |
| 208 | } | 208 | } |
| 209 | 209 | ||
| 210 | - // 线路客流量报表 | 210 | + // Line passenger flow report |
| 211 | @Override | 211 | @Override |
| 212 | public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) { | 212 | public List<Linepasswengerflow> linepasswengerflow(Map<String, Object> map) { |
| 213 | String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" | 213 | String sql = " SELECT r.schedule_date,s.station_name,l.name,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name" |
| @@ -609,7 +609,7 @@ public class FormsServiceImpl implements FormsService { | @@ -609,7 +609,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 609 | return list; | 609 | return list; |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | - // 班次车辆人员日统计 | 612 | + // Shift vehicle personnel daily statistics |
| 613 | @Override | 613 | @Override |
| 614 | public List<Shifday> shifday(Map<String, Object> map) { | 614 | public List<Shifday> shifday(Map<String, Object> map) { |
| 615 | 615 | ||
| @@ -768,7 +768,7 @@ public class FormsServiceImpl implements FormsService { | @@ -768,7 +768,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 768 | return list; | 768 | return list; |
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | - // 换人换车情况日统计 | 771 | + // Daily report on personnel and vehicle replacement |
| 772 | String rq; | 772 | String rq; |
| 773 | 773 | ||
| 774 | @Override | 774 | @Override |
| @@ -872,7 +872,7 @@ public class FormsServiceImpl implements FormsService { | @@ -872,7 +872,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 872 | } | 872 | } |
| 873 | 873 | ||
| 874 | 874 | ||
| 875 | - // 路单数据 | 875 | + // Waybill |
| 876 | @Override | 876 | @Override |
| 877 | public List<Singledata> singledatatj(Map<String, Object> map) { | 877 | public List<Singledata> singledatatj(Map<String, Object> map) { |
| 878 | String sfyy=""; | 878 | String sfyy=""; |
| @@ -1461,7 +1461,7 @@ public class FormsServiceImpl implements FormsService { | @@ -1461,7 +1461,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 1461 | return list_; | 1461 | return list_; |
| 1462 | } | 1462 | } |
| 1463 | 1463 | ||
| 1464 | - /*// 路单数据 | 1464 | + /*// Waybill |
| 1465 | @Override | 1465 | @Override |
| 1466 | public List<Singledata> singledatatj(Map<String, Object> map) { | 1466 | public List<Singledata> singledatatj(Map<String, Object> map) { |
| 1467 | 1467 | ||
| @@ -1737,7 +1737,7 @@ public class FormsServiceImpl implements FormsService { | @@ -1737,7 +1737,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 1737 | 1737 | ||
| 1738 | }*/ | 1738 | }*/ |
| 1739 | 1739 | ||
| 1740 | - // 路单数据 | 1740 | + // Waybill |
| 1741 | @Override | 1741 | @Override |
| 1742 | public List<Singledata> singledatanew(Map<String, Object> map) { | 1742 | public List<Singledata> singledatanew(Map<String, Object> map) { |
| 1743 | 1743 | ||
| @@ -1873,7 +1873,7 @@ public class FormsServiceImpl implements FormsService { | @@ -1873,7 +1873,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 1873 | } | 1873 | } |
| 1874 | 1874 | ||
| 1875 | 1875 | ||
| 1876 | - // 路单数据 | 1876 | + // Waybill |
| 1877 | @Override | 1877 | @Override |
| 1878 | public List<Singledata> singledata(Map<String, Object> map) { | 1878 | public List<Singledata> singledata(Map<String, Object> map) { |
| 1879 | 1879 | ||
| @@ -2163,7 +2163,7 @@ public class FormsServiceImpl implements FormsService { | @@ -2163,7 +2163,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 2163 | } | 2163 | } |
| 2164 | 2164 | ||
| 2165 | 2165 | ||
| 2166 | - // 路单数据 | 2166 | + // Waybill |
| 2167 | @Override | 2167 | @Override |
| 2168 | public List<Singledata> singledata2(Map<String, Object> map) { | 2168 | public List<Singledata> singledata2(Map<String, Object> map) { |
| 2169 | 2169 | ||
| @@ -2452,7 +2452,7 @@ public class FormsServiceImpl implements FormsService { | @@ -2452,7 +2452,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 2452 | return list; | 2452 | return list; |
| 2453 | } | 2453 | } |
| 2454 | 2454 | ||
| 2455 | - // 运营服务阶段报表 | 2455 | + // Operation service stage report |
| 2456 | @Override | 2456 | @Override |
| 2457 | public List<Operationservice> operationservice(Map<String, Object> map) { | 2457 | public List<Operationservice> operationservice(Map<String, Object> map) { |
| 2458 | 2458 | ||
| @@ -2643,7 +2643,7 @@ public class FormsServiceImpl implements FormsService { | @@ -2643,7 +2643,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 2643 | } | 2643 | } |
| 2644 | 2644 | ||
| 2645 | 2645 | ||
| 2646 | - // 车辆加注 | 2646 | + // Vehicle refueling |
| 2647 | @Override | 2647 | @Override |
| 2648 | public List<Vehicleloading> vehicleloading(String line, String date) { | 2648 | public List<Vehicleloading> vehicleloading(String line, String date) { |
| 2649 | 2649 | ||
| @@ -2732,7 +2732,7 @@ public class FormsServiceImpl implements FormsService { | @@ -2732,7 +2732,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 2732 | return list; | 2732 | return list; |
| 2733 | } | 2733 | } |
| 2734 | 2734 | ||
| 2735 | - // 营运线路出车率统计表 | 2735 | + // Operating line vehicle rate statistics table |
| 2736 | @Override | 2736 | @Override |
| 2737 | public List<Map<String, Object>> turnoutrate(Map<String, Object> map) { | 2737 | public List<Map<String, Object>> turnoutrate(Map<String, Object> map) { |
| 2738 | 2738 |
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
| @@ -1514,7 +1514,7 @@ public class GpsServiceImpl implements GpsService { | @@ -1514,7 +1514,7 @@ public class GpsServiceImpl implements GpsService { | ||
| 1514 | 1514 | ||
| 1515 | sch = dayOfSchedule.executeCurr(nbbm); | 1515 | sch = dayOfSchedule.executeCurr(nbbm); |
| 1516 | if(null != sch){ | 1516 | if(null != sch){ |
| 1517 | - execStr = (sch.getXlDir().equals("0")?"上行":"下行") + "("+sch.getDfsj()+")"; | 1517 | + execStr = (sch.getXlDir().equals("0")?"Up":"Down") + "("+sch.getDfsj()+")"; |
| 1518 | if(!sch.getXlBm().equals(lineCode)) | 1518 | if(!sch.getXlBm().equals(lineCode)) |
| 1519 | execStr = sch.getXlName()+execStr; | 1519 | execStr = sch.getXlName()+execStr; |
| 1520 | else | 1520 | else |
src/main/java/com/bsth/service/gps/entity/GpsOutbound.java
src/main/java/com/bsth/service/gps/entity/GpsOutbound_DTO.java
| @@ -7,7 +7,7 @@ import com.bsth.data.BasicData; | @@ -7,7 +7,7 @@ import com.bsth.data.BasicData; | ||
| 7 | import java.util.*; | 7 | import java.util.*; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | - * 越界异常 dto | 10 | + * Out-boundary abnormal dto |
| 11 | * Created by panzhao on 2017/4/7. | 11 | * Created by panzhao on 2017/4/7. |
| 12 | */ | 12 | */ |
| 13 | public class GpsOutbound_DTO { | 13 | public class GpsOutbound_DTO { |
src/main/java/com/bsth/service/gps/entity/GpsSpeed.java
| @@ -3,7 +3,7 @@ package com.bsth.service.gps.entity; | @@ -3,7 +3,7 @@ package com.bsth.service.gps.entity; | ||
| 3 | import javax.persistence.Transient; | 3 | import javax.persistence.Transient; |
| 4 | 4 | ||
| 5 | /** | 5 | /** |
| 6 | - * 超速异常 -ms数据库格式 | 6 | + * Speeding abnormal -ms数据库格式 |
| 7 | * Created by panzhao on 2017/4/7. | 7 | * Created by panzhao on 2017/4/7. |
| 8 | */ | 8 | */ |
| 9 | public class GpsSpeed { | 9 | public class GpsSpeed { |
src/main/java/com/bsth/service/gps/entity/GpsSpeed_DTO.java
| @@ -7,7 +7,7 @@ import com.bsth.data.BasicData; | @@ -7,7 +7,7 @@ import com.bsth.data.BasicData; | ||
| 7 | import java.util.*; | 7 | import java.util.*; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | - * 超速异常 dto | 10 | + * Speeding abnormal dto |
| 11 | * Created by panzhao on 2017/4/7. | 11 | * Created by panzhao on 2017/4/7. |
| 12 | */ | 12 | */ |
| 13 | public class GpsSpeed_DTO { | 13 | public class GpsSpeed_DTO { |
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
| @@ -753,7 +753,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -753,7 +753,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 753 | listI.add(resList.iterator()); | 753 | listI.add(resList.iterator()); |
| 754 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 754 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 755 | ee.excelReplace(listI, new Object[] { m }, path+"mould/busInterval"+statu+".xls", | 755 | ee.excelReplace(listI, new Object[] { m }, path+"mould/busInterval"+statu+".xls", |
| 756 | - path+"export/" + dateTime + "-" + lineName + "-班次间隔统计表.xls"); | 756 | + path+"export/" + dateTime + "-" + lineName + "-Shift interval statistics table.xls"); |
| 757 | } catch (Exception e) { | 757 | } catch (Exception e) { |
| 758 | // TODO: handle exception | 758 | // TODO: handle exception |
| 759 | e.printStackTrace(); | 759 | e.printStackTrace(); |
| @@ -1567,7 +1567,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -1567,7 +1567,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 1567 | listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator()); | 1567 | listI.add(((List<Map<String, Object>>)modelMap.get("dataList")).iterator()); |
| 1568 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 1568 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 1569 | ee.excelReplace(listI, new Object[] { modelMap }, path+"mould/timeAndSpeed.xls", | 1569 | ee.excelReplace(listI, new Object[] { modelMap }, path+"mould/timeAndSpeed.xls", |
| 1570 | - path+"export/" + dateTime + "-" + lineName + "-行驶时间及车速统计表.xls"); | 1570 | + path+"export/" + dateTime + "-" + lineName + "-Driving time and speed statistics table.xls"); |
| 1571 | } catch (Exception e) { | 1571 | } catch (Exception e) { |
| 1572 | // TODO: handle exception | 1572 | // TODO: handle exception |
| 1573 | e.printStackTrace(); | 1573 | e.printStackTrace(); |
| @@ -2226,7 +2226,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -2226,7 +2226,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 2226 | ee.excelReplace(listI, new Object[] { m }, path+"mould/lbStatuAnaly.xls", | 2226 | ee.excelReplace(listI, new Object[] { m }, path+"mould/lbStatuAnaly.xls", |
| 2227 | path+"export/" + sdfSimple.format(sdfMonth.parse(startDate)) | 2227 | path+"export/" + sdfSimple.format(sdfMonth.parse(startDate)) |
| 2228 | + "-" + sdfSimple.format(sdfMonth.parse(endDate)) | 2228 | + "-" + sdfSimple.format(sdfMonth.parse(endDate)) |
| 2229 | - + "-" + lineName + "-烂班情况分析表.xls"); | 2229 | + + "-" + lineName + "-Bad shift situation analysis table.xls"); |
| 2230 | } catch (Exception e) { | 2230 | } catch (Exception e) { |
| 2231 | // TODO: handle exception | 2231 | // TODO: handle exception |
| 2232 | e.printStackTrace(); | 2232 | e.printStackTrace(); |
| @@ -2389,7 +2389,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -2389,7 +2389,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 2389 | sjbc++; | 2389 | sjbc++; |
| 2390 | if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){ | 2390 | if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){ |
| 2391 | flag = true; | 2391 | flag = true; |
| 2392 | - schedule.setRemarks("待发调整"); | 2392 | + schedule.setRemarks("Departure time adjustment"); |
| 2393 | if(schedule.isDfAuto()) | 2393 | if(schedule.isDfAuto()) |
| 2394 | zddf++; | 2394 | zddf++; |
| 2395 | else | 2395 | else |
| @@ -2586,7 +2586,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -2586,7 +2586,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 2586 | File file = null; | 2586 | File file = null; |
| 2587 | try { | 2587 | try { |
| 2588 | while (true) { | 2588 | while (true) { |
| 2589 | - String fileUrl = path + sdfSimple.format(sdfMonth.parse(date))+"-"+lineName+"-行车路单"; | 2589 | + String fileUrl = path + sdfSimple.format(sdfMonth.parse(date))+"-"+lineName+"-Waybill"; |
| 2590 | // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹 | 2590 | // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹 |
| 2591 | file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件 | 2591 | file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件 |
| 2592 | if (file.exists()) { //判断是否已存在重名 | 2592 | if (file.exists()) { //判断是否已存在重名 |
| @@ -2970,12 +2970,12 @@ public class BusIntervalServiceImpl implements BusIntervalService { | @@ -2970,12 +2970,12 @@ public class BusIntervalServiceImpl implements BusIntervalService { | ||
| 2970 | } | 2970 | } |
| 2971 | Map.put("sheetName", jName + "-" + clZbh + "-" + lpName); | 2971 | Map.put("sheetName", jName + "-" + clZbh + "-" + lpName); |
| 2972 | ee.excelReplace(list1, new Object[]{Map}, path1 + "mould/"+xls, | 2972 | ee.excelReplace(list1, new Object[]{Map}, path1 + "mould/"+xls, |
| 2973 | - path1 + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); | 2973 | + path1 + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-Waybill.xls"); |
| 2974 | 2974 | ||
| 2975 | 2975 | ||
| 2976 | //———————————————————————————————————————————————— | 2976 | //———————————————————————————————————————————————— |
| 2977 | 2977 | ||
| 2978 | - File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); | 2978 | + File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-Waybill.xls"); |
| 2979 | String fileName = file.getName(); | 2979 | String fileName = file.getName(); |
| 2980 | files.add(temp); | 2980 | files.add(temp); |
| 2981 | } | 2981 | } |
src/main/java/com/bsth/service/impl/SectionSpeedServiceImpl.java
| @@ -37,7 +37,7 @@ public class SectionSpeedServiceImpl extends BaseServiceImpl<SectionSpeed, Integ | @@ -37,7 +37,7 @@ public class SectionSpeedServiceImpl extends BaseServiceImpl<SectionSpeed, Integ | ||
| 37 | private SectionRouteRepository sectionRouteRepository; | 37 | private SectionRouteRepository sectionRouteRepository; |
| 38 | 38 | ||
| 39 | 39 | ||
| 40 | - /** @description TODO(新增路段限速) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (路段限速信息)*/ | 40 | + /** @description TODO(新增路段限速) @return map ({status:SUCCESS}成功 或者 {status:ERROR}失败) @param map (Road speed limit info)*/ |
| 41 | @Override | 41 | @Override |
| 42 | public Map<String, Object> add(Map<String, Object> map) { | 42 | public Map<String, Object> add(Map<String, Object> map) { |
| 43 | 43 |
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
| @@ -162,7 +162,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | @@ -162,7 +162,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | ||
| 162 | Map<String, Object> resultMap = new HashMap<String, Object>(); | 162 | Map<String, Object> resultMap = new HashMap<String, Object>(); |
| 163 | try { | 163 | try { |
| 164 | // List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); | 164 | // List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>(); |
| 165 | - Map<String,Object> resultExcel = new HashMap<String,Object>();//导出参数的对象 | 165 | + Map<String,Object> resultExcel = new HashMap<String,Object>();//export参数的对象 |
| 166 | /* 添加表头*/ | 166 | /* 添加表头*/ |
| 167 | List<String> title = new ArrayList<String>(); | 167 | List<String> title = new ArrayList<String>(); |
| 168 | title.add("线路ID"); | 168 | title.add("线路ID"); |
| @@ -434,8 +434,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | @@ -434,8 +434,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl<StationRoute, Integ | ||
| 434 | } else { | 434 | } else { |
| 435 | if(stationList.size()>0) { | 435 | if(stationList.size()>0) { |
| 436 | Map<String, Object> tempM = new HashMap<String, Object>(); | 436 | Map<String, Object> tempM = new HashMap<String, Object>(); |
| 437 | - tempM.put("name", "添加路段"); | ||
| 438 | - tempM.put("text", "添加路段"); | 437 | + tempM.put("name", "Add section"); |
| 438 | + tempM.put("text", "Add section"); | ||
| 439 | tempM.put("lineId", stationList.get(0)[1]); | 439 | tempM.put("lineId", stationList.get(0)[1]); |
| 440 | tempM.put("lineCode", stationList.get(0)[5]); | 440 | tempM.put("lineCode", stationList.get(0)[5]); |
| 441 | tempM.put("dir", stationList.get(0)[8]); | 441 | tempM.put("dir", stationList.get(0)[8]); |
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
| @@ -698,7 +698,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ | @@ -698,7 +698,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ | ||
| 698 | } | 698 | } |
| 699 | 699 | ||
| 700 | /** | 700 | /** |
| 701 | - * 上传线路调度日报 | 701 | + * 上传Dispatch daily report |
| 702 | * @return | 702 | * @return |
| 703 | */ | 703 | */ |
| 704 | public String setDDRB(){ | 704 | public String setDDRB(){ |
| @@ -1168,7 +1168,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ | @@ -1168,7 +1168,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ | ||
| 1168 | }else{ | 1168 | }else{ |
| 1169 | if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){ | 1169 | if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){ |
| 1170 | Line line = (Line) obj; | 1170 | Line line = (Line) obj; |
| 1171 | - String name = line.getName() + "线路停靠站上传"; | 1171 | + String name = String.format("Line [%s] stations upload", line.getName()); |
| 1172 | skbUploadLogger.setLine(line); | 1172 | skbUploadLogger.setLine(line); |
| 1173 | skbUploadLogger.setName(name); | 1173 | skbUploadLogger.setName(name); |
| 1174 | skbUploadLoggerRepository.save(skbUploadLogger); | 1174 | skbUploadLoggerRepository.save(skbUploadLogger); |
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
| @@ -144,7 +144,7 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | @@ -144,7 +144,7 @@ public class JdlServiceImpl extends BaseServiceImpl<Jdl, Integer> implements Jdl | ||
| 144 | listI.add(list.iterator()); | 144 | listI.add(list.iterator()); |
| 145 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 145 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 146 | ee.excelReplace(listI, new Object[] { m }, path+"mould/export_Jdl.xls", | 146 | ee.excelReplace(listI, new Object[] { m }, path+"mould/export_Jdl.xls", |
| 147 | - path+"export/车辆充电量" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls"); | 147 | + path+"export/Vehicle charging capacity" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls"); |
| 148 | } catch (Exception e) { | 148 | } catch (Exception e) { |
| 149 | // TODO: handle exception | 149 | // TODO: handle exception |
| 150 | e.printStackTrace(); | 150 | e.printStackTrace(); |
src/main/java/com/bsth/service/oil/impl/JqlServiceImpl.java
| @@ -144,7 +144,7 @@ public class JqlServiceImpl extends BaseServiceImpl<Jql, Integer> implements Jql | @@ -144,7 +144,7 @@ public class JqlServiceImpl extends BaseServiceImpl<Jql, Integer> implements Jql | ||
| 144 | listI.add(list.iterator()); | 144 | listI.add(list.iterator()); |
| 145 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 145 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 146 | ee.excelReplace(listI, new Object[] { m }, path+"mould/export_Jql.xls", | 146 | ee.excelReplace(listI, new Object[] { m }, path+"mould/export_Jql.xls", |
| 147 | - path+"export/车辆加氢量" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls"); | 147 | + path+"export/Vehicle hydrogen filling quantity" + sdfSimple.format(sdfMonth.parse(rq)) + ".xls"); |
| 148 | } catch (Exception e) { | 148 | } catch (Exception e) { |
| 149 | // TODO: handle exception | 149 | // TODO: handle exception |
| 150 | e.printStackTrace(); | 150 | e.printStackTrace(); |
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
| @@ -1074,7 +1074,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | @@ -1074,7 +1074,7 @@ public class YlbServiceImpl extends BaseServiceImpl<Ylb,Integer> implements YlbS | ||
| 1074 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 1074 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 1075 | ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls", | 1075 | ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls", |
| 1076 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) | 1076 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 1077 | - + "-" + lineName + "-月存油报表.xls"); | 1077 | + + "-" + lineName + "-Monthly fuel reserve report.xls"); |
| 1078 | } catch (Exception e) { | 1078 | } catch (Exception e) { |
| 1079 | // TODO: handle exception | 1079 | // TODO: handle exception |
| 1080 | e.printStackTrace(); | 1080 | e.printStackTrace(); |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -1284,7 +1284,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1284,7 +1284,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1284 | 1284 | ||
| 1285 | list.add(listMap.iterator()); | 1285 | list.add(listMap.iterator()); |
| 1286 | ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/" + xls, | 1286 | ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/" + xls, |
| 1287 | - path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); | 1287 | + path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-Waybill.xls"); |
| 1288 | return scheduleRealInfos; | 1288 | return scheduleRealInfos; |
| 1289 | } | 1289 | } |
| 1290 | 1290 | ||
| @@ -1442,7 +1442,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1442,7 +1442,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1442 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1442 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1443 | ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls", | 1443 | ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls", |
| 1444 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) | 1444 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 1445 | - + "-" + lineName + "-调度历史消息.xls"); | 1445 | + + "-" + lineName + "-Dispatch message.xls"); |
| 1446 | } catch (Exception e) { | 1446 | } catch (Exception e) { |
| 1447 | // TODO: handle exception | 1447 | // TODO: handle exception |
| 1448 | e.printStackTrace(); | 1448 | e.printStackTrace(); |
| @@ -1471,7 +1471,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1471,7 +1471,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1471 | listI.add(newList.iterator()); | 1471 | listI.add(newList.iterator()); |
| 1472 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1472 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1473 | ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls", | 1473 | ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls", |
| 1474 | - path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); | 1474 | + path + "export/Dispatch message analysis" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); |
| 1475 | } catch (Exception e) { | 1475 | } catch (Exception e) { |
| 1476 | // TODO: handle exception | 1476 | // TODO: handle exception |
| 1477 | e.printStackTrace(); | 1477 | e.printStackTrace(); |
| @@ -1773,8 +1773,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -1773,8 +1773,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 1773 | LateAdjustHandle.remove(sch); | 1773 | LateAdjustHandle.remove(sch); |
| 1774 | //} | 1774 | //} |
| 1775 | } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)) { | 1775 | } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)) { |
| 1776 | - fLog.log("撤销实发时间", sch.getFcsjActual(), ""); | ||
| 1777 | - //撤销实发 | 1776 | + fLog.log("Revoke actual dep-time", sch.getFcsjActual(), ""); |
| 1777 | + //Revoke actual dep-time | ||
| 1778 | revokeRealOutgo(sch.getId()); | 1778 | revokeRealOutgo(sch.getId()); |
| 1779 | } | 1779 | } |
| 1780 | 1780 | ||
| @@ -2302,7 +2302,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2302,7 +2302,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2302 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 2302 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 2303 | ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls", | 2303 | ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls", |
| 2304 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) | 2304 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 2305 | - + "-" + xlName + "-驾驶员请求台账.xls"); | 2305 | + + "-" + xlName + "-Driver request ledger.xls"); |
| 2306 | } catch (Exception e) { | 2306 | } catch (Exception e) { |
| 2307 | // TODO: handle exception | 2307 | // TODO: handle exception |
| 2308 | e.printStackTrace(); | 2308 | e.printStackTrace(); |
| @@ -2316,17 +2316,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2316,17 +2316,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2316 | public List<SchEditInfoDto> correctForm(String line, String date, String endDate, | 2316 | public List<SchEditInfoDto> correctForm(String line, String date, String endDate, |
| 2317 | String lpName, String code, String type, String changType) { | 2317 | String lpName, String code, String type, String changType) { |
| 2318 | 2318 | ||
| 2319 | -// var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班', | ||
| 2320 | -// 'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'}; | 2319 | +// var types = {'DFTZ': 'Departure time adjustment', 'FCXXWT':'Departure time fine-tune', 'JHLB': 'Planned destroy shift', 'CXLB': 'Revoke destroy', |
| 2320 | +// 'CXZX': 'Revoke executed', 'CXSF': 'Revoke actual dep-time', 'SFTZ': 'Actual dep-time adjustment', 'TZRC': 'Adjustment staff or vehicle'}; | ||
| 2321 | Map<String, Object> map = new HashMap<String, Object>(); | 2321 | Map<String, Object> map = new HashMap<String, Object>(); |
| 2322 | - map.put("DFTZ", "待发调整"); | ||
| 2323 | - map.put("FCXXWT", "发车信息微调"); | ||
| 2324 | - map.put("JHLB", "计划烂班"); | ||
| 2325 | - map.put("CXLB", "撤销烂班"); | ||
| 2326 | - map.put("CXZX", "撤销执行"); | ||
| 2327 | - map.put("CXSF", "撤销实发"); | ||
| 2328 | - map.put("SFTZ", "实发调整"); | ||
| 2329 | - map.put("TZRC", "调整人车"); | 2322 | + map.put("DFTZ", "Departure time adjustment"); |
| 2323 | + map.put("FCXXWT", "Departure time fine-tune"); | ||
| 2324 | + map.put("JHLB", "Planned destroy shift"); | ||
| 2325 | + map.put("CXLB", "Revoke destroy"); | ||
| 2326 | + map.put("CXZX", "Revoke executed"); | ||
| 2327 | + map.put("CXSF", "Revoke actual dep-time"); | ||
| 2328 | + map.put("SFTZ", "Actual dep-time adjustment"); | ||
| 2329 | + map.put("TZRC", "Adjustment staff or vehicle"); | ||
| 2330 | 2330 | ||
| 2331 | SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm"); | 2331 | SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm"); |
| 2332 | SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); | 2332 | SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |
| @@ -2439,7 +2439,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -2439,7 +2439,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 2439 | listI.add(tempList.iterator()); | 2439 | listI.add(tempList.iterator()); |
| 2440 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 2440 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 2441 | ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls", | 2441 | ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls", |
| 2442 | - path + "export/" + dateTime + "-" + lineName + "-修正报表.xls"); | 2442 | + path + "export/" + dateTime + "-" + lineName + "-Revision report.xls"); |
| 2443 | } catch (Exception e) { | 2443 | } catch (Exception e) { |
| 2444 | // TODO: handle exception | 2444 | // TODO: handle exception |
| 2445 | e.printStackTrace(); | 2445 | e.printStackTrace(); |
| @@ -3206,7 +3206,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3206,7 +3206,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3206 | listI.add(resList.iterator()); | 3206 | listI.add(resList.iterator()); |
| 3207 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3207 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3208 | ee.excelReplace(listI, new Object[]{m}, path + "mould/dispatchDailySum.xls", | 3208 | ee.excelReplace(listI, new Object[]{m}, path + "mould/dispatchDailySum.xls", |
| 3209 | - path + "export/" + dateTime + "-调度日报汇总表.xls"); | 3209 | + path + "export/" + dateTime + "-Daily dispatch summary.xls"); |
| 3210 | } catch (Exception e) { | 3210 | } catch (Exception e) { |
| 3211 | // TODO: handle exception | 3211 | // TODO: handle exception |
| 3212 | //e.printStackTrace(); | 3212 | //e.printStackTrace(); |
| @@ -3436,7 +3436,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3436,7 +3436,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3436 | listI.add(lMap.iterator()); | 3436 | listI.add(lMap.iterator()); |
| 3437 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3437 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3438 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", | 3438 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", |
| 3439 | - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); | 3439 | + path + "export/" + dateTime + "-" + xlName + "-Statistical daily report.xls"); |
| 3440 | } catch (Exception e) { | 3440 | } catch (Exception e) { |
| 3441 | // TODO: handle exception | 3441 | // TODO: handle exception |
| 3442 | //e.printStackTrace(); | 3442 | //e.printStackTrace(); |
| @@ -3499,7 +3499,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -3499,7 +3499,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 3499 | listI.add(lMap.iterator()); | 3499 | listI.add(lMap.iterator()); |
| 3500 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3500 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3501 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", | 3501 | ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", |
| 3502 | - path + "export/" + dateTime + "-全部公司-统计日报.xls"); | 3502 | + path + "export/" + dateTime + "-all companies-Statistical daily report.xls"); |
| 3503 | } catch (Exception e) { | 3503 | } catch (Exception e) { |
| 3504 | // TODO: handle exception | 3504 | // TODO: handle exception |
| 3505 | //e.printStackTrace(); | 3505 | //e.printStackTrace(); |
| @@ -4392,7 +4392,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4392,7 +4392,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4392 | } | 4392 | } |
| 4393 | 4393 | ||
| 4394 | /** | 4394 | /** |
| 4395 | - * 批量调整人车 | 4395 | + * 批量Adjustment staff or vehicle |
| 4396 | */ | 4396 | */ |
| 4397 | @Override | 4397 | @Override |
| 4398 | public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId) { | 4398 | public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId) { |
| @@ -4532,7 +4532,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4532,7 +4532,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4532 | } | 4532 | } |
| 4533 | 4533 | ||
| 4534 | /** | 4534 | /** |
| 4535 | - * 批量待发调整 | 4535 | + * 批量Departure time adjustment |
| 4536 | */ | 4536 | */ |
| 4537 | @Override | 4537 | @Override |
| 4538 | public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) { | 4538 | public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) { |
| @@ -4703,12 +4703,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4703,12 +4703,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4703 | oldSch.destroy(); | 4703 | oldSch.destroy(); |
| 4704 | aflog.log("烂班"); | 4704 | aflog.log("烂班"); |
| 4705 | } else if (dest1 && !dest2) { | 4705 | } else if (dest1 && !dest2) { |
| 4706 | - //撤销烂班 | 4706 | + //Revoke destroy |
| 4707 | oldSch.setJhlc(oldSch.getJhlcOrig()); | 4707 | oldSch.setJhlc(oldSch.getJhlcOrig()); |
| 4708 | oldSch.setStatus(0); | 4708 | oldSch.setStatus(0); |
| 4709 | oldSch.calcStatus(); | 4709 | oldSch.calcStatus(); |
| 4710 | oldSch.setAdjustExps(null); | 4710 | oldSch.setAdjustExps(null); |
| 4711 | - aflog.log("撤销烂班"); | 4711 | + aflog.log("Revoke destroy"); |
| 4712 | } | 4712 | } |
| 4713 | 4713 | ||
| 4714 | oldSch.setAdjustExps(sch.getAdjustExps()); | 4714 | oldSch.setAdjustExps(sch.getAdjustExps()); |
| @@ -5030,7 +5030,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -5030,7 +5030,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 5030 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 5030 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 5031 | list.add(listMap.iterator()); | 5031 | list.add(listMap.iterator()); |
| 5032 | ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_qingpu.xls", | 5032 | ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_qingpu.xls", |
| 5033 | - path + "export/" + date + "-" + clZbh + "-行车路单.xls"); | 5033 | + path + "export/" + date + "-" + clZbh + "-Waybill.xls"); |
| 5034 | 5034 | ||
| 5035 | return scheduleRealInfos; | 5035 | return scheduleRealInfos; |
| 5036 | } | 5036 | } |
| @@ -5819,7 +5819,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -5819,7 +5819,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 5819 | sourcePath =path + "mould/scheduleDaily_df.xls"; | 5819 | sourcePath =path + "mould/scheduleDaily_df.xls"; |
| 5820 | } | 5820 | } |
| 5821 | ee.excelReplace(listI, new Object[]{nMap}, sourcePath, | 5821 | ee.excelReplace(listI, new Object[]{nMap}, sourcePath, |
| 5822 | - path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + lineName + "调度日报.xls"); | 5822 | + path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + lineName + "Dispatch daily report.xls"); |
| 5823 | } catch (Exception e) { | 5823 | } catch (Exception e) { |
| 5824 | // TODO: handle exception | 5824 | // TODO: handle exception |
| 5825 | e.printStackTrace(); | 5825 | e.printStackTrace(); |
| @@ -6022,7 +6022,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -6022,7 +6022,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 6022 | } | 6022 | } |
| 6023 | map.put("sheetName", jName + "-" + clZbh + "-" + lpName); | 6023 | map.put("sheetName", jName + "-" + clZbh + "-" + lpName); |
| 6024 | ee.excelReplace(list, new Object[]{map}, path + "mould/" + xls, | 6024 | ee.excelReplace(list, new Object[]{map}, path + "mould/" + xls, |
| 6025 | - path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); | 6025 | + path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-Waybill.xls"); |
| 6026 | } | 6026 | } |
| 6027 | 6027 | ||
| 6028 | @Override | 6028 | @Override |
| @@ -6038,7 +6038,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -6038,7 +6038,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 6038 | File file = null; | 6038 | File file = null; |
| 6039 | try { | 6039 | try { |
| 6040 | while (true) { | 6040 | while (true) { |
| 6041 | - String fileUrl = path + "行车路单" + sdfSimple.format(sdfMonth.parse(date)); | 6041 | + String fileUrl = path + "Waybill" + sdfSimple.format(sdfMonth.parse(date)); |
| 6042 | // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹 | 6042 | // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹 |
| 6043 | file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件 | 6043 | file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件 |
| 6044 | if (file.exists()) { //判断是否已存在重名 | 6044 | if (file.exists()) { //判断是否已存在重名 |
| @@ -6063,7 +6063,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -6063,7 +6063,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 6063 | } | 6063 | } |
| 6064 | } | 6064 | } |
| 6065 | this.exportWaybill_pl(newList, date, jName, clZbh, lpName); | 6065 | this.exportWaybill_pl(newList, date, jName, clZbh, lpName); |
| 6066 | - File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); | 6066 | + File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-Waybill.xls"); |
| 6067 | String fileName = file.getName(); | 6067 | String fileName = file.getName(); |
| 6068 | files.add(temp); | 6068 | files.add(temp); |
| 6069 | } | 6069 | } |
| @@ -6754,7 +6754,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -6754,7 +6754,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 6754 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 6754 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 6755 | ee.excelReplace(listI, new Object[]{m}, path + "mould/repairReport.xls", | 6755 | ee.excelReplace(listI, new Object[]{m}, path + "mould/repairReport.xls", |
| 6756 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) | 6756 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 6757 | - + "-" + lineName + "-维修上报记录.xls"); | 6757 | + + "-" + lineName + "-Repair report.xls"); |
| 6758 | } catch (Exception e) { | 6758 | } catch (Exception e) { |
| 6759 | // TODO: handle exception | 6759 | // TODO: handle exception |
| 6760 | e.printStackTrace(); | 6760 | e.printStackTrace(); |
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
| @@ -307,7 +307,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | @@ -307,7 +307,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | ||
| 307 | listI.add(listmap.iterator()); | 307 | listI.add(listmap.iterator()); |
| 308 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 308 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 309 | ee.excelReplace(listI, new Object[]{m}, path + "mould/calcSheetList.xls", | 309 | ee.excelReplace(listI, new Object[]{m}, path + "mould/calcSheetList.xls", |
| 310 | - path + "export/" + dateTime + "-全部公司-发车到站准点率.xls"); | 310 | + path + "export/" + dateTime + "-all companies-发车到站准点率.xls"); |
| 311 | } catch (Exception e) { | 311 | } catch (Exception e) { |
| 312 | // TODO: handle exception | 312 | // TODO: handle exception |
| 313 | //e.printStackTrace(); | 313 | //e.printStackTrace(); |
| @@ -478,7 +478,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | @@ -478,7 +478,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | ||
| 478 | m.put("date", date); | 478 | m.put("date", date); |
| 479 | String fileName=""; | 479 | String fileName=""; |
| 480 | if(dir.equals("1")){ | 480 | if(dir.equals("1")){ |
| 481 | - fileName="发车准点率"+date; | 481 | + fileName="Shift punctuality"+date; |
| 482 | }else{ | 482 | }else{ |
| 483 | fileName="到站准点率"+date; | 483 | fileName="到站准点率"+date; |
| 484 | } | 484 | } |
| @@ -1129,7 +1129,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | @@ -1129,7 +1129,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | ||
| 1129 | listI.add(list.iterator()); | 1129 | listI.add(list.iterator()); |
| 1130 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1130 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1131 | ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/" | 1131 | ee.excelReplace(listI, new Object[] { map }, path + "mould/calcTurnoutrateZgf.xls", path + "export/" |
| 1132 | - + dates + "-" + lineName + "-营运线路出车率统计表.xls"); | 1132 | + + dates + "-" + lineName + "-Operating line vehicle rate statistics table.xls"); |
| 1133 | } | 1133 | } |
| 1134 | return list; | 1134 | return list; |
| 1135 | } | 1135 | } |
| @@ -1305,7 +1305,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | @@ -1305,7 +1305,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | ||
| 1305 | listI.add(list.iterator()); | 1305 | listI.add(list.iterator()); |
| 1306 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1306 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1307 | ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/" | 1307 | ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/" |
| 1308 | - + dates + "-" + lineName + "-营运线路出车率统计表.xls"); | 1308 | + + dates + "-" + lineName + "-Operating line vehicle rate statistics table.xls"); |
| 1309 | } | 1309 | } |
| 1310 | 1310 | ||
| 1311 | if (type.equals("exportAll")) { | 1311 | if (type.equals("exportAll")) { |
| @@ -1380,7 +1380,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | @@ -1380,7 +1380,7 @@ public class CalcSheetServiceImpl extends BaseServiceImpl<CalcSheet, Integer> im | ||
| 1380 | listI.add(list.iterator()); | 1380 | listI.add(list.iterator()); |
| 1381 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 1381 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 1382 | ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/" | 1382 | ee.excelReplace(listI, new Object[] { tempMap }, path + "mould/calcTurnoutrate.xls", path + "export/" |
| 1383 | - + dates + "-全部公司-营运线路出车率统计表.xls"); | 1383 | + + dates + "-all companies-Operating line vehicle rate statistics table.xls"); |
| 1384 | } | 1384 | } |
| 1385 | 1385 | ||
| 1386 | list.add(tempMap); | 1386 | list.add(tempMap); |
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
| @@ -379,7 +379,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -379,7 +379,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 379 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 379 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 380 | ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls", | 380 | ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls", |
| 381 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) | 381 | path + "export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 382 | - + "-" + lineName + "-调度消息分析.xls"); | 382 | + + "-" + lineName + "-Dispatch message analysis.xls"); |
| 383 | } catch (Exception e) { | 383 | } catch (Exception e) { |
| 384 | // TODO: handle exception | 384 | // TODO: handle exception |
| 385 | e.printStackTrace(); | 385 | e.printStackTrace(); |
| @@ -2871,7 +2871,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2871,7 +2871,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2871 | listI.add(lMap.iterator()); | 2871 | listI.add(lMap.iterator()); |
| 2872 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 2872 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 2873 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, | 2873 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, |
| 2874 | - path + "export/"+dateTime+"-"+xlName+"-线路公里统计表.xls"); | 2874 | + path + "export/"+dateTime+"-"+xlName+"-Line mileage statistics.xls"); |
| 2875 | } catch (Exception e) { | 2875 | } catch (Exception e) { |
| 2876 | // TODO: handle exception | 2876 | // TODO: handle exception |
| 2877 | e.printStackTrace(); | 2877 | e.printStackTrace(); |
| @@ -2977,7 +2977,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -2977,7 +2977,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 2977 | listI.add(lMap.iterator()); | 2977 | listI.add(lMap.iterator()); |
| 2978 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 2978 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 2979 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, | 2979 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, |
| 2980 | - path + "export/线路公里统计表.xls"); | 2980 | + path + "export/Line mileage statistics.xls"); |
| 2981 | } catch (Exception e) { | 2981 | } catch (Exception e) { |
| 2982 | // TODO: handle exception | 2982 | // TODO: handle exception |
| 2983 | e.printStackTrace(); | 2983 | e.printStackTrace(); |
| @@ -3358,7 +3358,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -3358,7 +3358,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3358 | listI.add(lMap.iterator()); | 3358 | listI.add(lMap.iterator()); |
| 3359 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3359 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3360 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, | 3360 | ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, |
| 3361 | - path + "export/"+dateTime+"-"+xlName+"-路单数据统计表.xls"); | 3361 | + path + "export/"+dateTime+"-"+xlName+"-Waybill statistics.xls"); |
| 3362 | } catch (Exception e) { | 3362 | } catch (Exception e) { |
| 3363 | // TODO: handle exception | 3363 | // TODO: handle exception |
| 3364 | e.printStackTrace(); | 3364 | e.printStackTrace(); |
| @@ -3631,7 +3631,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -3631,7 +3631,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 3631 | listI.add(lMap.iterator()); | 3631 | listI.add(lMap.iterator()); |
| 3632 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 3632 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 3633 | ee.excelReplace(listI, new Object[]{m}, path + "mould/countInterval.xls", | 3633 | ee.excelReplace(listI, new Object[]{m}, path + "mould/countInterval.xls", |
| 3634 | - path + "export/大间隔统计表.xls"); | 3634 | + path + "export/Large interval statistics.xls"); |
| 3635 | } catch (Exception e) { | 3635 | } catch (Exception e) { |
| 3636 | // TODO: handle exception | 3636 | // TODO: handle exception |
| 3637 | e.printStackTrace(); | 3637 | e.printStackTrace(); |
| @@ -4487,7 +4487,7 @@ public class ReportServiceImpl implements ReportService{ | @@ -4487,7 +4487,7 @@ public class ReportServiceImpl implements ReportService{ | ||
| 4487 | m.put("linename", arg0.getString("linename")); | 4487 | m.put("linename", arg0.getString("linename")); |
| 4488 | m.put("jname", arg0.getString("jname")); | 4488 | m.put("jname", arg0.getString("jname")); |
| 4489 | m.put("zlc", arg0.getDouble("zlc")); | 4489 | m.put("zlc", arg0.getDouble("zlc")); |
| 4490 | - //电量统计中添加默认中 燃油类型,尿素,保证导出模板相同 | 4490 | + //电量统计中添加默认中 燃油类型,尿素,保证export模板相同 |
| 4491 | m.put("rylx", ""); | 4491 | m.put("rylx", ""); |
| 4492 | m.put("ns", "0"); | 4492 | m.put("ns", "0"); |
| 4493 | if(arg0.getDouble("zlc")==0){ | 4493 | if(arg0.getDouble("zlc")==0){ |
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
| @@ -164,7 +164,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | @@ -164,7 +164,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | ||
| 164 | String[] minSjs = minfcsj.split(":"); | 164 | String[] minSjs = minfcsj.split(":"); |
| 165 | //车辆最早发车时间 用了过滤超第二天0点的数据 | 165 | //车辆最早发车时间 用了过滤超第二天0点的数据 |
| 166 | Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]); | 166 | Long minSj=Long.parseLong(minSjs[0])*60+Long.parseLong(minSjs[1]); |
| 167 | - //0 上行 1下行 | 167 | + //0 Up 1下行 |
| 168 | List<ScheduleRealInfo> listJhsj0=new ArrayList<ScheduleRealInfo>(); | 168 | List<ScheduleRealInfo> listJhsj0=new ArrayList<ScheduleRealInfo>(); |
| 169 | 169 | ||
| 170 | List<ScheduleRealInfo> listJhsj1=new ArrayList<ScheduleRealInfo>(); | 170 | List<ScheduleRealInfo> listJhsj1=new ArrayList<ScheduleRealInfo>(); |
| @@ -633,7 +633,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | @@ -633,7 +633,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | ||
| 633 | listI.add(listmap.iterator()); | 633 | listI.add(listmap.iterator()); |
| 634 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 634 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 635 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList.xls", | 635 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList.xls", |
| 636 | - path + "export/"+dateTime+"-"+lineName+"-发车准点率.xls"); | 636 | + path + "export/"+dateTime+"-"+lineName+"-Shift punctuality.xls"); |
| 637 | } catch (Exception e) { | 637 | } catch (Exception e) { |
| 638 | // TODO: handle exception | 638 | // TODO: handle exception |
| 639 | e.printStackTrace(); | 639 | e.printStackTrace(); |
| @@ -790,7 +790,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | @@ -790,7 +790,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | ||
| 790 | m.put("date", sheet.getDate()); | 790 | m.put("date", sheet.getDate()); |
| 791 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 791 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 792 | ee.excelReplace(listI, new Object[]{m}, path + "mould/sheetList2.xls", | 792 | ee.excelReplace(listI, new Object[]{m}, path + "mould/sheetList2.xls", |
| 793 | - path + "export/发车准点率"+sheet.getDate().replaceAll("-", "")+".xls"); | 793 | + path + "export/Shift punctuality"+sheet.getDate().replaceAll("-", "")+".xls"); |
| 794 | } catch (Exception e) { | 794 | } catch (Exception e) { |
| 795 | // TODO: handle exception | 795 | // TODO: handle exception |
| 796 | e.printStackTrace(); | 796 | e.printStackTrace(); |
| @@ -866,7 +866,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | @@ -866,7 +866,7 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements | ||
| 866 | listI.add(listmap.iterator()); | 866 | listI.add(listmap.iterator()); |
| 867 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; | 867 | String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; |
| 868 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList1.xls", | 868 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList1.xls", |
| 869 | - path + "export/发车准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls"); | 869 | + path + "export/Shift punctuality"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls"); |
| 870 | } catch (Exception e) { | 870 | } catch (Exception e) { |
| 871 | // TODO: handle exception | 871 | // TODO: handle exception |
| 872 | e.printStackTrace(); | 872 | e.printStackTrace(); |
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
| @@ -26,7 +26,7 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | @@ -26,7 +26,7 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | ||
| 26 | TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException; | 26 | TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException; |
| 27 | 27 | ||
| 28 | /** | 28 | /** |
| 29 | - * 导出动态时刻表。 | 29 | + * export动态时刻表。 |
| 30 | * @param dtInfos | 30 | * @param dtInfos |
| 31 | * @return | 31 | * @return |
| 32 | * @throws ScheduleException | 32 | * @throws ScheduleException |
| @@ -34,7 +34,7 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | @@ -34,7 +34,7 @@ public interface TTInfoDetailService extends BService<TTInfoDetail, Long> { | ||
| 34 | DataToolsFile exportDynamicTTinfo(TTinfoDetailDynamicData.DTInfos dtInfos, DataToolsFileType type) throws ScheduleException; | 34 | DataToolsFile exportDynamicTTinfo(TTinfoDetailDynamicData.DTInfos dtInfos, DataToolsFileType type) throws ScheduleException; |
| 35 | 35 | ||
| 36 | /** | 36 | /** |
| 37 | - * 导出时刻表预览视图信息。 | 37 | + * export时刻表预览视图信息。 |
| 38 | * @param ttInfoId 时刻表Id | 38 | * @param ttInfoId 时刻表Id |
| 39 | * @return | 39 | * @return |
| 40 | * @throws ScheduleException | 40 | * @throws ScheduleException |
src/main/java/com/bsth/service/schedule/datatools/CarConfigInfoDataToolsImpl.java
| @@ -114,7 +114,7 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService { | @@ -114,7 +114,7 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService { | ||
| 114 | @Override | 114 | @Override |
| 115 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 115 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 116 | try { | 116 | try { |
| 117 | - LOGGER.info("//---------------- 导出车辆配置信息 start... ----------------//"); | 117 | + LOGGER.info("//---------------- export车辆配置信息 start... ----------------//"); |
| 118 | // 创建ktr转换所需参数 | 118 | // 创建ktr转换所需参数 |
| 119 | Map<String, Object> ktrParms = new HashMap<>(); | 119 | Map<String, Object> ktrParms = new HashMap<>(); |
| 120 | File ktrFile = new File(this.getClass().getResource( | 120 | File ktrFile = new File(this.getClass().getResource( |
| @@ -128,12 +128,12 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService { | @@ -128,12 +128,12 @@ public class CarConfigInfoDataToolsImpl implements DataToolsService { | ||
| 128 | 128 | ||
| 129 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 129 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 130 | 130 | ||
| 131 | - LOGGER.info("//---------------- 导出车辆配置信息 success... ----------------//"); | 131 | + LOGGER.info("//---------------- export车辆配置信息 success... ----------------//"); |
| 132 | 132 | ||
| 133 | return file; | 133 | return file; |
| 134 | 134 | ||
| 135 | } catch (Exception exp) { | 135 | } catch (Exception exp) { |
| 136 | - LOGGER.info("//---------------- 导出车辆配置信息 failed... ----------------//"); | 136 | + LOGGER.info("//---------------- export车辆配置信息 failed... ----------------//"); |
| 137 | 137 | ||
| 138 | StringWriter sw = new StringWriter(); | 138 | StringWriter sw = new StringWriter(); |
| 139 | exp.printStackTrace(new PrintWriter(sw)); | 139 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/CarsDataToolsImpl.java
| @@ -110,7 +110,7 @@ public class CarsDataToolsImpl implements DataToolsService { | @@ -110,7 +110,7 @@ public class CarsDataToolsImpl implements DataToolsService { | ||
| 110 | @Override | 110 | @Override |
| 111 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 111 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 112 | try { | 112 | try { |
| 113 | - LOGGER.info("//---------------- 导出车辆基础信息 start... ----------------//"); | 113 | + LOGGER.info("//---------------- export车辆基础信息 start... ----------------//"); |
| 114 | // 创建ktr转换所需参数 | 114 | // 创建ktr转换所需参数 |
| 115 | Map<String, Object> ktrParms = new HashMap<>(); | 115 | Map<String, Object> ktrParms = new HashMap<>(); |
| 116 | File ktrFile = new File(this.getClass().getResource( | 116 | File ktrFile = new File(this.getClass().getResource( |
| @@ -124,12 +124,12 @@ public class CarsDataToolsImpl implements DataToolsService { | @@ -124,12 +124,12 @@ public class CarsDataToolsImpl implements DataToolsService { | ||
| 124 | 124 | ||
| 125 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 125 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 126 | 126 | ||
| 127 | - LOGGER.info("//---------------- 导出车辆基础信息 success... ----------------//"); | 127 | + LOGGER.info("//---------------- export车辆基础信息 success... ----------------//"); |
| 128 | 128 | ||
| 129 | return file; | 129 | return file; |
| 130 | 130 | ||
| 131 | } catch (Exception exp) { | 131 | } catch (Exception exp) { |
| 132 | - LOGGER.info("//---------------- 导出车辆基础信息 failed... ----------------//"); | 132 | + LOGGER.info("//---------------- export车辆基础信息 failed... ----------------//"); |
| 133 | 133 | ||
| 134 | StringWriter sw = new StringWriter(); | 134 | StringWriter sw = new StringWriter(); |
| 135 | exp.printStackTrace(new PrintWriter(sw)); | 135 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/EmployeeConfigInfoDataToolsImpl.java
| @@ -112,7 +112,7 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService { | @@ -112,7 +112,7 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService { | ||
| 112 | @Override | 112 | @Override |
| 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 114 | try { | 114 | try { |
| 115 | - LOGGER.info("//---------------- 导出人员配置信息 start... ----------------//"); | 115 | + LOGGER.info("//---------------- export人员配置信息 start... ----------------//"); |
| 116 | // 创建ktr转换所需参数 | 116 | // 创建ktr转换所需参数 |
| 117 | Map<String, Object> ktrParms = new HashMap<>(); | 117 | Map<String, Object> ktrParms = new HashMap<>(); |
| 118 | File ktrFile = new File(this.getClass().getResource( | 118 | File ktrFile = new File(this.getClass().getResource( |
| @@ -126,12 +126,12 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService { | @@ -126,12 +126,12 @@ public class EmployeeConfigInfoDataToolsImpl implements DataToolsService { | ||
| 126 | 126 | ||
| 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 128 | 128 | ||
| 129 | - LOGGER.info("//---------------- 导出人员配置信息 success... ----------------//"); | 129 | + LOGGER.info("//---------------- export人员配置信息 success... ----------------//"); |
| 130 | 130 | ||
| 131 | return file; | 131 | return file; |
| 132 | 132 | ||
| 133 | } catch (Exception exp) { | 133 | } catch (Exception exp) { |
| 134 | - LOGGER.info("//---------------- 导出人员配置信息 failed... ----------------//"); | 134 | + LOGGER.info("//---------------- export人员配置信息 failed... ----------------//"); |
| 135 | 135 | ||
| 136 | StringWriter sw = new StringWriter(); | 136 | StringWriter sw = new StringWriter(); |
| 137 | exp.printStackTrace(new PrintWriter(sw)); | 137 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/EmployeeDataToolsImpl.java
| @@ -110,7 +110,7 @@ public class EmployeeDataToolsImpl implements DataToolsService { | @@ -110,7 +110,7 @@ public class EmployeeDataToolsImpl implements DataToolsService { | ||
| 110 | @Override | 110 | @Override |
| 111 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 111 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 112 | try { | 112 | try { |
| 113 | - LOGGER.info("//---------------- 导出人员基础信息 start... ----------------//"); | 113 | + LOGGER.info("//---------------- export人员基础信息 start... ----------------//"); |
| 114 | // 创建ktr转换所需参数 | 114 | // 创建ktr转换所需参数 |
| 115 | Map<String, Object> ktrParms = new HashMap<>(); | 115 | Map<String, Object> ktrParms = new HashMap<>(); |
| 116 | File ktrFile = new File(this.getClass().getResource( | 116 | File ktrFile = new File(this.getClass().getResource( |
| @@ -124,12 +124,12 @@ public class EmployeeDataToolsImpl implements DataToolsService { | @@ -124,12 +124,12 @@ public class EmployeeDataToolsImpl implements DataToolsService { | ||
| 124 | 124 | ||
| 125 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 125 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 126 | 126 | ||
| 127 | - LOGGER.info("//---------------- 导出人员基础信息 success... ----------------//"); | 127 | + LOGGER.info("//---------------- export人员基础信息 success... ----------------//"); |
| 128 | 128 | ||
| 129 | return file; | 129 | return file; |
| 130 | 130 | ||
| 131 | } catch (Exception exp) { | 131 | } catch (Exception exp) { |
| 132 | - LOGGER.info("//---------------- 导出人员基础信息 failed... ----------------//"); | 132 | + LOGGER.info("//---------------- export人员基础信息 failed... ----------------//"); |
| 133 | 133 | ||
| 134 | StringWriter sw = new StringWriter(); | 134 | StringWriter sw = new StringWriter(); |
| 135 | exp.printStackTrace(new PrintWriter(sw)); | 135 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/GuideboardInfoDataToolsImpl.java
| @@ -112,7 +112,7 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService { | @@ -112,7 +112,7 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService { | ||
| 112 | @Override | 112 | @Override |
| 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 114 | try { | 114 | try { |
| 115 | - LOGGER.info("//---------------- 导出路牌信息 start... ----------------//"); | 115 | + LOGGER.info("//---------------- export路牌信息 start... ----------------//"); |
| 116 | // 创建ktr转换所需参数 | 116 | // 创建ktr转换所需参数 |
| 117 | Map<String, Object> ktrParms = new HashMap<>(); | 117 | Map<String, Object> ktrParms = new HashMap<>(); |
| 118 | File ktrFile = new File(this.getClass().getResource( | 118 | File ktrFile = new File(this.getClass().getResource( |
| @@ -126,12 +126,12 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService { | @@ -126,12 +126,12 @@ public class GuideboardInfoDataToolsImpl implements DataToolsService { | ||
| 126 | 126 | ||
| 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 128 | 128 | ||
| 129 | - LOGGER.info("//---------------- 导出路牌信息 success... ----------------//"); | 129 | + LOGGER.info("//---------------- export路牌信息 success... ----------------//"); |
| 130 | 130 | ||
| 131 | return file; | 131 | return file; |
| 132 | 132 | ||
| 133 | } catch (Exception exp) { | 133 | } catch (Exception exp) { |
| 134 | - LOGGER.info("//---------------- 导出路牌信息 failed... ----------------//"); | 134 | + LOGGER.info("//---------------- export路牌信息 failed... ----------------//"); |
| 135 | 135 | ||
| 136 | StringWriter sw = new StringWriter(); | 136 | StringWriter sw = new StringWriter(); |
| 137 | exp.printStackTrace(new PrintWriter(sw)); | 137 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/ScheduleRule1FlatDataToolsImpl.java
| @@ -112,7 +112,7 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService { | @@ -112,7 +112,7 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService { | ||
| 112 | @Override | 112 | @Override |
| 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 113 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 114 | try { | 114 | try { |
| 115 | - LOGGER.info("//---------------- 导出排版规则信息 start... ----------------//"); | 115 | + LOGGER.info("//---------------- export排版规则信息 start... ----------------//"); |
| 116 | // 创建ktr转换所需参数 | 116 | // 创建ktr转换所需参数 |
| 117 | Map<String, Object> ktrParms = new HashMap<>(); | 117 | Map<String, Object> ktrParms = new HashMap<>(); |
| 118 | File ktrFile = new File(this.getClass().getResource( | 118 | File ktrFile = new File(this.getClass().getResource( |
| @@ -126,12 +126,12 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService { | @@ -126,12 +126,12 @@ public class ScheduleRule1FlatDataToolsImpl implements DataToolsService { | ||
| 126 | 126 | ||
| 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 127 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 128 | 128 | ||
| 129 | - LOGGER.info("//---------------- 导出排版规则信息 success... ----------------//"); | 129 | + LOGGER.info("//---------------- export排版规则信息 success... ----------------//"); |
| 130 | 130 | ||
| 131 | return file; | 131 | return file; |
| 132 | 132 | ||
| 133 | } catch (Exception exp) { | 133 | } catch (Exception exp) { |
| 134 | - LOGGER.info("//---------------- 导出排版规则信息 failed... ----------------//"); | 134 | + LOGGER.info("//---------------- export排版规则信息 failed... ----------------//"); |
| 135 | 135 | ||
| 136 | StringWriter sw = new StringWriter(); | 136 | StringWriter sw = new StringWriter(); |
| 137 | exp.printStackTrace(new PrintWriter(sw)); | 137 | exp.printStackTrace(new PrintWriter(sw)); |
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
| @@ -238,7 +238,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -238,7 +238,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 238 | @Override | 238 | @Override |
| 239 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 239 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 240 | try { | 240 | try { |
| 241 | - LOGGER.info("//---------------- 导出时刻表明细 start... ----------------//"); | 241 | + LOGGER.info("//---------------- export时刻表明细 start... ----------------//"); |
| 242 | 242 | ||
| 243 | // 创建ktr转换所需参数 | 243 | // 创建ktr转换所需参数 |
| 244 | Map<String, Object> ktrParms = new HashMap<>(); | 244 | Map<String, Object> ktrParms = new HashMap<>(); |
| @@ -257,7 +257,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -257,7 +257,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 257 | 257 | ||
| 258 | DataToolsFile file = dataToolsService.exportData(ktrParms); | 258 | DataToolsFile file = dataToolsService.exportData(ktrParms); |
| 259 | 259 | ||
| 260 | - // 将导出的数据表头重新处理一遍,祛除->数字 | 260 | + // 将export的数据表头重新处理一遍,祛除->数字 |
| 261 | 261 | ||
| 262 | // poi api,并读取第一行数据,组合成站点列表,逗号分隔 | 262 | // poi api,并读取第一行数据,组合成站点列表,逗号分隔 |
| 263 | org.apache.poi.ss.usermodel.Workbook poi_workbook; | 263 | org.apache.poi.ss.usermodel.Workbook poi_workbook; |
| @@ -301,11 +301,11 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -301,11 +301,11 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 301 | 301 | ||
| 302 | file.setFile(fileCal); | 302 | file.setFile(fileCal); |
| 303 | 303 | ||
| 304 | - LOGGER.info("//---------------- 导出时刻表明细 success... ----------------//"); | 304 | + LOGGER.info("//---------------- export时刻表明细 success... ----------------//"); |
| 305 | 305 | ||
| 306 | return file; | 306 | return file; |
| 307 | } catch (Exception exp) { | 307 | } catch (Exception exp) { |
| 308 | - LOGGER.info("//---------------- 导出时刻表明细 failed... ----------------//"); | 308 | + LOGGER.info("//---------------- export时刻表明细 failed... ----------------//"); |
| 309 | 309 | ||
| 310 | StringWriter sw = new StringWriter(); | 310 | StringWriter sw = new StringWriter(); |
| 311 | exp.printStackTrace(new PrintWriter(sw)); | 311 | exp.printStackTrace(new PrintWriter(sw)); |
| @@ -785,7 +785,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | @@ -785,7 +785,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail | ||
| 785 | } else if (type == DataToolsFileType.XLSX) { | 785 | } else if (type == DataToolsFileType.XLSX) { |
| 786 | excelPoiOperator = new Excel2007PoiOperator(); | 786 | excelPoiOperator = new Excel2007PoiOperator(); |
| 787 | } else { | 787 | } else { |
| 788 | - throw new RuntimeException("未知的导出格式==>" + type); | 788 | + throw new RuntimeException("未知的export格式==>" + type); |
| 789 | } | 789 | } |
| 790 | 790 | ||
| 791 | // 使用POI,创建xlsx文件 | 791 | // 使用POI,创建xlsx文件 |
src/main/java/com/bsth/service/schedule/datatools/TTinfoDetailDynamicData.java
| @@ -403,7 +403,7 @@ public interface TTinfoDetailDynamicData { | @@ -403,7 +403,7 @@ public interface TTinfoDetailDynamicData { | ||
| 403 | //---------------------- 生成时刻表用对象(以上) ---------------------// | 403 | //---------------------- 生成时刻表用对象(以上) ---------------------// |
| 404 | 404 | ||
| 405 | /** | 405 | /** |
| 406 | - * 导出动态时刻表数据。 | 406 | + * export动态时刻表数据。 |
| 407 | * @param dtInfos | 407 | * @param dtInfos |
| 408 | * @return | 408 | * @return |
| 409 | * @throws ScheduleException | 409 | * @throws ScheduleException |
src/main/java/com/bsth/service/schedule/impl/EmployeeConfigInfoServiceImpl.java
| @@ -310,11 +310,11 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl<EmployeeConfigIn | @@ -310,11 +310,11 @@ public class EmployeeConfigInfoServiceImpl extends BServiceImpl<EmployeeConfigIn | ||
| 310 | @Transactional | 310 | @Transactional |
| 311 | @Override | 311 | @Override |
| 312 | public List<String> validate_get_destory_info() { | 312 | public List<String> validate_get_destory_info() { |
| 313 | - // 1、查找当前用户是否有运营计划管理,没有的话不分析是否有停用人员信息 | 313 | + // 1、查找当前用户是否有Operation plan management,没有的话不分析是否有停用人员信息 |
| 314 | List<Module> moduleList = this.moduleService.findByCurrentUser(); | 314 | List<Module> moduleList = this.moduleService.findByCurrentUser(); |
| 315 | boolean hasPlanModule = false; | 315 | boolean hasPlanModule = false; |
| 316 | for (Module module : moduleList) { | 316 | for (Module module : moduleList) { |
| 317 | - if ("运营计划管理".equals(module.getName())) { | 317 | + if ("Operation plan management".equals(module.getName())) { |
| 318 | hasPlanModule = true; | 318 | hasPlanModule = true; |
| 319 | break; | 319 | break; |
| 320 | } | 320 | } |
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
| @@ -316,7 +316,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -316,7 +316,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 316 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 316 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 317 | ee.excelReplace(listI, new Object[] { m }, path+"mould/peoCarPlan.xls", | 317 | ee.excelReplace(listI, new Object[] { m }, path+"mould/peoCarPlan.xls", |
| 318 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) | 318 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 319 | - +"-"+lineName+"-计划车辆班次人员.xls"); | 319 | + +"-"+lineName+"-Planned vehicle shift personnel.xls"); |
| 320 | } catch (Exception e) { | 320 | } catch (Exception e) { |
| 321 | // TODO: handle exception | 321 | // TODO: handle exception |
| 322 | e.printStackTrace(); | 322 | e.printStackTrace(); |
| @@ -485,7 +485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -485,7 +485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 485 | } | 485 | } |
| 486 | } | 486 | } |
| 487 | 487 | ||
| 488 | - //待发调整 | 488 | + //Departure time adjustment |
| 489 | if(schedule.getDfsj() != null){ | 489 | if(schedule.getDfsj() != null){ |
| 490 | if(!schedule.getDfsj().equals(schedule.getFcsj())){ | 490 | if(!schedule.getDfsj().equals(schedule.getFcsj())){ |
| 491 | dftz++; | 491 | dftz++; |
| @@ -571,7 +571,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -571,7 +571,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 571 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 571 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 572 | ee.excelReplace(listI, new Object[] { m }, path+"mould/workDaily.xls", | 572 | ee.excelReplace(listI, new Object[] { m }, path+"mould/workDaily.xls", |
| 573 | path+"export/"+ sdfSimple.format(sdfMonth.parse(date))+"-"+lineName | 573 | path+"export/"+ sdfSimple.format(sdfMonth.parse(date))+"-"+lineName |
| 574 | - +"-营运服务日报表.xls"); | 574 | + +"-Operation service daily report.xls"); |
| 575 | } catch (Exception e) { | 575 | } catch (Exception e) { |
| 576 | // TODO: handle exception | 576 | // TODO: handle exception |
| 577 | e.printStackTrace(); | 577 | e.printStackTrace(); |
| @@ -869,7 +869,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -869,7 +869,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 869 | modelMap.put("dataList", resList); | 869 | modelMap.put("dataList", resList); |
| 870 | } | 870 | } |
| 871 | 871 | ||
| 872 | - //导出 | 872 | + //export |
| 873 | if(type.equals("export")){ | 873 | if(type.equals("export")){ |
| 874 | String lineName = ""; | 874 | String lineName = ""; |
| 875 | if(map.containsKey("lineName")) | 875 | if(map.containsKey("lineName")) |
| @@ -886,7 +886,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -886,7 +886,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 886 | path+"export/" | 886 | path+"export/" |
| 887 | + sdfSimple.format(sdfMonth.parse(startDate)) + "-" | 887 | + sdfSimple.format(sdfMonth.parse(startDate)) + "-" |
| 888 | + sdfSimple.format(sdfMonth.parse(endDate)) + "-" | 888 | + sdfSimple.format(sdfMonth.parse(endDate)) + "-" |
| 889 | - +lineName+"-时刻表分析.xls"); | 889 | + +lineName+"-Timetable analysis.xls"); |
| 890 | } catch (Exception e) { | 890 | } catch (Exception e) { |
| 891 | // TODO: handle exception | 891 | // TODO: handle exception |
| 892 | e.printStackTrace(); | 892 | e.printStackTrace(); |
| @@ -1178,7 +1178,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1178,7 +1178,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1178 | modelMap.put("dataList", new ArrayList<Map<String, Object>>()); | 1178 | modelMap.put("dataList", new ArrayList<Map<String, Object>>()); |
| 1179 | } | 1179 | } |
| 1180 | 1180 | ||
| 1181 | - //导出 | 1181 | + //export |
| 1182 | if(type.equals("export")){ | 1182 | if(type.equals("export")){ |
| 1183 | String lineName_ = ""; | 1183 | String lineName_ = ""; |
| 1184 | if(map.containsKey("lineName")) | 1184 | if(map.containsKey("lineName")) |
| @@ -1199,7 +1199,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1199,7 +1199,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1199 | listI.add(tempList.iterator()); | 1199 | listI.add(tempList.iterator()); |
| 1200 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 1200 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 1201 | ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly_sum.xls", | 1201 | ee.excelReplace(listI, new Object[] { m }, path+"mould/scheduleAnaly_sum.xls", |
| 1202 | - path+"export/" + dateTime + "-" + lineName + "-时刻表分析(汇总).xls"); | 1202 | + path+"export/" + dateTime + "-" + lineName + "-Timetable analysis (summary).xls"); |
| 1203 | } catch (Exception e) { | 1203 | } catch (Exception e) { |
| 1204 | // TODO: handle exception | 1204 | // TODO: handle exception |
| 1205 | e.printStackTrace(); | 1205 | e.printStackTrace(); |
| @@ -1946,7 +1946,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1946,7 +1946,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1946 | listI.add(resList.iterator()); | 1946 | listI.add(resList.iterator()); |
| 1947 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 1947 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 1948 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls", | 1948 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls", |
| 1949 | - path+"export/" + dateTime + "-" + lineName + "-线路首末班准点率.xls"); | 1949 | + path+"export/" + dateTime + "-" + lineName + "-On-time rate of the first and last bus on the route.xls"); |
| 1950 | } catch (Exception e) { | 1950 | } catch (Exception e) { |
| 1951 | // TODO: handle exception | 1951 | // TODO: handle exception |
| 1952 | e.printStackTrace(); | 1952 | e.printStackTrace(); |
| @@ -1976,7 +1976,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -1976,7 +1976,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 1976 | listI.add(resList.iterator()); | 1976 | listI.add(resList.iterator()); |
| 1977 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 1977 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 1978 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_delay.xls", | 1978 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_delay.xls", |
| 1979 | - path+"export/" + dateTime + "-" + lineName + "-首末班误点班次.xls"); | 1979 | + path+"export/" + dateTime + "-" + lineName + "-Shift correction report.xls"); |
| 1980 | } catch (Exception e) { | 1980 | } catch (Exception e) { |
| 1981 | // TODO: handle exception | 1981 | // TODO: handle exception |
| 1982 | e.printStackTrace(); | 1982 | e.printStackTrace(); |
| @@ -2033,7 +2033,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -2033,7 +2033,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 2033 | listI.add(resList.iterator()); | 2033 | listI.add(resList.iterator()); |
| 2034 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 2034 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 2035 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls", | 2035 | ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_sum.xls", |
| 2036 | - path+"export/" + dateTime + "-全部公司-线路首末班准点率.xls"); | 2036 | + path+"export/" + dateTime + "-all companies-On-time rate of the first and last bus on the route.xls"); |
| 2037 | } catch (Exception e) { | 2037 | } catch (Exception e) { |
| 2038 | // TODO: handle exception | 2038 | // TODO: handle exception |
| 2039 | e.printStackTrace(); | 2039 | e.printStackTrace(); |
| @@ -2262,7 +2262,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -2262,7 +2262,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 2262 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 2262 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 2263 | ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls", | 2263 | ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState.xls", |
| 2264 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) | 2264 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 2265 | - + "-" + lineName + "-指令状态分析.xls"); | 2265 | + + "-" + lineName + "-Instruction status analysis.xls"); |
| 2266 | } catch (Exception e) { | 2266 | } catch (Exception e) { |
| 2267 | // TODO: handle exception | 2267 | // TODO: handle exception |
| 2268 | e.printStackTrace(); | 2268 | e.printStackTrace(); |
| @@ -2463,7 +2463,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -2463,7 +2463,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 2463 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; | 2463 | String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; |
| 2464 | ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls", | 2464 | ee.excelReplace(listI, new Object[] { m }, path+"mould/commandState1.xls", |
| 2465 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) | 2465 | path+"export/" + sdfSimple.format(sdfMonth.parse(date)) |
| 2466 | - + "-" + lineName + "-线路指令状态分析.xls"); | 2466 | + + "-" + lineName + "-Route Instruction status analysis.xls"); |
| 2467 | } catch (Exception e) { | 2467 | } catch (Exception e) { |
| 2468 | // TODO: handle exception | 2468 | // TODO: handle exception |
| 2469 | e.printStackTrace(); | 2469 | e.printStackTrace(); |
| @@ -3006,7 +3006,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -3006,7 +3006,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 3006 | modelMap.put("dataList", resList); | 3006 | modelMap.put("dataList", resList); |
| 3007 | } | 3007 | } |
| 3008 | 3008 | ||
| 3009 | - //导出 | 3009 | + //export |
| 3010 | if(type.equals("export")){ | 3010 | if(type.equals("export")){ |
| 3011 | String lineName = ""; | 3011 | String lineName = ""; |
| 3012 | if(map.containsKey("lineName")) | 3012 | if(map.containsKey("lineName")) |
| @@ -3588,7 +3588,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | @@ -3588,7 +3588,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { | ||
| 3588 | modelMap.put("dataList", mapList); | 3588 | modelMap.put("dataList", mapList); |
| 3589 | 3589 | ||
| 3590 | 3590 | ||
| 3591 | - //导出 | 3591 | + //export |
| 3592 | if(type.equals("export")){ | 3592 | if(type.equals("export")){ |
| 3593 | String lineName = ""; | 3593 | String lineName = ""; |
| 3594 | if(map.containsKey("lineName")) | 3594 | if(map.containsKey("lineName")) |
src/main/java/com/bsth/service/schedule/timetable/TimetableExcelData.java
| @@ -30,7 +30,7 @@ import java.util.List; | @@ -30,7 +30,7 @@ import java.util.List; | ||
| 30 | import java.util.Map; | 30 | import java.util.Map; |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | - * 时刻表Excel数据类,用于验证,导入,导出时刻表数据。 | 33 | + * 时刻表Excel数据类,用于验证,导入,export时刻表数据。 |
| 34 | * 混合Builder和Strategy模式。 | 34 | * 混合Builder和Strategy模式。 |
| 35 | */ | 35 | */ |
| 36 | public class TimetableExcelData { | 36 | public class TimetableExcelData { |
| @@ -124,7 +124,7 @@ public class TimetableExcelData { | @@ -124,7 +124,7 @@ public class TimetableExcelData { | ||
| 124 | private String excelFilePath; | 124 | private String excelFilePath; |
| 125 | /** 数据工具服务 */ | 125 | /** 数据工具服务 */ |
| 126 | private DataToolsService dataToolsService; | 126 | private DataToolsService dataToolsService; |
| 127 | - /** 配置数据导入导出用到的配置信息 */ | 127 | + /** 配置数据导入export用到的配置信息 */ |
| 128 | private DataToolsProperties dataToolsProperties; | 128 | private DataToolsProperties dataToolsProperties; |
| 129 | /** ktr转换所需参数对象 */ | 129 | /** ktr转换所需参数对象 */ |
| 130 | private Map<String, Object> ktrParams = new HashMap<>(); | 130 | private Map<String, Object> ktrParams = new HashMap<>(); |
| @@ -144,19 +144,19 @@ public class TimetableExcelData { | @@ -144,19 +144,19 @@ public class TimetableExcelData { | ||
| 144 | this.timetableExcelFormatType); | 144 | this.timetableExcelFormatType); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | - // ------------------ 导出用公共属性及方法,如下:------------------- // | 147 | + // ------------------ export用公共属性及方法,如下:------------------- // |
| 148 | /** 时刻表 */ | 148 | /** 时刻表 */ |
| 149 | private TTInfo ttInfo; | 149 | private TTInfo ttInfo; |
| 150 | /** 时刻表明细 */ | 150 | /** 时刻表明细 */ |
| 151 | private List<TTInfoDetail> ttInfoDetailList; | 151 | private List<TTInfoDetail> ttInfoDetailList; |
| 152 | - /** 导出的文件路径 */ | 152 | + /** export的文件路径 */ |
| 153 | private String pvExportFilePath; | 153 | private String pvExportFilePath; |
| 154 | 154 | ||
| 155 | - // ------------------ 导出预览数据相关属性及方法,如下:---------------- // | ||
| 156 | - /** 时刻表预览excel导出策略 */ | 155 | + // ------------------ export预览数据相关属性及方法,如下:---------------- // |
| 156 | + /** 时刻表预览excelexport策略 */ | ||
| 157 | private TimetableExcelPVDataExportStrategy timetableExcelPVDataExportStrategy; | 157 | private TimetableExcelPVDataExportStrategy timetableExcelPVDataExportStrategy; |
| 158 | /** | 158 | /** |
| 159 | - * 导出excel预览数据。 | 159 | + * exportexcel预览数据。 |
| 160 | */ | 160 | */ |
| 161 | public DataToolsFile doPVExport() throws ScheduleException { | 161 | public DataToolsFile doPVExport() throws ScheduleException { |
| 162 | return this.timetableExcelPVDataExportStrategy.doPVExport( | 162 | return this.timetableExcelPVDataExportStrategy.doPVExport( |
| @@ -207,7 +207,7 @@ public class TimetableExcelData { | @@ -207,7 +207,7 @@ public class TimetableExcelData { | ||
| 207 | this.ttInfo = pvExcelExportBuilder.ttInfo; | 207 | this.ttInfo = pvExcelExportBuilder.ttInfo; |
| 208 | this.ttInfoDetailList = pvExcelExportBuilder.ttInfoDetailList; | 208 | this.ttInfoDetailList = pvExcelExportBuilder.ttInfoDetailList; |
| 209 | this.pvExportFilePath = pvExcelExportBuilder.pvExportFilePath; | 209 | this.pvExportFilePath = pvExcelExportBuilder.pvExportFilePath; |
| 210 | - // 预览excel数据导出策略 | 210 | + // 预览excel数据export策略 |
| 211 | this.timetableExcelPVDataExportStrategy = pvExcelExportBuilder.timetableExcelPVDataExportStrategy; | 211 | this.timetableExcelPVDataExportStrategy = pvExcelExportBuilder.timetableExcelPVDataExportStrategy; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -393,7 +393,7 @@ public class TimetableExcelData { | @@ -393,7 +393,7 @@ public class TimetableExcelData { | ||
| 393 | private TimetableExcelFormatType timetableExcelFormatType; | 393 | private TimetableExcelFormatType timetableExcelFormatType; |
| 394 | /** 数据工具服务 */ | 394 | /** 数据工具服务 */ |
| 395 | private DataToolsService dataToolsService; | 395 | private DataToolsService dataToolsService; |
| 396 | - /** 配置数据导入导出用到的配置信息 */ | 396 | + /** 配置数据导入export用到的配置信息 */ |
| 397 | private DataToolsProperties dataToolsProperties; | 397 | private DataToolsProperties dataToolsProperties; |
| 398 | /** 时刻表excel导入策略 */ | 398 | /** 时刻表excel导入策略 */ |
| 399 | private TimetableExcelDataImportStrategy timetableExcelDataImportStrategy; | 399 | private TimetableExcelDataImportStrategy timetableExcelDataImportStrategy; |
| @@ -510,7 +510,7 @@ public class TimetableExcelData { | @@ -510,7 +510,7 @@ public class TimetableExcelData { | ||
| 510 | private TTInfoDetailRepository ttInfoDetailRepository; | 510 | private TTInfoDetailRepository ttInfoDetailRepository; |
| 511 | /** 配置文件 */ | 511 | /** 配置文件 */ |
| 512 | private DataToolsProperties dataToolsProperties; | 512 | private DataToolsProperties dataToolsProperties; |
| 513 | - /** 时刻表预览数据Excel导出策略 */ | 513 | + /** 时刻表预览数据Excelexport策略 */ |
| 514 | private TimetableExcelPVDataExportStrategy timetableExcelPVDataExportStrategy; | 514 | private TimetableExcelPVDataExportStrategy timetableExcelPVDataExportStrategy; |
| 515 | 515 | ||
| 516 | public PVExcelExportBuilder setTtInfoId(Long ttInfoId) { | 516 | public PVExcelExportBuilder setTtInfoId(Long ttInfoId) { |
| @@ -543,7 +543,7 @@ public class TimetableExcelData { | @@ -543,7 +543,7 @@ public class TimetableExcelData { | ||
| 543 | private TTInfo ttInfo; | 543 | private TTInfo ttInfo; |
| 544 | /** 时刻表明细 */ | 544 | /** 时刻表明细 */ |
| 545 | private List<TTInfoDetail> ttInfoDetailList; | 545 | private List<TTInfoDetail> ttInfoDetailList; |
| 546 | - /** 导出的文件路径 */ | 546 | + /** export的文件路径 */ |
| 547 | private String pvExportFilePath; | 547 | private String pvExportFilePath; |
| 548 | 548 | ||
| 549 | public TimetableExcelData build() { | 549 | public TimetableExcelData build() { |
| @@ -551,7 +551,7 @@ public class TimetableExcelData { | @@ -551,7 +551,7 @@ public class TimetableExcelData { | ||
| 551 | Assert.notNull(this.ttInfoId, "时刻表Id为空!"); | 551 | Assert.notNull(this.ttInfoId, "时刻表Id为空!"); |
| 552 | Assert.notNull(ttInfoRepository, "时刻表repo为空!"); | 552 | Assert.notNull(ttInfoRepository, "时刻表repo为空!"); |
| 553 | Assert.notNull(ttInfoDetailRepository, "时刻表明细repo为空!"); | 553 | Assert.notNull(ttInfoDetailRepository, "时刻表明细repo为空!"); |
| 554 | - Assert.notNull(timetableExcelPVDataExportStrategy, "时刻表预览excel数据导出策略为空!"); | 554 | + Assert.notNull(timetableExcelPVDataExportStrategy, "时刻表预览excel数据export策略为空!"); |
| 555 | 555 | ||
| 556 | // 2、获取时刻表数据 | 556 | // 2、获取时刻表数据 |
| 557 | this.ttInfo = this.ttInfoRepository.findOneExtend(this.ttInfoId); | 557 | this.ttInfo = this.ttInfoRepository.findOneExtend(this.ttInfoId); |
| @@ -560,7 +560,7 @@ public class TimetableExcelData { | @@ -560,7 +560,7 @@ public class TimetableExcelData { | ||
| 560 | // 3、获取时刻表明细数据 | 560 | // 3、获取时刻表明细数据 |
| 561 | this.ttInfoDetailList = this.ttInfoDetailRepository.findByTtinfoId(this.ttInfoId); | 561 | this.ttInfoDetailList = this.ttInfoDetailRepository.findByTtinfoId(this.ttInfoId); |
| 562 | 562 | ||
| 563 | - // 4、计算导出文件路径 | 563 | + // 4、计算export文件路径 |
| 564 | Assert.notNull(this.dataToolsProperties, "dataTools配置文件类为空!"); | 564 | Assert.notNull(this.dataToolsProperties, "dataTools配置文件类为空!"); |
| 565 | this.pvExportFilePath = dataToolsProperties.getFileoutputDir() + | 565 | this.pvExportFilePath = dataToolsProperties.getFileoutputDir() + |
| 566 | File.separator + | 566 | File.separator + |
src/main/java/com/bsth/service/schedule/timetable/TimetableExcelFormatType.java
| @@ -13,7 +13,7 @@ import java.util.Map; | @@ -13,7 +13,7 @@ import java.util.Map; | ||
| 13 | public enum TimetableExcelFormatType { | 13 | public enum TimetableExcelFormatType { |
| 14 | Normal("normal"), // 一般格式 | 14 | Normal("normal"), // 一般格式 |
| 15 | NormalWithGs("normalWithGs"), // 一般格式(路牌列后加一列工时列) | 15 | NormalWithGs("normalWithGs"), // 一般格式(路牌列后加一列工时列) |
| 16 | - Dynamic("dynamic"); // 自动生成时刻表的导出格式 | 16 | + Dynamic("dynamic"); // 自动生成时刻表的export格式 |
| 17 | 17 | ||
| 18 | private static Map<String, TimetableExcelFormatType> descMapEnum = new HashMap<>(); | 18 | private static Map<String, TimetableExcelFormatType> descMapEnum = new HashMap<>(); |
| 19 | static { | 19 | static { |
src/main/java/com/bsth/service/schedule/timetable/strategy/TimetableExcelPVDataExportStrategy.java
| @@ -8,14 +8,14 @@ import com.bsth.service.schedule.utils.DataToolsFile; | @@ -8,14 +8,14 @@ import com.bsth.service.schedule.utils.DataToolsFile; | ||
| 8 | import java.util.List; | 8 | import java.util.List; |
| 9 | 9 | ||
| 10 | /** | 10 | /** |
| 11 | - * 时刻表预览数据excel导出策略。 | 11 | + * 时刻表预览数据excelexport策略。 |
| 12 | */ | 12 | */ |
| 13 | public interface TimetableExcelPVDataExportStrategy { | 13 | public interface TimetableExcelPVDataExportStrategy { |
| 14 | /** | 14 | /** |
| 15 | - * 导出预览数据 | 15 | + * export预览数据 |
| 16 | * @param ttInfo 时刻表 | 16 | * @param ttInfo 时刻表 |
| 17 | * @param ttInfoDetailList 时刻表明细 | 17 | * @param ttInfoDetailList 时刻表明细 |
| 18 | - * @param pvExportFilePath 导出文件路径 | 18 | + * @param pvExportFilePath export文件路径 |
| 19 | * @return 文件包装类 | 19 | * @return 文件包装类 |
| 20 | */ | 20 | */ |
| 21 | DataToolsFile doPVExport( | 21 | DataToolsFile doPVExport( |
src/main/java/com/bsth/service/schedule/timetable/strategy/impl/TimetableExcelPVDataExportStrategyImpl.java
| @@ -23,7 +23,7 @@ import java.util.*; | @@ -23,7 +23,7 @@ import java.util.*; | ||
| 23 | import java.util.List; | 23 | import java.util.List; |
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| 26 | - * 时刻表预览数据excel导出策略实现。 | 26 | + * 时刻表预览数据excelexport策略实现。 |
| 27 | */ | 27 | */ |
| 28 | public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVDataExportStrategy { | 28 | public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVDataExportStrategy { |
| 29 | /** 日志记录器 */ | 29 | /** 日志记录器 */ |
| @@ -34,9 +34,9 @@ public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVD | @@ -34,9 +34,9 @@ public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVD | ||
| 34 | TTInfo ttInfo, | 34 | TTInfo ttInfo, |
| 35 | List<TTInfoDetail> ttInfoDetailList, | 35 | List<TTInfoDetail> ttInfoDetailList, |
| 36 | String pvExportFilePath) throws ScheduleException { | 36 | String pvExportFilePath) throws ScheduleException { |
| 37 | - LOG.info("----------------- 开始导出时刻表[{}]预览视图信息---------------", ttInfo.getName()); | 37 | + LOG.info("----------------- 开始export时刻表[{}]预览视图信息---------------", ttInfo.getName()); |
| 38 | 38 | ||
| 39 | - // 2、构造导出信息 | 39 | + // 2、构造export信息 |
| 40 | try { | 40 | try { |
| 41 | // 使用excel2007格式(xlsx) | 41 | // 使用excel2007格式(xlsx) |
| 42 | ExcelPoiOperator excelPoiOperator = new Excel2007PoiOperator(); | 42 | ExcelPoiOperator excelPoiOperator = new Excel2007PoiOperator(); |
| @@ -189,7 +189,7 @@ public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVD | @@ -189,7 +189,7 @@ public class TimetableExcelPVDataExportStrategyImpl implements TimetableExcelPVD | ||
| 189 | return dataToolsFile; | 189 | return dataToolsFile; |
| 190 | 190 | ||
| 191 | } catch (Exception exp) { | 191 | } catch (Exception exp) { |
| 192 | - LOG.error("----------------- 导出时刻表[{}]预览视图信息失败---------------", ttInfo.getName()); | 192 | + LOG.error("----------------- export时刻表[{}]预览视图信息失败---------------", ttInfo.getName()); |
| 193 | throw new ScheduleException(exp); | 193 | throw new ScheduleException(exp); |
| 194 | } | 194 | } |
| 195 | } | 195 | } |
src/main/java/com/bsth/service/schedule/utils/DataToolsProperties.java
| @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; | @@ -7,7 +7,7 @@ import org.springframework.stereotype.Component; | ||
| 7 | import javax.validation.constraints.NotNull; | 7 | import javax.validation.constraints.NotNull; |
| 8 | 8 | ||
| 9 | /** | 9 | /** |
| 10 | - * 配置数据导入导出用到的配置信息 | 10 | + * 配置数据导入export用到的配置信息 |
| 11 | */ | 11 | */ |
| 12 | @Component | 12 | @Component |
| 13 | @ConfigurationProperties( | 13 | @ConfigurationProperties( |
| @@ -20,7 +20,7 @@ public class DataToolsProperties { | @@ -20,7 +20,7 @@ public class DataToolsProperties { | ||
| 20 | /** 上传文件目录配置(根据不同的环境需要修正) */ | 20 | /** 上传文件目录配置(根据不同的环境需要修正) */ |
| 21 | @NotNull | 21 | @NotNull |
| 22 | private String fileuploadDir; | 22 | private String fileuploadDir; |
| 23 | - /** 导出数据文件目录配置(根据不同的环境需要修正) */ | 23 | + /** export数据文件目录配置(根据不同的环境需要修正) */ |
| 24 | @NotNull | 24 | @NotNull |
| 25 | private String fileoutputDir; | 25 | private String fileoutputDir; |
| 26 | 26 | ||
| @@ -95,30 +95,30 @@ public class DataToolsProperties { | @@ -95,30 +95,30 @@ public class DataToolsProperties { | ||
| 95 | private String scheduleruleDatainputktr; | 95 | private String scheduleruleDatainputktr; |
| 96 | 96 | ||
| 97 | 97 | ||
| 98 | - //------------------------- 导出数据ktr --------------------------// | ||
| 99 | - /** 车辆信息导出ktr转换 */ | 98 | + //------------------------- export数据ktr --------------------------// |
| 99 | + /** 车辆信息exportktr转换 */ | ||
| 100 | @NotNull | 100 | @NotNull |
| 101 | private String carsDataoutputktr; | 101 | private String carsDataoutputktr; |
| 102 | - /** 人员信息导出ktr转换 */ | 102 | + /** 人员信息exportktr转换 */ |
| 103 | @NotNull | 103 | @NotNull |
| 104 | private String employeesDataoutputktr; | 104 | private String employeesDataoutputktr; |
| 105 | - /** 时刻表导出元数据ktr转换 */ | 105 | + /** 时刻表export元数据ktr转换 */ |
| 106 | @NotNull | 106 | @NotNull |
| 107 | private String ttinfodetailMetaoutput; | 107 | private String ttinfodetailMetaoutput; |
| 108 | - /** 时刻表导出数据ktr转换 */ | 108 | + /** 时刻表export数据ktr转换 */ |
| 109 | @NotNull | 109 | @NotNull |
| 110 | private String ttinfodetailOutput; | 110 | private String ttinfodetailOutput; |
| 111 | @NotNull | 111 | @NotNull |
| 112 | - /** 排版规则导出数据ktr转换 */ | 112 | + /** 排版规则export数据ktr转换 */ |
| 113 | private String scheduleruleOutput; | 113 | private String scheduleruleOutput; |
| 114 | @NotNull | 114 | @NotNull |
| 115 | - /** 车辆配置信息导出ktr转换 */ | 115 | + /** 车辆配置信息exportktr转换 */ |
| 116 | private String carsconfigDataoutputktr; | 116 | private String carsconfigDataoutputktr; |
| 117 | @NotNull | 117 | @NotNull |
| 118 | - /** 人员配置信息导出ktr转换 */ | 118 | + /** 人员配置信息exportktr转换 */ |
| 119 | private String employeesconfigDataoutputktr; | 119 | private String employeesconfigDataoutputktr; |
| 120 | @NotNull | 120 | @NotNull |
| 121 | - /** 路牌信息导出 */ | 121 | + /** 路牌信息export */ |
| 122 | private String guideboardsDataoutputktr; | 122 | private String guideboardsDataoutputktr; |
| 123 | 123 | ||
| 124 | //------------------------ 数据同步ktr -----------------------// | 124 | //------------------------ 数据同步ktr -----------------------// |
src/main/java/com/bsth/service/schedule/utils/DataToolsService.java
| @@ -14,6 +14,6 @@ public interface DataToolsService { | @@ -14,6 +14,6 @@ public interface DataToolsService { | ||
| 14 | DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException; | 14 | DataToolsFile uploadFile(String filename, byte[] filedata) throws ScheduleException; |
| 15 | // 导入数据 | 15 | // 导入数据 |
| 16 | void importData(File file, Map<String, Object> params) throws ScheduleException; | 16 | void importData(File file, Map<String, Object> params) throws ScheduleException; |
| 17 | - // 导出数据 | 17 | + // export数据 |
| 18 | DataToolsFile exportData(Map<String, Object> params) throws ScheduleException; | 18 | DataToolsFile exportData(Map<String, Object> params) throws ScheduleException; |
| 19 | } | 19 | } |
src/main/java/com/bsth/service/schedule/utils/DataToolsServiceImpl.java
| @@ -207,7 +207,7 @@ public class DataToolsServiceImpl implements DataToolsService { | @@ -207,7 +207,7 @@ public class DataToolsServiceImpl implements DataToolsService { | ||
| 207 | 207 | ||
| 208 | @Override | 208 | @Override |
| 209 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { | 209 | public DataToolsFile exportData(Map<String, Object> params) throws ScheduleException { |
| 210 | - // 导出数据 | 210 | + // export数据 |
| 211 | String transLogId = ""; | 211 | String transLogId = ""; |
| 212 | String transMetaLogId = ""; | 212 | String transMetaLogId = ""; |
| 213 | try { | 213 | try { |
| @@ -263,7 +263,7 @@ public class DataToolsServiceImpl implements DataToolsService { | @@ -263,7 +263,7 @@ public class DataToolsServiceImpl implements DataToolsService { | ||
| 263 | LOGGER.info(stringBuffer.toString()); | 263 | LOGGER.info(stringBuffer.toString()); |
| 264 | LOGGER.info("exportData success..."); | 264 | LOGGER.info("exportData success..."); |
| 265 | 265 | ||
| 266 | - // 导出目前是xls格式 | 266 | + // export目前是xls格式 |
| 267 | DataToolsFile dataToolsFile = new DataToolsFile(); | 267 | DataToolsFile dataToolsFile = new DataToolsFile(); |
| 268 | dataToolsFile.setFileType(DataToolsFileType.XLS); | 268 | dataToolsFile.setFileType(DataToolsFileType.XLS); |
| 269 | dataToolsFile.setFile(new File(filepath + ".xls")); | 269 | dataToolsFile.setFile(new File(filepath + ".xls")); |