潘钊 / bsth_control · Commits

Commit 3e580097403f609a68a5b88ab2914fd6803f5e48

Authored by 王通
1 parent a95f7713
build: skipped

1.国际化占位

Inline Side-by-side
Showing 96 changed files with 738 additions and 1260 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 96 of 875 files are displayed.

src/main/java/com/bsth/WebAppConfiguration.java
  View file @3e58009
@@ -6,9 +6,11 @@ import com.bsth.websocket.handler.RealControlSocketHandler; @@ -6,9 +6,11 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
6 import org.slf4j.Logger; 6 import org.slf4j.Logger;
7 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
8 import org.springframework.boot.web.servlet.FilterRegistrationBean; 8 import org.springframework.boot.web.servlet.FilterRegistrationBean;
  9 +import org.springframework.context.MessageSource;
9 import org.springframework.context.annotation.Bean; 10 import org.springframework.context.annotation.Bean;
10 import org.springframework.context.annotation.ComponentScan; 11 import org.springframework.context.annotation.ComponentScan;
11 import org.springframework.context.annotation.Configuration; 12 import org.springframework.context.annotation.Configuration;
  13 +import org.springframework.context.support.ResourceBundleMessageSource;
12 import org.springframework.web.filter.CharacterEncodingFilter; 14 import org.springframework.web.filter.CharacterEncodingFilter;
13 import org.springframework.web.filter.FormContentFilter; 15 import org.springframework.web.filter.FormContentFilter;
14 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; 16 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -63,4 +65,13 @@ public class WebAppConfiguration implements WebSocketConfigurer, WebMvcConfigure @@ -63,4 +65,13 @@ public class WebAppConfiguration implements WebSocketConfigurer, WebMvcConfigure
63 registry.addHandler(new RealControlSocketHandler(), "/sockjs/realcontrol").addInterceptors(new WebSocketHandshakeInterceptor()) 65 registry.addHandler(new RealControlSocketHandler(), "/sockjs/realcontrol").addInterceptors(new WebSocketHandshakeInterceptor())
64 .withSockJS(); 66 .withSockJS();
65 } 67 }
  68 +
  69 + @Bean
  70 + public MessageSource messageSource() {
  71 + ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
  72 + messageSource.setBasename("message");
  73 + messageSource.setDefaultEncoding("UTF-8");
  74 +
  75 + return messageSource;
  76 + }
66 } 77 }
src/main/java/com/bsth/common/ResponseCode.java
  View file @3e58009
@@ -10,7 +10,7 @@ package com.bsth.common; @@ -10,7 +10,7 @@ package com.bsth.common;
10 */ 10 */
11 public enum ResponseCode { 11 public enum ResponseCode {
12 12
13 - SUCCESS("操作成功", 200), 13 + SUCCESS("$$$$$${txt-3324}", 200),
14 NO_PERMISSION("无资源访问权限", 403), 14 NO_PERMISSION("无资源访问权限", 403),
15 NO_AUTHENTICATION("客户端未授权", 407), 15 NO_AUTHENTICATION("客户端未授权", 407),
16 ERROR("服务器异常", 500); 16 ERROR("服务器异常", 500);
src/main/java/com/bsth/controller/DeviceGpsController.java
  View file @3e58009
@@ -131,7 +131,7 @@ public class DeviceGpsController { @@ -131,7 +131,7 @@ public class DeviceGpsController {
131 Map<String, Object> detail = (Map<String, Object>)info.get("detail"); 131 Map<String, Object> detail = (Map<String, Object>)info.get("detail");
132 if (detail != null) { 132 if (detail != null) {
133 info.put("lineId", detail.get("lineId")); 133 info.put("lineId", detail.get("lineId"));
134 - info.put("valid", (int)detail.get("valid") == 0 ? "有效" : "无效"); 134 + info.put("valid", (int)detail.get("valid") == 0 ? "$$$$$${txt-3829}" : "$$$$$${txt-4006}");
135 info.put("timestamp", sdf.format(new Date((Long)detail.get("timestamp")))); 135 info.put("timestamp", sdf.format(new Date((Long)detail.get("timestamp"))));
136 info.put("version", detail.get("version")); 136 info.put("version", detail.get("version"));
137 } else { 137 } else {
@@ -143,11 +143,11 @@ public class DeviceGpsController { @@ -143,11 +143,11 @@ public class DeviceGpsController {
143 } 143 }
144 144
145 List<Header> head = new ArrayList<>(); 145 List<Header> head = new ArrayList<>();
146 - head.add(new Header("线路编码", "lineCode"));  
147 - head.add(new Header("线路名称", "lineName"));  
148 - head.add(new Header("内部编码", "inCode"));  
149 - head.add(new Header("识别码", "deviceId"));  
150 - head.add(new Header("线路ID", "lineId")); 146 + head.add(new Header("$$$$$${txt-3381}", "lineCode"));
  147 + head.add(new Header("$$$$$${txt-3347}", "lineName"));
  148 + head.add(new Header("$$$$$${txt-2576}", "inCode"));
  149 + head.add(new Header("$$$$$${txt-3562}", "deviceId"));
  150 + head.add(new Header("$$$$$${txt-3381}", "lineId"));
151 head.add(new Header("GPS", "valid")); 151 head.add(new Header("GPS", "valid"));
152 head.add(new Header("report", "timestamp")); 152 head.add(new Header("report", "timestamp"));
153 head.add(new Header("版本", "version")); 153 head.add(new Header("版本", "version"));
src/main/java/com/bsth/controller/calc/CalcExportController.java
  View file @3e58009
@@ -75,23 +75,23 @@ public class CalcExportController { @@ -75,23 +75,23 @@ public class CalcExportController {
75 List<Map<String, Object>> list = clacMixService.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth); 75 List<Map<String, Object>> list = clacMixService.calcjsyspy(line, startDate, endDate, empnames, cont, gsdmManth, fgsdmManth);
76 76
77 Map<String, Object> temp = new HashMap<String, Object>(); 77 Map<String, Object> temp = new HashMap<String, Object>();
78 - temp.put("i", "序号"); 78 + temp.put("i", "$$$$$${txt-3934}");
79 temp.put("jName", empnames); 79 temp.put("jName", empnames);
80 - temp.put("jhyybc", "计划营运班次");  
81 - temp.put("jhfyybc", "计划空驶班次");  
82 - temp.put("sjyybc", "实际营运班次");  
83 - temp.put("sjfyybc", "实际空驶班次");  
84 - temp.put("lbbc", "烂班班次");  
85 - temp.put("ljbc", "临加班次");  
86 - temp.put("jhzlc", "计划总里程");  
87 - temp.put("jhyylc", "计划营运里程");  
88 - temp.put("jhfyylc", "计划空驶里程");  
89 - temp.put("sjzlc", "实际总里程");  
90 - temp.put("sjyylc", "实际营运里程");  
91 - temp.put("sjfyylc", "实际空驶里程");  
92 - temp.put("lblc", "烂班里程");  
93 - temp.put("ljyylc", "临加营运里程");  
94 - temp.put("ljfyylc", "临加空驶里程"); 80 + temp.put("jhyybc", "$$$$$${txt-1496}");
  81 + temp.put("jhfyybc", "$$$$$${txt-4377}");
  82 + temp.put("sjyybc", "$$$$$${txt-1489}");
  83 + temp.put("sjfyybc", "$$$$$${txt-1532}");
  84 + temp.put("lbbc", "$$$$$${txt-2707}");
  85 + temp.put("ljbc", "$$$$$${txt-2705}");
  86 + temp.put("jhzlc", "$$$$$${txt-2003}");
  87 + temp.put("jhyylc", "$$$$$${txt-1495}");
  88 + temp.put("jhfyylc", "$$$$$${txt-1497}");
  89 + temp.put("sjzlc", "$$$$$${txt-2001}");
  90 + temp.put("sjyylc", "$$$$$${txt-1488}");
  91 + temp.put("sjfyylc", "$$$$$${txt-1490}");
  92 + temp.put("lblc", "$$$$$${txt-2706}");
  93 + temp.put("ljyylc", "$$$$$${txt-1494}");
  94 + temp.put("ljfyylc", "$$$$$${txt-4375}");
95 resList.add(temp); 95 resList.add(temp);
96 for(int i = 0; i < list.size(); i++){ 96 for(int i = 0; i < list.size(); i++){
97 temp = list.get(i); 97 temp = list.get(i);
@@ -114,7 +114,7 @@ public class CalcExportController { @@ -114,7 +114,7 @@ public class CalcExportController {
114 listI.add(resList.iterator()); 114 listI.add(resList.iterator());
115 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 115 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
116 ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcjsyspy.xls", 116 ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcjsyspy.xls",
117 - path+"export/"+date+"-"+lineName+"-人车班次公里统计.xls"); 117 + path+"export/"+date+"-"+lineName+"-$$$$$${txt-735}.xls");
118 resMap.put("status", ResponseCode.SUCCESS); 118 resMap.put("status", ResponseCode.SUCCESS);
119 } catch (Exception e) { 119 } catch (Exception e) {
120 e.printStackTrace(); 120 e.printStackTrace();
@@ -168,16 +168,16 @@ public class CalcExportController { @@ -168,16 +168,16 @@ public class CalcExportController {
168 List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc); 168 List<Map<String, Object>> list = clacMixService.singledatatj(line, startDate, endDate, tjtype, cont, gsdmSing, fgsdmSing, sfdc);
169 169
170 Map<String, Object> temp = new HashMap<String, Object>(); 170 Map<String, Object> temp = new HashMap<String, Object>();
171 - temp.put("i", "序号");  
172 - temp.put("gS", "所属公司");  
173 - temp.put("xlName", "线路"); 171 + temp.put("i", "$$$$$${txt-3934}");
  172 + temp.put("gS", "$$$$$${txt-2686}");
  173 + temp.put("xlName", "$$$$$${txt-3815}");
174 temp.put("jName", tjtype); 174 temp.put("jName", tjtype);
175 - temp.put("jhzlc", "计划公里");  
176 - temp.put("sjzlc", "行驶里程(包括空放)");  
177 - temp.put("sjfyylc", "空驶里程");  
178 - temp.put("hyl", "耗油量");  
179 - temp.put("jzl", "加注量");  
180 - temp.put("sh", "非营业用油"); 175 + temp.put("jhzlc", "$$$$$${txt-3185}");
  176 + temp.put("sjzlc", "$$$$$${txt-4363}");
  177 + temp.put("sjfyylc", "$$$$$${txt-2913}");
  178 + temp.put("hyl", "$$$$$${txt-3438}");
  179 + temp.put("jzl", "$$$$$${txt-3436}");
  180 + temp.put("sh", "$$$$$${txt-1913}");
181 181
182 resList.add(temp); 182 resList.add(temp);
183 for(int i = 0; i < list.size(); i++){ 183 for(int i = 0; i < list.size(); i++){
@@ -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+"-$$$$$${txt-4362}.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+"-$$$$$${txt-1005}.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
  View file @3e58009
@@ -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/$$$$$${txt-995}" + 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 + // $$$$$${txt-591}
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 + "-$$$$$${txt-543}.xls");
130 } catch (Exception e) { 130 } catch (Exception e) {
131 e.printStackTrace(); 131 e.printStackTrace();
132 } 132 }
@@ -174,17 +174,17 @@ public class ExportController { @@ -174,17 +174,17 @@ public class ExportController {
174 dateTime = sdfSimple.format(sdfMonth.parse(startDate)) 174 dateTime = sdfSimple.format(sdfMonth.parse(startDate))
175 +"-"+sdfSimple.format(sdfMonth.parse(endDate)); 175 +"-"+sdfSimple.format(sdfMonth.parse(endDate));
176 } 176 }
177 - if(map.get("empnames").equals("驾驶员")){ 177 + if(map.get("empnames").equals("$$$$$${txt-3568}")){
178 mouldurl="mould/shiftuehiclemanth.xls"; 178 mouldurl="mould/shiftuehiclemanth.xls";
179 - }else if(map.get("empnames").equals("售票员")){ 179 + }else if(map.get("empnames").equals("$$$$$${txt-3567}")){
180 mouldurl="mould/shiftuehiclemanthspy.xls"; 180 mouldurl="mould/shiftuehiclemanthspy.xls";
181 - }else if(map.get("empnames").equals("车辆自编号")){ 181 + }else if(map.get("empnames").equals("$$$$$${txt-2008}")){
182 mouldurl="mould/shiftuehiclemanthclzbh.xls"; 182 mouldurl="mould/shiftuehiclemanthclzbh.xls";
183 } 183 }
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 + "-$$$$$${txt-542}.xls");
188 } catch (Exception e) { 188 } catch (Exception e) {
189 e.printStackTrace(); 189 e.printStackTrace();
190 } 190 }
@@ -219,17 +219,17 @@ public class ExportController { @@ -219,17 +219,17 @@ public class ExportController {
219 219
220 try { 220 try {
221 String mouldurl = null; 221 String mouldurl = null;
222 - if(map.get("empnames").equals("驾驶员")){ 222 + if(map.get("empnames").equals("$$$$$${txt-3568}")){
223 mouldurl="mould/shiftuehiclemanth.xls"; 223 mouldurl="mould/shiftuehiclemanth.xls";
224 - }else if(map.get("empnames").equals("售票员")){ 224 + }else if(map.get("empnames").equals("$$$$$${txt-3567}")){
225 mouldurl="mould/shiftuehiclemanthspy.xls"; 225 mouldurl="mould/shiftuehiclemanthspy.xls";
226 - }else if(map.get("empnames").equals("车辆自编号")){ 226 + }else if(map.get("empnames").equals("$$$$$${txt-2008}")){
227 mouldurl="mould/shiftuehiclemanthclzbh.xls"; 227 mouldurl="mould/shiftuehiclemanthclzbh.xls";
228 } 228 }
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/$$$$$${txt-542}" + 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 }
@@ -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",new String[]{"jsy","sgh"}); 275 + path + "export/$$$$$${txt-2458}" + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls",new String[]{"jsy","sgh"});
276 } catch (Exception e) { 276 } catch (Exception e) {
277 e.printStackTrace(); 277 e.printStackTrace();
278 } 278 }
@@ -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/$$$$$${txt-2458}" + 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 + "-$$$$$${txt-2458}.xls");
367 } catch (Exception e) { 367 } catch (Exception e) {
368 e.printStackTrace(); 368 e.printStackTrace();
369 } 369 }
@@ -405,7 +405,7 @@ public class ExportController { @@ -405,7 +405,7 @@ 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/$$$$$${txt-2458}" + 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 }
@@ -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 + "-$$$$$${txt-2462}.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 + // $$$$$${txt-730}
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 + "-$$$$$${txt-730}.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 + // $$$$$${txt-597}
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 + "-$$$$$${txt-597}.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 + // $$$$$${txt-406}
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,14 +595,14 @@ public class ExportController { @@ -595,14 +595,14 @@ 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 + "-$$$$$${txt-406}.xls");
599 } catch (Exception e) { 599 } catch (Exception e) {
600 e.printStackTrace(); 600 e.printStackTrace();
601 } 601 }
602 return resList; 602 return resList;
603 } 603 }
604 604
605 - //班次执行率统计表 605 + //$$$$$${txt-741}
606 @RequestMapping(value = "/executionrateExport", method = RequestMethod.POST) 606 @RequestMapping(value = "/executionrateExport", method = RequestMethod.POST)
607 public List<Map<String, Object>> executionrateExport(@RequestParam Map<String, Object> map) { 607 public List<Map<String, Object>> executionrateExport(@RequestParam Map<String, Object> map) {
608 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); 608 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -669,7 +669,7 @@ public class ExportController { @@ -669,7 +669,7 @@ public class ExportController {
669 try { 669 try {
670 listI.add(resList.iterator()); 670 listI.add(resList.iterator());
671 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 671 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
672 - ee.excelReplace(listI, new Object[] { map1 }, path + "mould/executionrate.xls", path + "export/班次执行率统计表" 672 + ee.excelReplace(listI, new Object[] { map1 }, path + "mould/executionrate.xls", path + "export/$$$$$${txt-741}"
673 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); 673 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
674 } catch (Exception e) { 674 } catch (Exception e) {
675 e.printStackTrace(); 675 e.printStackTrace();
@@ -678,7 +678,7 @@ public class ExportController { @@ -678,7 +678,7 @@ public class ExportController {
678 } 678 }
679 679
680 680
681 - ////营运线路名称统计表 681 + ////$$$$$${txt-534}
682 @RequestMapping(value = "/alllineExport", method = RequestMethod.POST) 682 @RequestMapping(value = "/alllineExport", method = RequestMethod.POST)
683 public List<Map<String, Object>> alllineExport(@RequestParam Map<String, Object> map) { 683 public List<Map<String, Object>> alllineExport(@RequestParam Map<String, Object> map) {
684 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd"); 684 SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"), sdfSimple = new SimpleDateFormat("yyyyMMdd");
@@ -738,7 +738,7 @@ public class ExportController { @@ -738,7 +738,7 @@ public class ExportController {
738 try { 738 try {
739 listI.add(resList.iterator()); 739 listI.add(resList.iterator());
740 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 740 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
741 - ee.excelReplace(listI, new Object[] { map1 }, path + "mould/allline.xls", path + "export/营运线路名称统计表" 741 + ee.excelReplace(listI, new Object[] { map1 }, path + "mould/allline.xls", path + "export/$$$$$${txt-534}"
742 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls"); 742 + sdfSimple.format(sdfMonth.parse(map.get("startDate").toString())) + ".xls");
743 } catch (Exception e) { 743 } catch (Exception e) {
744 e.printStackTrace(); 744 e.printStackTrace();
@@ -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 + "-$$$$$${txt-1897}.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
  View file @3e58009
@@ -51,28 +51,28 @@ public class MCY_FormsController { @@ -51,28 +51,28 @@ public class MCY_FormsController {
51 return formsService.linepasswengerflow(map); 51 return formsService.linepasswengerflow(map);
52 } 52 }
53 53
54 - // 班次车辆人员月报表 54 + // $$$$$${txt-542}
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 + // $$$$$${txt-542}
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 + // $$$$$${txt-591}
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 + // $$$$$${txt-539}
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
@@ -118,35 +118,35 @@ public class MCY_FormsController { @@ -118,35 +118,35 @@ public class MCY_FormsController {
118 return formsService.vehicleloading(line, data); 118 return formsService.vehicleloading(line, data);
119 } 119 }
120 120
121 - // 运营服务阶段报表 121 + // $$$$$${txt-730}
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 + // $$$$$${txt-406}
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
132 return formsService.turnoutrate(map); 132 return formsService.turnoutrate(map);
133 } 133 }
134 134
135 - // 班次执行率统计表 135 + // $$$$$${txt-741}
136 @RequestMapping(value = "/executionrate", method = RequestMethod.POST) 136 @RequestMapping(value = "/executionrate", method = RequestMethod.POST)
137 public List<Executionrate> executionrate(@RequestParam Map<String, Object> map) { 137 public List<Executionrate> executionrate(@RequestParam Map<String, Object> map) {
138 138
139 return formsService.executionrate(map); 139 return formsService.executionrate(map);
140 } 140 }
141 141
142 - // 营运线路名称统计表 142 + // $$$$$${txt-534}
143 @RequestMapping(value = "/allline", method = RequestMethod.POST) 143 @RequestMapping(value = "/allline", method = RequestMethod.POST)
144 public List<Allline> allline(@RequestParam Map<String, Object> map) { 144 public List<Allline> allline(@RequestParam Map<String, Object> map) {
145 145
146 return formsService.allline(map); 146 return formsService.allline(map);
147 } 147 }
148 148
149 - // 营运线路名称统计表 149 + // $$$$$${txt-534}
150 @RequestMapping(value = "/daily", method = RequestMethod.GET) 150 @RequestMapping(value = "/daily", method = RequestMethod.GET)
151 public List<Daily> daily(@RequestParam Map<String, Object> map) { 151 public List<Daily> daily(@RequestParam Map<String, Object> map) {
152 152
src/main/java/com/bsth/controller/jdtest/JdTestController.java
  View file @3e58009
@@ -77,18 +77,18 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{ @@ -77,18 +77,18 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{
77 } 77 }
78 m.put("rylx", rylx); 78 m.put("rylx", rylx);
79 m.put("ns", y.getNs()==null?"0":y.getNs()); 79 m.put("ns", y.getNs()==null?"0":y.getNs());
80 - String shyy ="无"; 80 + String shyy ="$$$$$${txt-4226}";
81 if(y.getShyy()!=null){ 81 if(y.getShyy()!=null){
82 shyy=y.getShyy(); 82 shyy=y.getShyy();
83 - if(shyy.equals("1")){shyy="票务用油";}  
84 - else if(shyy.equals("2")){shyy="保养用油";}  
85 - else if(shyy.equals("3")){shyy="报废车用油";}  
86 - else if(shyy.equals("4")){shyy="其它用油";}  
87 - else if(shyy.equals("5")){shyy="人保部";}  
88 - else if(shyy.equals("6")){shyy="车队";}  
89 - else if(shyy.equals("7")){shyy="车间(高保)";}  
90 - else if(shyy.equals("8")){shyy="车间(小修)";}  
91 - else{shyy ="无";} 83 + if(shyy.equals("1")){shyy="$$$$$${txt-2788}";}
  84 + else if(shyy.equals("2")){shyy="$$$$$${txt-2787}";}
  85 + else if(shyy.equals("3")){shyy="$$$$$${txt-2032}";}
  86 + else if(shyy.equals("4")){shyy="$$$$$${txt-2785}";}
  87 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  88 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  89 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  90 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  91 + else{shyy ="$$$$$${txt-4226}";}
92 } 92 }
93 m.put("shyy", shyy); 93 m.put("shyy", shyy);
94 m.put("sh", y.getSh()<=0?"0":y.getSh()); 94 m.put("sh", y.getSh()<=0?"0":y.getSh());
@@ -102,7 +102,7 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{ @@ -102,7 +102,7 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{
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()+ "$$$$$${txt-1596}.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&lt;Ylb, Integer&gt;{ @@ -141,7 +141,7 @@ public class JdTestController extends BaseController&lt;Ylb, Integer&gt;{
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 + "-$$$$$${txt-1897}.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
  View file @3e58009
@@ -166,18 +166,18 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{ @@ -166,18 +166,18 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
166 m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc()); 166 m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
167 m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc()); 167 m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
168 m.put("hd", y.getHd()<=0?"0":y.getHd()); 168 m.put("hd", y.getHd()<=0?"0":y.getHd());
169 - String shyy ="无"; 169 + String shyy ="$$$$$${txt-4226}";
170 if(y.getShyy()!=null){ 170 if(y.getShyy()!=null){
171 shyy=y.getShyy(); 171 shyy=y.getShyy();
172 - if(shyy.equals("1")){shyy="票务用电";}  
173 - else if(shyy.equals("2")){shyy="保养用电";}  
174 - else if(shyy.equals("3")){shyy="报废车用电";}  
175 - else if(shyy.equals("4")){shyy="其它用电";}  
176 - else if(shyy.equals("5")){shyy="人保部";}  
177 - else if(shyy.equals("6")){shyy="车队";}  
178 - else if(shyy.equals("7")){shyy="车间(高保)";}  
179 - else if(shyy.equals("8")){shyy="车间(小修)";}  
180 - else{shyy ="无";} 172 + if(shyy.equals("1")){shyy="$$$$$${txt-2538}";}
  173 + else if(shyy.equals("2")){shyy="$$$$$${txt-2530}";}
  174 + else if(shyy.equals("3")){shyy="$$$$$${txt-1945}";}
  175 + else if(shyy.equals("4")){shyy="$$$$$${txt-2529}";}
  176 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  177 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  178 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  179 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  180 + else{shyy ="$$$$$${txt-4226}";}
181 } 181 }
182 m.put("ns", y.getNs()<=0?"0":y.getNs()); 182 m.put("ns", y.getNs()<=0?"0":y.getNs());
183 m.put("shyy", shyy); 183 m.put("shyy", shyy);
@@ -193,7 +193,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{ @@ -193,7 +193,7 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
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()+ "$$$$$${txt-1655}.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
  View file @3e58009
@@ -61,7 +61,7 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -61,7 +61,7 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{
61 m.put("jzlc", "0"); 61 m.put("jzlc", "0");
62 m.put("sh", y.getSh()==null?"0":y.getSh()); 62 m.put("sh", y.getSh()==null?"0":y.getSh());
63 63
64 - String shyy ="无"; 64 + String shyy ="$$$$$${txt-4226}";
65 65
66 if(nylx.equals("0")){ 66 if(nylx.equals("0")){
67 m.put("jzl", y.getJzl()==null?"0":y.getJzl()); 67 m.put("jzl", y.getJzl()==null?"0":y.getJzl());
@@ -71,15 +71,15 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -71,15 +71,15 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{
71 71
72 if(y.getShyy()!=null){ 72 if(y.getShyy()!=null){
73 shyy=y.getShyy(); 73 shyy=y.getShyy();
74 - if(shyy.equals("1")){shyy="票务用油";}  
75 - else if(shyy.equals("2")){shyy="保养用油";}  
76 - else if(shyy.equals("3")){shyy="报废车用油";}  
77 - else if(shyy.equals("4")){shyy="其它用油";}  
78 - else if(shyy.equals("5")){shyy="人保部";}  
79 - else if(shyy.equals("6")){shyy="车队";}  
80 - else if(shyy.equals("7")){shyy="车间(高保)";}  
81 - else if(shyy.equals("8")){shyy="车间(小修)";}  
82 - else{shyy ="无";} 74 + if(shyy.equals("1")){shyy="$$$$$${txt-2788}";}
  75 + else if(shyy.equals("2")){shyy="$$$$$${txt-2787}";}
  76 + else if(shyy.equals("3")){shyy="$$$$$${txt-2032}";}
  77 + else if(shyy.equals("4")){shyy="$$$$$${txt-2785}";}
  78 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  79 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  80 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  81 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  82 + else{shyy ="$$$$$${txt-4226}";}
83 } 83 }
84 m.put("zyh", Arith.add(m.get("sh"), m.get("yh"))); 84 m.put("zyh", Arith.add(m.get("sh"), m.get("yh")));
85 85
@@ -96,15 +96,15 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -96,15 +96,15 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{
96 m.put("hd", y.getYh()==null?"0":y.getYh()); 96 m.put("hd", y.getYh()==null?"0":y.getYh());
97 if(y.getShyy()!=null){ 97 if(y.getShyy()!=null){
98 shyy=y.getShyy(); 98 shyy=y.getShyy();
99 - if(shyy.equals("1")){shyy="票务用电";}  
100 - else if(shyy.equals("2")){shyy="保养用电";}  
101 - else if(shyy.equals("3")){shyy="报废车用电";}  
102 - else if(shyy.equals("4")){shyy="其它用电";}  
103 - else if(shyy.equals("5")){shyy="人保部";}  
104 - else if(shyy.equals("6")){shyy="车队";}  
105 - else if(shyy.equals("7")){shyy="车间(高保)";}  
106 - else if(shyy.equals("8")){shyy="车间(小修)";}  
107 - else{shyy ="无";} 99 + if(shyy.equals("1")){shyy="$$$$$${txt-2538}";}
  100 + else if(shyy.equals("2")){shyy="$$$$$${txt-2530}";}
  101 + else if(shyy.equals("3")){shyy="$$$$$${txt-1945}";}
  102 + else if(shyy.equals("4")){shyy="$$$$$${txt-2529}";}
  103 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  104 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  105 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  106 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  107 + else{shyy ="$$$$$${txt-4226}";}
108 } 108 }
109 m.put("zyh", Arith.add(m.get("sh"), m.get("hd"))); 109 m.put("zyh", Arith.add(m.get("sh"), m.get("hd")));
110 m.put("rdlx", ""); 110 m.put("rdlx", "");
@@ -124,10 +124,10 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -124,10 +124,10 @@ public class LsylbController extends BaseController&lt;Ylb, Integer&gt;{
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="$$$$$${txt-1596}.xls";
128 }else{ 128 }else{
129 xls="listDl.xls"; 129 xls="listDl.xls";
130 - name="进出场存电量.xls"; 130 + name="$$$$$${txt-1655}.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
  View file @3e58009
@@ -165,18 +165,18 @@ public class QlbController extends BaseController&lt;Qlb, Integer&gt;{ @@ -165,18 +165,18 @@ public class QlbController extends BaseController&lt;Qlb, Integer&gt;{
165 m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc()); 165 m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
166 m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc()); 166 m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
167 m.put("hn", y.getHn()<=0?"0":y.getHn()); 167 m.put("hn", y.getHn()<=0?"0":y.getHn());
168 - String shyy ="无"; 168 + String shyy ="$$$$$${txt-4226}";
169 if(y.getShyy()!=null){ 169 if(y.getShyy()!=null){
170 shyy=y.getShyy(); 170 shyy=y.getShyy();
171 - if(shyy.equals("1")){shyy="票务用";}  
172 - else if(shyy.equals("2")){shyy="保养用";}  
173 - else if(shyy.equals("3")){shyy="报废车用";}  
174 - else if(shyy.equals("4")){shyy="其它用";}  
175 - else if(shyy.equals("5")){shyy="人保部";}  
176 - else if(shyy.equals("6")){shyy="车队";}  
177 - else if(shyy.equals("7")){shyy="车间(高保)";}  
178 - else if(shyy.equals("8")){shyy="车间(小修)";}  
179 - else{shyy ="无";} 171 + if(shyy.equals("1")){shyy="$$$$$${txt-3544}";}
  172 + else if(shyy.equals("2")){shyy="$$$$$${txt-3543}";}
  173 + else if(shyy.equals("3")){shyy="$$$$$${txt-2786}";}
  174 + else if(shyy.equals("4")){shyy="$$$$$${txt-3542}";}
  175 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  176 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  177 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  178 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  179 + else{shyy ="$$$$$${txt-4226}";}
180 } 180 }
181 m.put("ns", y.getNs()<=0?"0":y.getNs()); 181 m.put("ns", y.getNs()<=0?"0":y.getNs());
182 m.put("shyy", shyy); 182 m.put("shyy", shyy);
@@ -192,7 +192,7 @@ public class QlbController extends BaseController&lt;Qlb, Integer&gt;{ @@ -192,7 +192,7 @@ public class QlbController extends BaseController&lt;Qlb, Integer&gt;{
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()+ "$$$$$${txt-1654}.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
  View file @3e58009
@@ -104,7 +104,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -104,7 +104,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
104 } 104 }
105 105
106 /** 106 /**
107 - * 进场油量等于出场油量 107 + * $$$$$${txt-447}
108 * @param map 108 * @param map
109 * @return 109 * @return
110 */ 110 */
@@ -325,18 +325,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -325,18 +325,18 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
325 } 325 }
326 m.put("rylx", rylx); 326 m.put("rylx", rylx);
327 m.put("ns", y.getNs()==null?"0":y.getNs()); 327 m.put("ns", y.getNs()==null?"0":y.getNs());
328 - String shyy ="无"; 328 + String shyy ="$$$$$${txt-4226}";
329 if(y.getShyy()!=null){ 329 if(y.getShyy()!=null){
330 shyy=y.getShyy(); 330 shyy=y.getShyy();
331 - if(shyy.equals("1")){shyy="票务用油";}  
332 - else if(shyy.equals("2")){shyy="保养用油";}  
333 - else if(shyy.equals("3")){shyy="报废车用油";}  
334 - else if(shyy.equals("4")){shyy="其它用油";}  
335 - else if(shyy.equals("5")){shyy="人保部";}  
336 - else if(shyy.equals("6")){shyy="车队";}  
337 - else if(shyy.equals("7")){shyy="车间(高保)";}  
338 - else if(shyy.equals("8")){shyy="车间(小修)";}  
339 - else{shyy ="无";} 331 + if(shyy.equals("1")){shyy="$$$$$${txt-2788}";}
  332 + else if(shyy.equals("2")){shyy="$$$$$${txt-2787}";}
  333 + else if(shyy.equals("3")){shyy="$$$$$${txt-2032}";}
  334 + else if(shyy.equals("4")){shyy="$$$$$${txt-2785}";}
  335 + else if(shyy.equals("5")){shyy="$$$$$${txt-3541}";}
  336 + else if(shyy.equals("6")){shyy="$$$$$${txt-3978}";}
  337 + else if(shyy.equals("7")){shyy="$$$$$${txt-3976}";}
  338 + else if(shyy.equals("8")){shyy="$$$$$${txt-3975}";}
  339 + else{shyy ="$$$$$${txt-4226}";}
340 } 340 }
341 m.put("shyy", shyy); 341 m.put("shyy", shyy);
342 m.put("sh", y.getSh()<=0?"0":y.getSh()); 342 m.put("sh", y.getSh()<=0?"0":y.getSh());
@@ -350,7 +350,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{ @@ -350,7 +350,7 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
350 listI.add(resList.iterator()); 350 listI.add(resList.iterator());
351 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 351 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
352 ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", 352 ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
353 - path+"export/"+map.get("rq").toString()+ "进出场存油量.xls"); 353 + path+"export/"+map.get("rq").toString()+ "$$$$$${txt-1596}.xls");
354 } catch (Exception e) { 354 } catch (Exception e) {
355 e.printStackTrace(); 355 e.printStackTrace();
356 } 356 }
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
  View file @3e58009
@@ -258,7 +258,7 @@ public class AdminUtilsController { @@ -258,7 +258,7 @@ public class AdminUtilsController {
258 LoggerContext context = (LoggerContext)LoggerFactory.getILoggerFactory(); 258 LoggerContext context = (LoggerContext)LoggerFactory.getILoggerFactory();
259 context.getLogger("root").setLevel(Level.toLevel(level)); 259 context.getLogger("root").setLevel(Level.toLevel(level));
260 rs.put("errCode", 0); 260 rs.put("errCode", 0);
261 - rs.put("errMsg", "成功"); 261 + rs.put("errMsg", "$$$$$${txt-4082}");
262 262
263 return rs; 263 return rs;
264 } 264 }
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
  View file @3e58009
@@ -926,7 +926,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -926,7 +926,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
926 new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls"); 926 new ReportUtils().excelReplace(iterators, new Object[]{}, sourcePath, path + "export/" + date + "-花博会专线班次.xls");
927 927
928 res.put("status", ResponseCode.SUCCESS); 928 res.put("status", ResponseCode.SUCCESS);
929 - res.put("msg", "成功"); 929 + res.put("msg", "$$$$$${txt-4082}");
930 } catch (Exception e) { 930 } catch (Exception e) {
931 res.put("status", ResponseCode.ERROR); 931 res.put("status", ResponseCode.ERROR);
932 res.put("msg", e.getMessage()); 932 res.put("msg", e.getMessage());
@@ -999,9 +999,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo, @@ -999,9 +999,9 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
999 public String getXlDirStr() { 999 public String getXlDirStr() {
1000 xlDirStr = ""; 1000 xlDirStr = "";
1001 if (xlDir == 0) { 1001 if (xlDir == 0) {
1002 - xlDirStr = "上行"; 1002 + xlDirStr = "$$$$$${txt-3858}";
1003 } else if (xlDir == 1) { 1003 } else if (xlDir == 1) {
1004 - xlDirStr = "下行"; 1004 + xlDirStr = "$$$$$${txt-3857}";
1005 } 1005 }
1006 return xlDirStr; 1006 return xlDirStr;
1007 } 1007 }
src/main/java/com/bsth/controller/report/ReportController.java
  View file @3e58009
@@ -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?"$$$$$${txt-3858}":"$$$$$${txt-3857}");
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+"-$$$$$${txt-2194}.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?"$$$$$${txt-3858}":"$$$$$${txt-3857}");
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+"-$$$$$${txt-2194}.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+"-$$$$$${txt-592}.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/$$$$$${txt-766}.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($$$$$${txt-621}导出数据)
400 * 400 *
401 * @param map <tables> 401 * @param map <tables>
402 * 402 *
src/main/java/com/bsth/controller/schedule/core/legacy/EmployeeConfigInfoController.java
  View file @3e58009
@@ -77,7 +77,7 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo @@ -77,7 +77,7 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
77 public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception { 77 public void exportValidateGetDestroyInfo(HttpServletResponse response) throws Exception {
78 // 流输出导出文件 78 // 流输出导出文件
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-929}.txt", "UTF-8"));
81 response.setContentType("application/octet-stream"); 81 response.setContentType("application/octet-stream");
82 82
83 try ( 83 try (
src/main/java/com/bsth/controller/schedule/datasync/VehicleDataSyncController.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.controller.schedule.datasync;  
2 -  
3 -import com.bsth.controller.schedule.BController;  
4 -import com.bsth.controller.schedule.datasync.common.ApiResult;  
5 -import com.bsth.controller.schedule.datasync.request.VehicleDataSyncTaskRequest;  
6 -import com.bsth.entity.schedule.datasync.VehicleDataSyncTask;  
7 -import com.bsth.entity.schedule.datasync.VehicleDataSyncTaskTypeEnum;  
8 -import com.bsth.service.schedule.datasync.VehicleDataSyncTaskService;  
9 -import com.bsth.service.schedule.utils.DataToolsProperties;  
10 -import com.bsth.service.schedule.utils.MyHttpUtils;  
11 -import org.apache.commons.vfs2.FileObject;  
12 -import org.apache.commons.vfs2.FileSystem;  
13 -import org.apache.commons.vfs2.FilesCache;  
14 -import org.pentaho.di.core.vfs.KettleVFS;  
15 -import org.springframework.beans.factory.annotation.Autowired;  
16 -import org.springframework.web.bind.annotation.*;  
17 -  
18 -import javax.servlet.http.HttpServletResponse;  
19 -import java.io.File;  
20 -import java.util.Date;  
21 -  
22 -@RestController  
23 -@RequestMapping("dataSync/vehicle")  
24 -public class VehicleDataSyncController extends BController<VehicleDataSyncTask, Long> {  
25 - @Autowired  
26 - private VehicleDataSyncTaskService vehicleDataSyncService;  
27 -  
28 - //------------------ 外部系统调用的api（如下）-----------------------//  
29 - /**  
30 - * 添加任务（此接口用于外部系统调用）。  
31 - * @return  
32 - */  
33 - @GetMapping(value = "/api/addTask")  
34 - public ApiResult addTask() {  
35 - try {  
36 - // 远程触发，使用当前服务器时间作为参数  
37 - Date currentDate = new Date();  
38 - VehicleDataSyncTask task = VehicleDataSyncTask.builder()  
39 - .type(VehicleDataSyncTaskTypeEnum.REMOTE_TRIGGER) // 类型  
40 - .paramFrom(currentDate)  
41 - .paramTo(currentDate)  
42 - .build();  
43 - this.vehicleDataSyncService.addToDataSyncTaskQueue(task);  
44 - return ApiResult.success(  
45 - "200",  
46 - "添加同步任务成功",  
47 - "添加同步任务成功");  
48 - } catch (Exception exp) {  
49 - return ApiResult.failure(  
50 - "500",  
51 - "添加同步任务失败，内部错误：" + exp.getMessage());  
52 - }  
53 - }  
54 - //------------------ 外部系统调用的api（如上）-----------------------//  
55 -  
56 - @Autowired  
57 - private DataToolsProperties dataToolsProperties;  
58 - /**  
59 - * 刷新缓存。  
60 - * @return  
61 - */  
62 - @GetMapping(value = "/refreshBuffer")  
63 - public ApiResult refreshBuffer() {  
64 - try {  
65 - // 1、刷新车辆同步ETL文件  
66 - // 注意：使用Kettle内部的相关类清除指定ktr的缓存  
67 - File ktrFile = new File(this.getClass().getResource(  
68 - dataToolsProperties.getVehicleDatasyncktr()).toURI());  
69 - FileObject fileObject = KettleVFS.getFileObject(ktrFile.getAbsolutePath());  
70 - FileSystem fileSystem = fileObject.getFileSystem();  
71 - FilesCache filesCache = KettleVFS.getInstance().getFileSystemManager().getFilesCache();  
72 -// System.out.println(filesCache.getFile(fileSystem, fileObject.getName()));  
73 - filesCache.removeFile(fileSystem, fileObject.getName());  
74 -  
75 - return ApiResult.success(  
76 - "200",  
77 - "刷新成功",  
78 - "刷新成功");  
79 - } catch (Exception exp) {  
80 - exp.printStackTrace();  
81 - return ApiResult.failure(  
82 - "500",  
83 - "刷新失败，内部错误：" + exp.getMessage());  
84 - }  
85 - }  
86 -  
87 - /**  
88 - * 手动添加同步任务。  
89 - * @param vehicleDataSyncTaskRequest  
90 - * @return  
91 - */  
92 - @PostMapping(value = "/addTask")  
93 - public ApiResult addTask(@RequestBody VehicleDataSyncTaskRequest vehicleDataSyncTaskRequest) {  
94 - try {  
95 - VehicleDataSyncTask task = VehicleDataSyncTask.builder()  
96 - .type(VehicleDataSyncTaskTypeEnum.ACTIVE_TRIGGER) // 类型  
97 - .paramClzbh(vehicleDataSyncTaskRequest.getParamClzbh())  
98 - .paramFrom(vehicleDataSyncTaskRequest.getParamFrom())  
99 - .paramTo(vehicleDataSyncTaskRequest.getParamTo())  
100 - .build();  
101 - this.vehicleDataSyncService.addToDataSyncTaskQueue(task);  
102 - return ApiResult.success(  
103 - "200",  
104 - "添加同步任务成功",  
105 - "添加同步任务成功");  
106 - } catch (Exception exp) {  
107 - return ApiResult.failure(  
108 - "500",  
109 - "添加同步任务失败，内部错误：" + exp.getMessage());  
110 - }  
111 - }  
112 -  
113 - /**  
114 - * 获取日志相关文件。  
115 - * @param response  
116 - * @param id 日志Id  
117 - */  
118 - @GetMapping(value = "/logfile/{id}/{type}")  
119 - public void exportTaskLogFile(  
120 - HttpServletResponse response,  
121 - @PathVariable("id") long id,  
122 - @PathVariable("type") Integer type) {  
123 - File file;  
124 - if (type == 1) {  
125 - file = this.vehicleDataSyncService.getTaskLogFile(id);  
126 - } else if (type == 2) {  
127 - file = this.vehicleDataSyncService.getTaskValidateErrorFile(id);  
128 - } else if (type == 3) {  
129 - file = this.vehicleDataSyncService.getTaskPrepareFile(id);  
130 - } else if (type == 4) {  
131 - file = this.vehicleDataSyncService.getTaskAddErrorFile(id);  
132 - } else if (type == 5) {  
133 - file = this.vehicleDataSyncService.getTaskUpdateErrorFile(id);  
134 - } else if (type == 6) {  
135 - file = this.vehicleDataSyncService.getTaskDeviceAddErrorFile(id);  
136 - } else {  
137 - throw new RuntimeException("未知类型[" + type + "]的日志文件！");  
138 - }  
139 -  
140 - if (file == null || !file.exists()) {  
141 - throw new RuntimeException("日志文件不存在！");  
142 - }  
143 -  
144 - try {  
145 - MyHttpUtils.responseStreamFile(response, file);  
146 - } catch (Exception exp) {  
147 - exp.printStackTrace();  
148 - throw new RuntimeException("获取同步日志文件错误：" + exp.getMessage());  
149 - }  
150 - }  
151 -  
152 -}  
src/main/java/com/bsth/controller/schedule/datasync/common/ApiResult.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.controller.schedule.datasync.common;  
2 -  
3 -import java.io.Serializable;  
4 -  
5 -/**  
6 - * 对外api接口返回类。  
7 - */  
8 -public class ApiResult implements Serializable {  
9 - private static final long serialVersionUID = 2100700232168722289L;  
10 -  
11 - /** 返回数据 */  
12 - private Object result;  
13 - /** 是否成功 */  
14 - private Boolean success;  
15 - /** 返回描述 */  
16 - private String msg;  
17 - /** 返回码 */  
18 - private String code;  
19 -  
20 - // TODO：可能还有其他字段  
21 -  
22 -  
23 - public Object getResult() {  
24 - return result;  
25 - }  
26 -  
27 - public void setResult(Object result) {  
28 - this.result = result;  
29 - }  
30 -  
31 - public Boolean getSuccess() {  
32 - return success;  
33 - }  
34 -  
35 - public void setSuccess(Boolean success) {  
36 - this.success = success;  
37 - }  
38 -  
39 - public String getMsg() {  
40 - return msg;  
41 - }  
42 -  
43 - public void setMsg(String msg) {  
44 - this.msg = msg;  
45 - }  
46 -  
47 - public String getCode() {  
48 - return code;  
49 - }  
50 -  
51 - public void setCode(String code) {  
52 - this.code = code;  
53 - }  
54 -  
55 - public ApiResult() {}  
56 - public ApiResult(Builder builder) {  
57 - this.result = builder.result;  
58 - this.success = builder.success;  
59 - this.msg = builder.msg;  
60 - this.code = builder.code;  
61 - }  
62 -  
63 - public static ApiResult success(String code, String msg, Object result) {  
64 - return ApiResult.getBuilder()  
65 - .setResult(result)  
66 - .setMsg(msg)  
67 - .setCode(code)  
68 - .setSuccess(true)  
69 - .build();  
70 - }  
71 - public static ApiResult failure(String code, String msg) {  
72 - return ApiResult.getBuilder()  
73 - .setCode(code)  
74 - .setMsg(msg)  
75 - .setSuccess(false)  
76 - .build();  
77 - }  
78 -  
79 - static Builder getBuilder() {  
80 - return new Builder();  
81 - }  
82 - static class Builder {  
83 - /** 返回数据 */  
84 - private Object result;  
85 - /** 是否成功 */  
86 - private Boolean success;  
87 - /** 返回描述 */  
88 - private String msg;  
89 - /** 返回码 */  
90 - private String code;  
91 -  
92 - public Builder setResult(Object result) {  
93 - this.result = result;  
94 - return this;  
95 - }  
96 -  
97 - public Builder setSuccess(Boolean success) {  
98 - this.success = success;  
99 - return this;  
100 - }  
101 -  
102 - public Builder setMsg(String msg) {  
103 - this.msg = msg;  
104 - return this;  
105 - }  
106 -  
107 - public Builder setCode(String code) {  
108 - this.code = code;  
109 - return this;  
110 - }  
111 -  
112 - public ApiResult build() {  
113 - return new ApiResult(this);  
114 - }  
115 - }  
116 -  
117 -}  
src/main/java/com/bsth/controller/schedule/datasync/request/VehicleDataSyncTaskRequest.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.controller.schedule.datasync.request;  
2 -  
3 -import lombok.AllArgsConstructor;  
4 -import lombok.Builder;  
5 -import lombok.Data;  
6 -import lombok.ToString;  
7 -  
8 -import java.util.Date;  
9 -  
10 -/**  
11 - * 车辆信息同步任务请求对象。  
12 - */  
13 -@Data  
14 -@Builder  
15 -@AllArgsConstructor  
16 -@ToString  
17 -public class VehicleDataSyncTaskRequest {  
18 - /** 车辆自编号（针对同步来源数据，如：车辆库中，自编号为S01-001的车辆信息） */  
19 - private String paramClzbh;  
20 -  
21 - /** 开始时间（针对同步来源数据，如：车辆库中，某段时间内的新增和报废车辆） */  
22 - private Date paramFrom;  
23 - /** 结束时间（针对数据源） */  
24 - private Date paramTo;  
25 -  
26 - public VehicleDataSyncTaskRequest() {}  
27 -}  
src/main/java/com/bsth/controller/sys/UserController.java
  View file @3e58009
@@ -179,7 +179,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; { @@ -179,7 +179,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
179 if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) { 179 if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) {
180 String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY); 180 String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
181 if (StringUtils.isBlank(captcha)) { 181 if (StringUtils.isBlank(captcha)) {
182 - return put(rs, "msg", "请输入验证码"); 182 + return put(rs, "msg", "$$$$$${txt-2321}");
183 } 183 }
184 if (!verCode.equals(captcha)) { 184 if (!verCode.equals(captcha)) {
185 return put(rs, "msg", "验证码有误，请刷新后重新输入"); 185 return put(rs, "msg", "验证码有误，请刷新后重新输入");
@@ -335,9 +335,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; { @@ -335,9 +335,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
335 Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION"); 335 Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
336 336
337 if (obj instanceof BadCredentialsException) 337 if (obj instanceof BadCredentialsException)
338 - msg = "登录失败，用户名或密码错误."; 338 + msg = "用户名或密码错误.";
339 else if (obj instanceof SessionAuthenticationException) 339 else if (obj instanceof SessionAuthenticationException)
340 - msg = "登录失败，当前策略不允许重复登录."; 340 + msg = "当前策略不允许重复登录.";
341 session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION"); 341 session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
342 return msg; 342 return msg;
343 } 343 }
@@ -387,7 +387,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; { @@ -387,7 +387,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
387 if (newPWD.equals(cnewPWD)) { 387 if (newPWD.equals(cnewPWD)) {
388 sysUserService.changePWD(sysUser.getId(), newPWD); 388 sysUserService.changePWD(sysUser.getId(), newPWD);
389 request.getSession().setAttribute(Constants.WEAK_CIPHER, 0); 389 request.getSession().setAttribute(Constants.WEAK_CIPHER, 0);
390 - msg = "修改成功！"; 390 + msg = "$$$$$${txt-1902}";
391 } else { 391 } else {
392 msg = "新密码两次输入不一致！"; 392 msg = "新密码两次输入不一致！";
393 } 393 }
src/main/java/com/bsth/data/Station2ParkBuffer.java
  View file @3e58009
@@ -192,7 +192,7 @@ public class Station2ParkBuffer implements CommandLineRunner { @@ -192,7 +192,7 @@ public class Station2ParkBuffer implements CommandLineRunner {
192 } 192 }
193 else{ 193 else{
194 rs.put("status", ResponseCode.SUCCESS); 194 rs.put("status", ResponseCode.SUCCESS);
195 - rs.put("msg", "操作失败，可能数据已经被删除！"); 195 + rs.put("msg", "$$$$$${txt-2424}");
196 } 196 }
197 197
198 }catch (Exception e){ 198 }catch (Exception e){
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
  View file @3e58009
@@ -39,11 +39,11 @@ public class CarOutInfoHandler { @@ -39,11 +39,11 @@ public class CarOutInfoHandler {
39 39
40 static{ 40 static{
41 bcTypeMap = new HashMap<>(); 41 bcTypeMap = new HashMap<>();
42 - bcTypeMap.put("normal", "正常班次");  
43 - bcTypeMap.put("region", "区间");  
44 - bcTypeMap.put("venting", "直放");  
45 - bcTypeMap.put("major", "放站");  
46 - bcTypeMap.put("ldks", "两点间空驶"); 42 + bcTypeMap.put("normal", "$$$$$${txt-2926}");
  43 + bcTypeMap.put("region", "$$$$$${txt-3980}");
  44 + bcTypeMap.put("venting", "$$$$$${txt-3988}");
  45 + bcTypeMap.put("major", "$$$$$${txt-4151}");
  46 + bcTypeMap.put("ldks", "$$$$$${txt-3170}");
47 } 47 }
48 48
49 private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2(); 49 private static ScheduleComparator.DFSJ2 schDFSJComparator = new ScheduleComparator.DFSJ2();
@@ -91,7 +91,6 @@ public class CarOutInfoHandler { @@ -91,7 +91,6 @@ public class CarOutInfoHandler {
91 public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) { 91 public List<ScheduleRealInfo> update(List<ScheduleRealInfo> list) {
92 if (list.size() == 0) 92 if (list.size() == 0)
93 return new ArrayList<>(); 93 return new ArrayList<>();
94 - //按上下行分组  
95 List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>(); 94 List<ScheduleRealInfo> ups = new ArrayList<>(), downs = new ArrayList<>();
96 for (ScheduleRealInfo sch : list) { 95 for (ScheduleRealInfo sch : list) {
97 if (sch.getXlDir().equals("0")) 96 if (sch.getXlDir().equals("0"))
src/main/java/com/bsth/data/forecast/entity/ArrivalEntity.java
  View file @3e58009
@@ -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?"$$$$$${txt-3858}":"$$$$$${txt-3857}")+"，"+(this.inOut==0?"$$$$$${txt-4238}":"$$$$$${txt-4237}")+"，"+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/GpsRealData.java
  View file @3e58009
@@ -7,6 +7,7 @@ import com.bsth.data.schedule.DayOfSchedule; @@ -7,6 +7,7 @@ import com.bsth.data.schedule.DayOfSchedule;
7 import com.bsth.entity.realcontrol.ScheduleRealInfo; 7 import com.bsth.entity.realcontrol.ScheduleRealInfo;
8 import com.bsth.message.buffer.CarEnergyBuffer; 8 import com.bsth.message.buffer.CarEnergyBuffer;
9 import com.bsth.service.realcontrol.impl.ScheduleRealInfoServiceImpl; 9 import com.bsth.service.realcontrol.impl.ScheduleRealInfoServiceImpl;
  10 +import com.bsth.util.I18n;
10 import com.google.common.collect.TreeMultimap; 11 import com.google.common.collect.TreeMultimap;
11 import org.apache.commons.lang3.StringUtils; 12 import org.apache.commons.lang3.StringUtils;
12 import org.slf4j.Logger; 13 import org.slf4j.Logger;
@@ -40,6 +41,9 @@ public class GpsRealData { @@ -40,6 +41,9 @@ public class GpsRealData {
40 @Autowired 41 @Autowired
41 ForecastRealServer forecastRealServer; 42 ForecastRealServer forecastRealServer;
42 43
  44 + @Autowired
  45 + private I18n i18n;
  46 +
43 /** 47 /**
44 * 构造函数 48 * 构造函数
45 */ 49 */
@@ -155,7 +159,7 @@ public class GpsRealData { @@ -155,7 +159,7 @@ public class GpsRealData {
155 gps.setSchId(sch.getId()); 159 gps.setSchId(sch.getId());
156 if(!sch.getXlBm().equals(lineCode)){ 160 if(!sch.getXlBm().equals(lineCode)){
157 //车辆在其他线路营运 161 //车辆在其他线路营运
158 - gps.setRemark("执行 " + sch.getXlName() + " " + sch.getDfsj() + " 班次"); 162 + gps.setRemark(i18n.getMessage("txt-4445", new String[]{ sch.getXlName(), sch.getDfsj()}));
159 gps.setPlanCode(sch.getXlBm()); 163 gps.setPlanCode(sch.getXlBm());
160 } 164 }
161 }else 165 }else
src/main/java/com/bsth/data/gpsdata_v2/entity/GpsEntity.java
  View file @3e58009
@@ -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 上行 ， 1 下行 ， -1 无效） */
60 private Byte upDown; 60 private Byte upDown;
61 61
62 /** 62 /**
src/main/java/com/bsth/data/gpsdata_v2/entity/PreconditionGeo.java
  View file @3e58009
@@ -21,7 +21,7 @@ public class PreconditionGeo { @@ -21,7 +21,7 @@ public class PreconditionGeo {
21 private String lineCode; 21 private String lineCode;
22 22
23 /** 23 /**
24 - * 上下行 24 + * 方向
25 */ 25 */
26 private int upDown; 26 private int upDown;
27 27
src/main/java/com/bsth/data/gpsdata_v2/entity/StationRoute.java
  View file @3e58009
@@ -14,7 +14,7 @@ public class StationRoute { @@ -14,7 +14,7 @@ public class StationRoute {
14 private String lineCode; 14 private String lineCode;
15 15
16 /** 16 /**
17 - * 上下行 17 + * 方向
18 */ 18 */
19 private int directions; 19 private int directions;
20 20
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
  View file @3e58009
@@ -121,7 +121,7 @@ public class GpsDataRecovery implements ApplicationContextAware { @@ -121,7 +121,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
121 } 121 }
122 122
123 /** 123 /**
124 - * 王通 2016/6/29 9:23:24 获取车辆线路上下行 124 + * 王通 2016/6/29 9:23:24 获取车辆线路方向
125 * 125 *
126 * @return -1无效 0上行 1下行 126 * @return -1无效 0上行 1下行
127 */ 127 */
src/main/java/com/bsth/data/report_register/ReportRegisterServiceImpl.java
  View file @3e58009
@@ -177,7 +177,7 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L @@ -177,7 +177,7 @@ public class ReportRegisterServiceImpl extends BaseServiceImpl&lt;ReportRegister, L
177 lists.add(list6); 177 lists.add(list6);
178 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 178 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
179 ee.excelMoreSheetReplace(lists, new Object[]{map}, path + "mould/report_register.xls", 179 ee.excelMoreSheetReplace(lists, new Object[]{map}, path + "mould/report_register.xls",
180 - path + "export/" + dateTime +"_"+lineName+ "_报备登记.xls"); 180 + path + "export/" + dateTime +"_"+lineName+ "_$$$$$${txt-3118}.xls");
181 } catch (Exception e) { 181 } catch (Exception e) {
182 // TODO: handle exception 182 // TODO: handle exception
183 e.printStackTrace(); 183 e.printStackTrace();
src/main/java/com/bsth/data/schedule/e_state_check/ScheduleStationCodeChecker.java
  View file @3e58009
@@ -84,7 +84,7 @@ public class ScheduleStationCodeChecker { @@ -84,7 +84,7 @@ public class ScheduleStationCodeChecker {
84 } 84 }
85 85
86 multimap = mList; 86 multimap = mList;
87 - logger.info("站点检查 end.... idx: " + (multimap.keySet().size() > 0 ? JSON.toJSONString(multimap.keySet()):"无")); 87 + logger.info("站点检查 end.... idx: " + (multimap.keySet().size() > 0 ? JSON.toJSONString(multimap.keySet()):"$$$$$${txt-4226}"));
88 } catch (Exception e) { 88 } catch (Exception e) {
89 logger.error("", e); 89 logger.error("", e);
90 } 90 }
src/main/java/com/bsth/data/schedule/e_state_check/entity/SCodeInfo.java
  View file @3e58009
@@ -13,7 +13,7 @@ public class SCodeInfo { @@ -13,7 +13,7 @@ public class SCodeInfo {
13 private String lineCode; 13 private String lineCode;
14 14
15 /** 15 /**
16 - * 上下行 16 + * 方向
17 */ 17 */
18 private int upDown; 18 private int upDown;
19 19
src/main/java/com/bsth/data/schedule/edit_logs/service/dto/SchEditInfoDto.java
  View file @3e58009
@@ -48,7 +48,7 @@ public class SchEditInfoDto { @@ -48,7 +48,7 @@ public class SchEditInfoDto {
48 /** 计发时间 */ 48 /** 计发时间 */
49 private String fcsj; 49 private String fcsj;
50 50
51 - /** 上下行 */ 51 + /** 方向 */
52 private int xlDir; 52 private int xlDir;
53 53
54 /** 实际执行日期 */ 54 /** 实际执行日期 */
src/main/java/com/bsth/data/schedule/external/TccExternalService.java
  View file @3e58009
@@ -106,7 +106,7 @@ public class TccExternalService { @@ -106,7 +106,7 @@ public class TccExternalService {
106 rs.put("list", list); 106 rs.put("list", list);
107 rs.remove("ts"); 107 rs.remove("ts");
108 } catch (Exception e) { 108 } catch (Exception e) {
109 - rs.put("msg", "服务器出现异常！"); 109 + rs.put("msg", "$$$$$${txt-721}");
110 logger.error("", e); 110 logger.error("", e);
111 } 111 }
112 return rs; 112 return rs;
src/main/java/com/bsth/data/schedule/f_a_l/FirstAndLastHandler.java
  View file @3e58009
@@ -51,7 +51,7 @@ public class FirstAndLastHandler { @@ -51,7 +51,7 @@ public class FirstAndLastHandler {
51 public static void marks(List<ScheduleRealInfo> list){ 51 public static void marks(List<ScheduleRealInfo> list){
52 try{ 52 try{
53 Collections.sort(list, new ScheduleComparator.FCSJ()); 53 Collections.sort(list, new ScheduleComparator.FCSJ());
54 - //按上下行分组 54 + //按方向分组
55 List<ScheduleRealInfo> ups = new ArrayList<>(), 55 List<ScheduleRealInfo> ups = new ArrayList<>(),
56 downs = new ArrayList<>(); 56 downs = new ArrayList<>();
57 57
src/main/java/com/bsth/data/schedule/f_a_l/entity/ToGateway.java
  View file @3e58009
@@ -9,10 +9,10 @@ public class ToGateway { @@ -9,10 +9,10 @@ public class ToGateway {
9 /** 线路 */ 9 /** 线路 */
10 private String lineCode; 10 private String lineCode;
11 11
12 - /** 上下行 */ 12 + /** 方向 */
13 private int upDown; 13 private int upDown;
14 14
15 - /** 首班设备号 */ 15 + /** 首班$$$$$${txt-3682} */
16 private String sDeviceId; 16 private String sDeviceId;
17 17
18 /** 首班时间 */ 18 /** 首班时间 */
src/main/java/com/bsth/data/summary/entity/FastAndSlow.java
  View file @3e58009
@@ -48,7 +48,7 @@ public class FastAndSlow { @@ -48,7 +48,7 @@ public class FastAndSlow {
48 private String rq; 48 private String rq;
49 49
50 /** 50 /**
51 - * 上下行 51 + * 方向
52 */ 52 */
53 private int upDown; 53 private int upDown;
54 54
src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
  View file @3e58009
@@ -94,7 +94,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;DestroySituatio @@ -94,7 +94,7 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;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/$$$$$${txt-4437}.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
@@ -119,9 +119,9 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;DestroySituatio @@ -119,9 +119,9 @@ public class DestroySituationServiceImpl extends BaseServiceImpl&lt;DestroySituatio
119 } 119 }
120 120
121 String name = "";//list.get(0).getLineName(); 121 String name = "";//list.get(0).getLineName();
122 - wb.setSheetName(0, name + "烂班明细"); 122 + wb.setSheetName(0, name + "$$$$$${txt-4437}");
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") + "$$$$$${txt-4437}.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/FastAndSlowServiceImpl.java
  View file @3e58009
@@ -99,7 +99,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i @@ -99,7 +99,7 @@ public class FastAndSlowServiceImpl extends BaseServiceImpl&lt;FastAndSlow, Long&gt; i
99 } 99 }
100 100
101 //response 输出 101 //response 输出
102 - String filename = BasicData.lineCode2NameMap.get(lineCode) + st + "至" + et + "快慢误点明细.xls"; 102 + String filename = BasicData.lineCode2NameMap.get(lineCode) + st + "-" + et + "快慢误点明细.xls";
103 response.setContentType("application/x-msdownload"); 103 response.setContentType("application/x-msdownload");
104 response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); 104 response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
105 105
src/main/java/com/bsth/data/summary/service/impl/TempSchSituationServiceImpl.java
  View file @3e58009
@@ -110,7 +110,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;TempSchSituatio @@ -110,7 +110,7 @@ public class TempSchSituationServiceImpl extends BaseServiceImpl&lt;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") + "临加明细情况.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/LineInformation.java
  View file @3e58009
@@ -70,22 +70,22 @@ public class LineInformation { @@ -70,22 +70,22 @@ public class LineInformation {
70 // 小夜高峰结束时间 00:00 70 // 小夜高峰结束时间 00:00
71 private String xygfjssj; 71 private String xygfjssj;
72 72
73 - // 早高峰上行行驶时间 73 + // $$$$$${txt-586}
74 private Double earlyUpTime; 74 private Double earlyUpTime;
75 75
76 - // 早高峰下行行驶时间 76 + // $$$$$${txt-585}
77 private Double earlyDownTime; 77 private Double earlyDownTime;
78 78
79 - // 晚高峰上行行驶时间 79 + // $$$$$${txt-581}
80 private Double lateUpTime; 80 private Double lateUpTime;
81 81
82 - // 晚高峰下行行驶时间 82 + // $$$$$${txt-580}
83 private Double lateDownTime; 83 private Double lateDownTime;
84 84
85 - // 小夜高峰上行行驶时间 85 + // $$$$$${txt-426}
86 private Double nightStartTime; 86 private Double nightStartTime;
87 87
88 - // 小夜高峰下行行驶时间 88 + // $$$$$${txt-425}
89 private Double nightEndTime; 89 private Double nightEndTime;
90 90
91 // 低谷上行行驶时间 91 // 低谷上行行驶时间
src/main/java/com/bsth/entity/StationMatchData.java
  View file @3e58009
@@ -28,7 +28,7 @@ public class StationMatchData { @@ -28,7 +28,7 @@ public class StationMatchData {
28 private String stationName2; 28 private String stationName2;
29 // 站点行业编码 29 // 站点行业编码
30 private String StationStandardCode; 30 private String StationStandardCode;
31 - // 上下行 31 + // 方向
32 private int UpStream; 32 private int UpStream;
33 // 站级，路由顺序 33 // 站级，路由顺序
34 private String LevelId; 34 private String LevelId;
src/main/java/com/bsth/entity/excep/ArrivalInfo.java
  View file @3e58009
@@ -31,7 +31,7 @@ public class ArrivalInfo { @@ -31,7 +31,7 @@ public class ArrivalInfo {
31 /** 线路编码*/ 31 /** 线路编码*/
32 private String lineCode; 32 private String lineCode;
33 33
34 - /** 上下行*/ 34 + /** 方向*/
35 private Integer upDown; 35 private Integer upDown;
36 36
37 /**站点编码*/ 37 /**站点编码*/
@@ -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?"$$$$$${txt-3858}":"$$$$$${txt-3857}")+"，"+(this.inOut==0?"$$$$$${txt-4238}":"$$$$$${txt-4237}")+"，"+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
  View file @3e58009
@@ -33,7 +33,7 @@ public class Offline { @@ -33,7 +33,7 @@ public class Offline {
33 33
34 34
35 /** 35 /**
36 - * 上下行（0 上行 ， 1 下行 ， -1 无效） 36 + * 方向（0 上行 ， 1 下行 ， -1 无效）
37 */ 37 */
38 private Integer upDown; 38 private Integer upDown;
39 39
src/main/java/com/bsth/entity/excep/Outbound.java
  View file @3e58009
@@ -31,7 +31,7 @@ public class Outbound { @@ -31,7 +31,7 @@ public class Outbound {
31 private String lineName; 31 private String lineName;
32 32
33 /** 33 /**
34 - * 上下行（0 上行 ， 1 下行 ， -1 无效） 34 + * 方向（0 上行 ， 1 下行 ， -1 无效）
35 */ 35 */
36 private Integer upDown; 36 private Integer upDown;
37 37
src/main/java/com/bsth/entity/excep/Speeding.java
  View file @3e58009
@@ -37,7 +37,7 @@ public class Speeding { @@ -37,7 +37,7 @@ public class Speeding {
37 private Integer lineId; 37 private Integer lineId;
38 38
39 /** 39 /**
40 - * 上下行（0 上行 ， 1 下行 ， -1 无效） 40 + * 方向（0 上行 ， 1 下行 ， -1 无效）
41 */ 41 */
42 private Integer upDown; 42 private Integer upDown;
43 43
src/main/java/com/bsth/entity/mcy_forms/Changetochange.java
  View file @3e58009
@@ -15,7 +15,7 @@ public class Changetochange { @@ -15,7 +15,7 @@ public class Changetochange {
15 15
16 private String gs;//公司 16 private String gs;//公司
17 17
18 - private String fgs;//分公司 18 + private String fgs;//
19 19
20 private String xl;//线路 20 private String xl;//线路
21 21
src/main/java/com/bsth/entity/mcy_forms/Executionrate.java
  View file @3e58009
@@ -8,7 +8,7 @@ public class Executionrate { @@ -8,7 +8,7 @@ public class Executionrate {
8 8
9 private String zhgs;//直属公司 9 private String zhgs;//直属公司
10 10
11 - private String fgs;//分公司 11 + private String fgs;//
12 12
13 private String xl;//线路条数 13 private String xl;//线路条数
14 14
src/main/java/com/bsth/entity/mcy_forms/Turnoutrate.java
  View file @3e58009
@@ -7,7 +7,7 @@ private String rq;//日期 @@ -7,7 +7,7 @@ private String rq;//日期
7 7
8 private String zhgs;//直属公司 8 private String zhgs;//直属公司
9 9
10 - private String fgs;//分公司 10 + private String fgs;//
11 11
12 private String xl;//线路条数 12 private String xl;//线路条数
13 13
src/main/java/com/bsth/entity/oil/Cdl.java
  View file @3e58009
@@ -31,7 +31,7 @@ public class Cdl { @@ -31,7 +31,7 @@ public class Cdl {
31 @Transient 31 @Transient
32 private String fgsname; 32 private String fgsname;
33 33
34 - //分公司代码 34 + //代码
35 private String fgsdm; 35 private String fgsdm;
36 36
37 public Integer getId() { 37 public Integer getId() {
src/main/java/com/bsth/entity/oil/Cyl.java
  View file @3e58009
@@ -31,7 +31,7 @@ public class Cyl { @@ -31,7 +31,7 @@ public class Cyl {
31 @Transient 31 @Transient
32 private String fgsname; 32 private String fgsname;
33 33
34 - //分公司代码 34 + //代码
35 private String fgsdm; 35 private String fgsdm;
36 36
37 public Integer getId() { 37 public Integer getId() {
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
  View file @3e58009
@@ -188,9 +188,9 @@ public class ScheduleRealInfo { @@ -188,9 +188,9 @@ public class ScheduleRealInfo {
188 private String gsName; 188 private String gsName;
189 /** 关联的公司编码 */ 189 /** 关联的公司编码 */
190 private String gsBm; 190 private String gsBm;
191 - /** 关联的分公司名称 */ 191 + /** 关联的名称 */
192 private String fgsName; 192 private String fgsName;
193 - /** 关联的分公司编码 */ 193 + /** 关联的编码 */
194 private String fgsBm; 194 private String fgsBm;
195 /** 出场顺序号 */ 195 /** 出场顺序号 */
196 private Integer ccno; 196 private Integer ccno;
src/main/java/com/bsth/entity/report/MileageReport.java
  View file @3e58009
@@ -13,13 +13,13 @@ public class MileageReport { @@ -13,13 +13,13 @@ public class MileageReport {
13 /** 公司编码 */ 13 /** 公司编码 */
14 private String companyId; 14 private String companyId;
15 15
16 - /** 分公司编码 */ 16 + /** 编码 */
17 private String subCompanyId; 17 private String subCompanyId;
18 18
19 /** 公司名称 */ 19 /** 公司名称 */
20 private String companyName; 20 private String companyName;
21 21
22 - /** 分公司名称 */ 22 + /** 名称 */
23 private String subCompanyName; 23 private String subCompanyName;
24 24
25 /** 线路编码 */ 25 /** 线路编码 */
src/main/java/com/bsth/entity/report/ScheduleCorrectionReport.java
  View file @3e58009
@@ -13,13 +13,13 @@ public class ScheduleCorrectionReport { @@ -13,13 +13,13 @@ public class ScheduleCorrectionReport {
13 /** 公司编码 */ 13 /** 公司编码 */
14 private String companyId; 14 private String companyId;
15 15
16 - /** 分公司编码 */ 16 + /** 编码 */
17 private String subCompanyId; 17 private String subCompanyId;
18 18
19 /** 公司名称 */ 19 /** 公司名称 */
20 private String companyName; 20 private String companyName;
21 21
22 - /** 分公司名称 */ 22 + /** 名称 */
23 private String subCompanyName; 23 private String subCompanyName;
24 24
25 /** 线路编码 */ 25 /** 线路编码 */
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
  View file @3e58009
@@ -87,7 +87,7 @@ public class SchedulePlanInfo extends BEntity { @@ -87,7 +87,7 @@ public class SchedulePlanInfo extends BEntity {
87 private String sName; 87 private String sName;
88 88
89 // 冗余的时刻明细信息，不做mapping 89 // 冗余的时刻明细信息，不做mapping
90 - /** 线路方向（TODO：上下行，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */ 90 + /** 线路方向（TODO：方向，上行，下行，这个以后用枚举还是字典再议，现在先用文字） */
91 @Column(nullable = false) 91 @Column(nullable = false)
92 private String xlDir; 92 private String xlDir;
93 /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */ 93 /** 起点站id，根据班次类型，会关联 bsth_c_station，或 bsth_c_car_park，不做mapping */
@@ -351,7 +351,7 @@ public class SchedulePlanInfo extends BEntity { @@ -351,7 +351,7 @@ public class SchedulePlanInfo extends BEntity {
351 } 351 }
352 352
353 // 时刻明细数据 353 // 时刻明细数据
354 - this.xlDir = ttInfoDetail.getXlDir(); // 线路上下行 354 + this.xlDir = ttInfoDetail.getXlDir(); // 线路方向
355 this.bcType = ttInfoDetail.getBcType(); // 班次类型 355 this.bcType = ttInfoDetail.getBcType(); // 班次类型
356 this.qdzCode = ttInfoDetail.getQdzCode(); // 起点站code 356 this.qdzCode = ttInfoDetail.getQdzCode(); // 起点站code
357 this.qdzName = ttInfoDetail.getQdzName(); // 起点站name 357 this.qdzName = ttInfoDetail.getQdzName(); // 起点站name
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTask.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.entity.schedule.datasync;  
2 -  
3 -import lombok.AllArgsConstructor;  
4 -import lombok.Builder;  
5 -import lombok.Data;  
6 -  
7 -import javax.persistence.*;  
8 -import java.io.Serializable;  
9 -import java.util.Date;  
10 -  
11 -/**  
12 - * 车辆数据同步任务。  
13 - */  
14 -@Data  
15 -@Builder  
16 -@AllArgsConstructor  
17 -@Entity  
18 -@Table(name = "bsth_c_data_sync_cars")  
19 -public class VehicleDataSyncTask implements Serializable {  
20 - private static final long serialVersionUID = -3042098095111282402L;  
21 - /** 主键Id */  
22 - @Id  
23 - @GeneratedValue(strategy = GenerationType.IDENTITY)  
24 - private Long id;  
25 -  
26 - //------------- 同步用参数（以下） --------------//  
27 - /** 车辆自编号（针对同步来源数据，如：车辆库中，自编号为S01-001的车辆信息） */  
28 - private String paramClzbh;  
29 -  
30 - /** 开始时间（针对同步来源数据，如：车辆库中，某段时间内的新增和报废车辆） */  
31 - private Date paramFrom;  
32 - /** 结束时间（针对数据源） */  
33 - private Date paramTo;  
34 -  
35 - // TODO：对象放在队列中，自定义属性暂时不需要，以后需要再加  
36 -  
37 - //------------- 同步用参数（以上） --------------//  
38 -  
39 - /** 待同步的记录数 */  
40 - private Integer syncRowCounts;  
41 - /** 同步-插入记录数 */  
42 - private Integer syncInsertCounts;  
43 - /** 同步-更新记录数 */  
44 - private Integer syncUpdateCounts;  
45 - /** 同步-错误记录数 */  
46 - private Integer syncErrorCounts;  
47 -  
48 - /** 开始时间 */  
49 - @Column(nullable = false)  
50 - @Temporal(TemporalType.TIMESTAMP)  
51 - private Date startDate;  
52 - /** 结束时间 */  
53 - @Temporal(TemporalType.TIMESTAMP)  
54 - private Date endDate;  
55 -  
56 - /** 同步状态 */  
57 - @Column(nullable = false)  
58 - @Convert(converter = VehicleDataSyncTaskStatusEnumConverter.class)  
59 - private VehicleDataSyncTaskStatusEnum status;  
60 -  
61 - /** 同步类型 */  
62 - @Column(nullable = false)  
63 - @Convert(converter = VehicleDataSyncTaskTypeEnumConverter.class)  
64 - private VehicleDataSyncTaskTypeEnum type;  
65 -  
66 - /** 执行结果信息 */  
67 - @Column(length = 2000)  
68 - private String processMsg;  
69 -  
70 - /** 执行耗时（秒） */  
71 - private Integer processSeconds;  
72 -  
73 - public VehicleDataSyncTask() {}  
74 -}  
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTaskStatusEnum.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.entity.schedule.datasync;  
2 -  
3 -import com.fasterxml.jackson.annotation.JsonCreator;  
4 -import com.fasterxml.jackson.annotation.JsonValue;  
5 -import org.springframework.util.StringUtils;  
6 -  
7 -import java.util.HashMap;  
8 -import java.util.Map;  
9 -  
10 -/**  
11 - * 车辆数据同步状态enum。  
12 - */  
13 -public enum VehicleDataSyncTaskStatusEnum {  
14 -  
15 - PREPARE("同步准备"),  
16 - PREPARE_FAIL("同步准备失败"),  
17 - SYNCING("同步中"),  
18 - END("同步结束");  
19 -  
20 - /** 字典描述（对应数据库的字典）*/  
21 - private String dicDesc;  
22 -  
23 - @JsonCreator  
24 - VehicleDataSyncTaskStatusEnum(String dicDesc) {  
25 - this.dicDesc = dicDesc;  
26 - }  
27 -  
28 - @JsonValue  
29 - public String getDicDesc() {  
30 - return dicDesc;  
31 - }  
32 -  
33 - public void setDicDesc(String dicDesc) {  
34 - this.dicDesc = dicDesc;  
35 - }  
36 -  
37 - @Override  
38 - public String toString() {  
39 - return dicDesc;  
40 - }  
41 -  
42 - public static Map<String, VehicleDataSyncTaskStatusEnum> enumMap =  
43 - new HashMap<String, VehicleDataSyncTaskStatusEnum>() {{  
44 - put("同步准备", PREPARE);  
45 - put("同步准备失败", PREPARE_FAIL);  
46 - put("同步中", SYNCING);  
47 - put("同步结束", END);  
48 - }};  
49 -  
50 - public static VehicleDataSyncTaskStatusEnum fromDicDesc(String dicDesc) {  
51 - if (StringUtils.isEmpty(dicDesc)) {  
52 - throw new RuntimeException("车辆数据同步状态描述不能为空！");  
53 - } else if (enumMap.get(dicDesc) == null) {  
54 - throw new RuntimeException("车辆数据同步状态未定义：" + dicDesc);  
55 - }  
56 - return enumMap.get(dicDesc);  
57 - }  
58 -}  
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTaskStatusEnumConverter.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.entity.schedule.datasync;  
2 -  
3 -import javax.persistence.AttributeConverter;  
4 -import javax.persistence.Convert;  
5 -  
6 -/**  
7 - * 车辆数据同步状态jpa转换器。  
8 - */  
9 -@Convert  
10 -public class VehicleDataSyncTaskStatusEnumConverter implements AttributeConverter<VehicleDataSyncTaskStatusEnum, String> {  
11 - @Override  
12 - public String convertToDatabaseColumn(VehicleDataSyncTaskStatusEnum vehicleDataSyncStatusEnum) {  
13 - return vehicleDataSyncStatusEnum.getDicDesc();  
14 - }  
15 -  
16 - @Override  
17 - public VehicleDataSyncTaskStatusEnum convertToEntityAttribute(String dbData) {  
18 - return VehicleDataSyncTaskStatusEnum.fromDicDesc(dbData);  
19 - }  
20 -}  
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTaskTypeEnum.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.entity.schedule.datasync;  
2 -  
3 -import com.fasterxml.jackson.annotation.JsonCreator;  
4 -import com.fasterxml.jackson.annotation.JsonValue;  
5 -import org.springframework.util.StringUtils;  
6 -  
7 -import java.util.HashMap;  
8 -import java.util.Map;  
9 -  
10 -/**  
11 - * 车辆数据同步类型enum。  
12 - */  
13 -public enum VehicleDataSyncTaskTypeEnum {  
14 - REMOTE_TRIGGER("远端触发"),  
15 - ACTIVE_TRIGGER("主动触发");  
16 -  
17 - /** 字典描述（对应数据库的字典）*/  
18 - private String dicDesc;  
19 -  
20 - @JsonCreator  
21 - VehicleDataSyncTaskTypeEnum(String dicDesc) {  
22 - this.dicDesc = dicDesc;  
23 - }  
24 -  
25 - @JsonValue  
26 - public String getDicDesc() {  
27 - return dicDesc;  
28 - }  
29 -  
30 - public void setDicDesc(String dicDesc) {  
31 - this.dicDesc = dicDesc;  
32 - }  
33 -  
34 - @Override  
35 - public String toString() {  
36 - return dicDesc;  
37 - }  
38 -  
39 - public static Map<String, VehicleDataSyncTaskTypeEnum> enumMap =  
40 - new HashMap<String, VehicleDataSyncTaskTypeEnum>() {{  
41 - put("远端触发", REMOTE_TRIGGER);  
42 - put("主动触发", ACTIVE_TRIGGER);  
43 - }};  
44 -  
45 - public static VehicleDataSyncTaskTypeEnum fromDicDesc(String dicDesc) {  
46 - if (StringUtils.isEmpty(dicDesc)) {  
47 - throw new RuntimeException("车辆数据同步类型描述不能为空！");  
48 - } else if (enumMap.get(dicDesc) == null) {  
49 - throw new RuntimeException("车辆数据同步类型未定义：" + dicDesc);  
50 - }  
51 - return enumMap.get(dicDesc);  
52 - }  
53 -  
54 -}  
src/main/java/com/bsth/entity/schedule/datasync/VehicleDataSyncTaskTypeEnumConverter.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.entity.schedule.datasync;  
2 -  
3 -import javax.persistence.AttributeConverter;  
4 -import javax.persistence.Convert;  
5 -  
6 -/**  
7 - * 车辆数据同步类型jpa转换器。  
8 - */  
9 -@Convert  
10 -public class VehicleDataSyncTaskTypeEnumConverter implements AttributeConverter<VehicleDataSyncTaskTypeEnum, String> {  
11 - @Override  
12 - public String convertToDatabaseColumn(VehicleDataSyncTaskTypeEnum vehicleDataSyncTaskTypeEnum) {  
13 - return vehicleDataSyncTaskTypeEnum.getDicDesc();  
14 - }  
15 -  
16 - @Override  
17 - public VehicleDataSyncTaskTypeEnum convertToEntityAttribute(String dbData) {  
18 - return VehicleDataSyncTaskTypeEnum.fromDicDesc(dbData);  
19 - }  
20 -  
21 -}  
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
  View file @3e58009
@@ -20,7 +20,7 @@ public class CompanyAuthority implements Serializable { @@ -20,7 +20,7 @@ public class CompanyAuthority implements Serializable {
20 /** 公司名称 */ 20 /** 公司名称 */
21 private String companyName; 21 private String companyName;
22 22
23 - /** 分公司代码 */ 23 + /** $$$$$${txt-3777}代码 */
24 private String subCompanyCode; 24 private String subCompanyCode;
25 25
26 /** 分公司代码 */ 26 /** 分公司代码 */
src/main/java/com/bsth/entity/traffic/VehicleInoutStop.java
  View file @3e58009
@@ -34,7 +34,7 @@ public class VehicleInoutStop { @@ -34,7 +34,7 @@ public class VehicleInoutStop {
34 // 营运状态 34 // 营运状态
35 private Integer serviceState; 35 private Integer serviceState;
36 36
37 - // 上下行 37 + // 方向
38 private Integer upDown; 38 private Integer upDown;
39 39
40 // 进出站/站内外 40 // 进出站/站内外
src/main/java/com/bsth/repository/schedule/datasync/VehicleDataSyncTaskRepository.java deleted 100644 → 0
  View file @a95f771
1 -package com.bsth.repository.schedule.datasync;  
2 -  
3 -import com.bsth.entity.schedule.datasync.VehicleDataSyncTask;  
4 -import com.bsth.repository.BaseRepository;  
5 -import org.springframework.stereotype.Repository;  
6 -  
7 -@Repository  
8 -public interface VehicleDataSyncTaskRepository extends BaseRepository<VehicleDataSyncTask, Long> {  
9 -}  
src/main/java/com/bsth/security/CustomAccessDecisionManager.java
  View file @3e58009
@@ -38,7 +38,7 @@ public class CustomAccessDecisionManager implements AccessDecisionManager{ @@ -38,7 +38,7 @@ public class CustomAccessDecisionManager implements AccessDecisionManager{
38 } 38 }
39 } 39 }
40 } 40 }
41 - throw new AccessDeniedException("访问被拒绝!"); 41 + throw new AccessDeniedException("$$$$$${txt-1908}!");
42 } 42 }
43 43
44 @Override 44 @Override
src/main/java/com/bsth/service/SectionService.java
  View file @3e58009
@@ -31,7 +31,7 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; { @@ -31,7 +31,7 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
31 void add(Section section); 31 void add(Section section);
32 32
33 /** 33 /**
34 - * 修改路段信息 34 + * $$$$$${txt-1361}
35 * @param section 35 * @param section
36 */ 36 */
37 void modify(Section section); 37 void modify(Section section);
src/main/java/com/bsth/service/calc/CalcIntervalService.java
  View file @3e58009
@@ -17,7 +17,7 @@ public interface CalcIntervalService extends BaseService&lt;CalcInterval,Integer&gt; { @@ -17,7 +17,7 @@ public interface CalcIntervalService extends BaseService&lt;CalcInterval,Integer&gt; {
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 + //导出全部天数$$$$$${txt-1921}
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/CalcCulateMileageServiceImpl.java
  View file @3e58009
@@ -192,7 +192,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -192,7 +192,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
192 while (it.hasNext()) { 192 while (it.hasNext()) {
193 ChildTaskPlan childTaskPlan = it.next(); 193 ChildTaskPlan childTaskPlan = it.next();
194 if(childTaskPlan.getMileageType().equals("service") 194 if(childTaskPlan.getMileageType().equals("service")
195 - &&"正常".equals(childTaskPlan.getType1()) 195 + &&"$$$$$${txt-3979}".equals(childTaskPlan.getType1())
196 && childTaskPlan.getCcId()==null 196 && childTaskPlan.getCcId()==null
197 && (!childTaskPlan.isNoClerk())){ 197 && (!childTaskPlan.isNoClerk())){
198 if (!childTaskPlan.isDestroy()) { 198 if (!childTaskPlan.isDestroy()) {
@@ -222,7 +222,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -222,7 +222,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
222 while (it.hasNext()) { 222 while (it.hasNext()) {
223 ChildTaskPlan childTaskPlan = it.next(); 223 ChildTaskPlan childTaskPlan = it.next();
224 if(childTaskPlan.getMileageType().equals("service") 224 if(childTaskPlan.getMileageType().equals("service")
225 - &&"正常".equals(childTaskPlan.getType1()) 225 + &&"$$$$$${txt-3979}".equals(childTaskPlan.getType1())
226 && childTaskPlan.getCcId()==null 226 && childTaskPlan.getCcId()==null
227 && childTaskPlan.isNoClerk()){ 227 && childTaskPlan.isNoClerk()){
228 if (!childTaskPlan.isDestroy()) { 228 if (!childTaskPlan.isDestroy()) {
@@ -264,7 +264,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -264,7 +264,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
264 while (it.hasNext()) { 264 while (it.hasNext()) {
265 ChildTaskPlan childTaskPlan = it.next(); 265 ChildTaskPlan childTaskPlan = it.next();
266 if(childTaskPlan.getMileageType().equals("empty") 266 if(childTaskPlan.getMileageType().equals("empty")
267 - &&"正常".equals(childTaskPlan.getType1()) 267 + &&"$$$$$${txt-3979}".equals(childTaskPlan.getType1())
268 && (!childTaskPlan.isNoClerk()) 268 && (!childTaskPlan.isNoClerk())
269 && childTaskPlan.getCcId()==null){ 269 && childTaskPlan.getCcId()==null){
270 if (!childTaskPlan.isDestroy()) { 270 if (!childTaskPlan.isDestroy()) {
@@ -292,7 +292,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -292,7 +292,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
292 while (it.hasNext()) { 292 while (it.hasNext()) {
293 ChildTaskPlan childTaskPlan = it.next(); 293 ChildTaskPlan childTaskPlan = it.next();
294 if(childTaskPlan.getMileageType().equals("empty") 294 if(childTaskPlan.getMileageType().equals("empty")
295 - &&"正常".equals(childTaskPlan.getType1()) 295 + &&"$$$$$${txt-3979}".equals(childTaskPlan.getType1())
296 && childTaskPlan.getCcId()==null 296 && childTaskPlan.getCcId()==null
297 && childTaskPlan.isNoClerk()){ 297 && childTaskPlan.isNoClerk()){
298 if (!childTaskPlan.isDestroy()) { 298 if (!childTaskPlan.isDestroy()) {
@@ -383,7 +383,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -383,7 +383,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
383 while (it.hasNext()) { 383 while (it.hasNext()) {
384 ChildTaskPlan childTaskPlan = it.next(); 384 ChildTaskPlan childTaskPlan = it.next();
385 if("service".equals(childTaskPlan.getMileageType()) 385 if("service".equals(childTaskPlan.getMileageType())
386 - &&"临加".equals(childTaskPlan.getType1()) 386 + &&"$$$$$${txt-3964}".equals(childTaskPlan.getType1())
387 && childTaskPlan.getCcId() == null 387 && childTaskPlan.getCcId() == null
388 && (!childTaskPlan.isNoClerk())){ 388 && (!childTaskPlan.isNoClerk())){
389 if (!childTaskPlan.isDestroy()) { 389 if (!childTaskPlan.isDestroy()) {
@@ -428,7 +428,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -428,7 +428,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
428 while (it.hasNext()) { 428 while (it.hasNext()) {
429 ChildTaskPlan childTaskPlan = it.next(); 429 ChildTaskPlan childTaskPlan = it.next();
430 if("service".equals(childTaskPlan.getMileageType()) 430 if("service".equals(childTaskPlan.getMileageType())
431 - &&"临加".equals(childTaskPlan.getType1()) 431 + &&"$$$$$${txt-3964}".equals(childTaskPlan.getType1())
432 && childTaskPlan.getCcId()==null 432 && childTaskPlan.getCcId()==null
433 && childTaskPlan.isNoClerk()){ 433 && childTaskPlan.isNoClerk()){
434 if (!childTaskPlan.isDestroy()) { 434 if (!childTaskPlan.isDestroy()) {
@@ -483,7 +483,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -483,7 +483,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
483 while (it.hasNext()) { 483 while (it.hasNext()) {
484 ChildTaskPlan childTaskPlan = it.next(); 484 ChildTaskPlan childTaskPlan = it.next();
485 if("empty".equals(childTaskPlan.getMileageType()) 485 if("empty".equals(childTaskPlan.getMileageType())
486 - &&"临加".equals(childTaskPlan.getType1()) 486 + &&"$$$$$${txt-3964}".equals(childTaskPlan.getType1())
487 && childTaskPlan.getCcId() == null 487 && childTaskPlan.getCcId() == null
488 && (!childTaskPlan.isNoClerk())){ 488 && (!childTaskPlan.isNoClerk())){
489 if (!childTaskPlan.isDestroy()) { 489 if (!childTaskPlan.isDestroy()) {
@@ -500,7 +500,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -500,7 +500,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
500 while (it.hasNext()) { 500 while (it.hasNext()) {
501 ChildTaskPlan childTaskPlan = it.next(); 501 ChildTaskPlan childTaskPlan = it.next();
502 if ("empty".equals(childTaskPlan.getMileageType()) 502 if ("empty".equals(childTaskPlan.getMileageType())
503 - && ("临加".equals(childTaskPlan.getType1()) || scheduleRealInfo.isSflj()) 503 + && ("$$$$$${txt-3964}".equals(childTaskPlan.getType1()) || scheduleRealInfo.isSflj())
504 && childTaskPlan.getCcId() == null 504 && childTaskPlan.getCcId() == null
505 && (!childTaskPlan.isNoClerk())) { 505 && (!childTaskPlan.isNoClerk())) {
506 if (!childTaskPlan.isDestroy()) { 506 if (!childTaskPlan.isDestroy()) {
@@ -545,7 +545,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -545,7 +545,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
545 while (it.hasNext()) { 545 while (it.hasNext()) {
546 ChildTaskPlan childTaskPlan = it.next(); 546 ChildTaskPlan childTaskPlan = it.next();
547 if("empty".equals(childTaskPlan.getMileageType()) 547 if("empty".equals(childTaskPlan.getMileageType())
548 - &&"临加".equals(childTaskPlan.getType1()) 548 + &&"$$$$$${txt-3964}".equals(childTaskPlan.getType1())
549 && childTaskPlan.getCcId()==null 549 && childTaskPlan.getCcId()==null
550 && childTaskPlan.isNoClerk()){ 550 && childTaskPlan.isNoClerk()){
551 if (!childTaskPlan.isDestroy()) { 551 if (!childTaskPlan.isDestroy()) {
@@ -624,7 +624,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -624,7 +624,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
624 if (cts != null && cts.size() > 0) { 624 if (cts != null && cts.size() > 0) {
625 for(ChildTaskPlan c : cts){ 625 for(ChildTaskPlan c : cts){
626 if(c.getCcId() == null){ 626 if(c.getCcId() == null){
627 - if(item.equals("其他")){ 627 + if(item.equals("$$$$$${txt-4197}")){
628 if(c.isDestroy() && 628 if(c.isDestroy() &&
629 ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)|| 629 ((c.getDestroyReason()==null?"": c.getDestroyReason()).equals(item)||
630 (c.getDestroyReason()==null?"": c.getDestroyReason()).equals(""))) 630 (c.getDestroyReason()==null?"": c.getDestroyReason()).equals("")))
@@ -641,11 +641,11 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -641,11 +641,11 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
641 //主任务烂班 641 //主任务烂班
642 else if(sch.getStatus() == -1){ 642 else if(sch.getStatus() == -1){
643 if(sch.getAdjustExps().equals(item) || 643 if(sch.getAdjustExps().equals(item) ||
644 - (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){ 644 + (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("$$$$$${txt-4197}"))){
645 sum = Arith.add(sum, sch.getJhlcOrig()); 645 sum = Arith.add(sum, sch.getJhlcOrig());
646 } 646 }
647 } 647 }
648 - else if(item.equals("其他")){ 648 + else if(item.equals("$$$$$${txt-4197}")){
649 double diff = Arith.sub(sch.getJhlcOrig(), sch.getJhlc()); 649 double diff = Arith.sub(sch.getJhlcOrig(), sch.getJhlc());
650 if(diff > 0){ 650 if(diff > 0){
651 sum = Arith.add(sum, diff); 651 sum = Arith.add(sum, diff);
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
  View file @3e58009
@@ -89,7 +89,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -89,7 +89,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
89 // TODO: handle exception 89 // TODO: handle exception
90 } 90 }
91 91
92 - //D级线路显示发车准点率 92 + //$$$$$${txt-4400}显示发车准点率
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("")){
@@ -271,7 +271,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -271,7 +271,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
271 m.put("sDate", sDate); 271 m.put("sDate", sDate);
272 m.put("eDate", eDate); 272 m.put("eDate", eDate);
273 xls="calcIntervalCount.xls"; 273 xls="calcIntervalCount.xls";
274 - xlsName="大间隔情况表.xls"; 274 + xlsName="$$$$$${txt-1351}.xls";
275 // } 275 // }
276 276
277 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls, 277 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls,
@@ -353,19 +353,19 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -353,19 +353,19 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
353 353
354 String remark1 = "", remark2 = ""; 354 String remark1 = "", remark2 = "";
355 if(t.getLevelTime() >= 0){ 355 if(t.getLevelTime() >= 0){
356 - remark1 += "高峰平均"+t.getLevelTime()+"分；"; 356 + remark1 += "高峰平均"+t.getLevelTime()+"$$$$$${txt-4273}；";
357 } 357 }
358 if(t.getLevelTime2() >= 0){ 358 if(t.getLevelTime2() >= 0){
359 - remark1 += "低谷平均"+t.getLevelTime2()+"分；\n"; 359 + remark1 += "低谷平均"+t.getLevelTime2()+"$$$$$${txt-4273}；\n";
360 } 360 }
361 if(t.getGfMax() > 0){ 361 if(t.getGfMax() > 0){
362 - remark2 += "高峰标准"+t.getGfMax()+"分；"; 362 + remark2 += "高峰标准"+t.getGfMax()+"$$$$$${txt-4273}；";
363 } 363 }
364 if(t.getDgMax() > 0){ 364 if(t.getDgMax() > 0){
365 - remark2 += "低谷标准"+t.getDgMax()+"分；"; 365 + remark2 += "低谷标准"+t.getDgMax()+"$$$$$${txt-4273}；";
366 } 366 }
367 if(t.getYbMax() > 0){ 367 if(t.getYbMax() > 0){
368 - remark2 += "夜班标准"+t.getYbMax()+"分；"; 368 + remark2 += "夜班标准"+t.getYbMax()+"$$$$$${txt-4273}；";
369 } 369 }
370 m.put("remark1", remark1); 370 m.put("remark1", remark1);
371 m.put("remark2", remark2); 371 m.put("remark2", remark2);
@@ -382,7 +382,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -382,7 +382,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
382 listI.add(tempList.iterator()); 382 listI.add(tempList.iterator());
383 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 383 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
384 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "calcIntervalList1.xls", 384 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "calcIntervalList1.xls",
385 - path + "export/大间距汇总表"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls"); 385 + path + "export/$$$$$${txt-1417}"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
386 } catch (Exception e) { 386 } catch (Exception e) {
387 // TODO: handle exception 387 // TODO: handle exception
388 e.printStackTrace(); 388 e.printStackTrace();
@@ -415,7 +415,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -415,7 +415,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
415 listI.add(list.iterator()); 415 listI.add(list.iterator());
416 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 416 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
417 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls", 417 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls",
418 - path + "export/"+date+"大间隔详细.xls"); 418 + path + "export/"+date+"$$$$$${txt-1921}.xls");
419 } catch (Exception e) { 419 } catch (Exception e) {
420 // TODO: handle exception 420 // TODO: handle exception
421 e.printStackTrace(); 421 e.printStackTrace();
@@ -757,7 +757,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -757,7 +757,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
757 listI.add(list.iterator()); 757 listI.add(list.iterator());
758 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 758 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
759 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls", 759 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls",
760 - path + "export/"+date+"大间隔详细.xls"); 760 + path + "export/"+date+"$$$$$${txt-1921}.xls");
761 } catch (Exception e) { 761 } catch (Exception e) {
762 // TODO: handle exception 762 // TODO: handle exception
763 e.printStackTrace(); 763 e.printStackTrace();
@@ -903,7 +903,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -903,7 +903,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
903 listI.add(list.iterator()); 903 listI.add(list.iterator());
904 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 904 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
905 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls", 905 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "interval.xls",
906 - path + "export/"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+"大间隔详细.xls"); 906 + path + "export/"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+"$$$$$${txt-1921}.xls");
907 } catch (Exception e) { 907 } catch (Exception e) {
908 // TODO: handle exception 908 // TODO: handle exception
909 e.printStackTrace(); 909 e.printStackTrace();
@@ -999,11 +999,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -999,11 +999,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
999 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>(); 999 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
1000 Map<String, Object> sumMap1 = new HashMap<String, Object>(); 1000 Map<String, Object> sumMap1 = new HashMap<String, Object>();
1001 Map<String, Object> sumMap2 = new HashMap<String, Object>(); 1001 Map<String, Object> sumMap2 = new HashMap<String, Object>();
1002 - sumMap1.put("fgs", "合计"); //分公司合计 1002 + sumMap1.put("fgs", "$$$$$${txt-3916}"); //分公司合计
1003 sumMap1.put("level", ""); 1003 sumMap1.put("level", "");
1004 sumMap1.put("djgNum", "0"); 1004 sumMap1.put("djgNum", "0");
1005 sumMap1.put("bcs", "0"); 1005 sumMap1.put("bcs", "0");
1006 - sumMap2.put("gs", "合计"); //公司合计 1006 + sumMap2.put("gs", "$$$$$${txt-3916}"); //公司合计
1007 sumMap2.put("fgs", ""); 1007 sumMap2.put("fgs", "");
1008 sumMap2.put("level", ""); 1008 sumMap2.put("level", "");
1009 sumMap2.put("djgNum", "0"); 1009 sumMap2.put("djgNum", "0");
@@ -1019,11 +1019,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -1019,11 +1019,11 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
1019 } 1019 }
1020 if(!(keyMap.containsKey(key))){ 1020 if(!(keyMap.containsKey(key))){
1021 if(keyList.size() > 0 && !(keyList.get(keyList.size() - 1).split("/")[0].equals(key.split("/")[0]))){ 1021 if(keyList.size() > 0 && !(keyList.get(keyList.size() - 1).split("/")[0].equals(key.split("/")[0]))){
1022 - keyList.add(sumMap1.get("gs").toString() + "^合计_" + fgsName);  
1023 - keyMap.put(sumMap1.get("gs").toString() + "^合计_" + fgsName, sumMap1); 1022 + keyList.add(sumMap1.get("gs").toString() + "^$$$$$${txt-3916}_" + fgsName);
  1023 + keyMap.put(sumMap1.get("gs").toString() + "^$$$$$${txt-3916}_" + fgsName, sumMap1);
1024 sumMap1 = new HashMap<String, Object>(); 1024 sumMap1 = new HashMap<String, Object>();
1025 sumMap1.put("gs", gsName); 1025 sumMap1.put("gs", gsName);
1026 - sumMap1.put("fgs", "合计"); 1026 + sumMap1.put("fgs", "$$$$$${txt-3916}");
1027 sumMap1.put("level", ""); 1027 sumMap1.put("level", "");
1028 sumMap1.put("djgNum", "0"); 1028 sumMap1.put("djgNum", "0");
1029 sumMap1.put("bcs", "0"); 1029 sumMap1.put("bcs", "0");
@@ -1049,10 +1049,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -1049,10 +1049,10 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege
1049 sumMap2.put("bcs", Arith.add(sumMap2.get("bcs"), m.get("bcs"))); 1049 sumMap2.put("bcs", Arith.add(sumMap2.get("bcs"), m.get("bcs")));
1050 } 1050 }
1051 } 1051 }
1052 - keyList.add((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^合计_");  
1053 - keyMap.put((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^合计_", sumMap1);  
1054 - keyList.add("合计");  
1055 - keyMap.put("合计", sumMap2); 1052 + keyList.add((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^$$$$$${txt-3916}_");
  1053 + keyMap.put((sumMap1.get("gs")!=null?sumMap1.get("gs").toString():"") + "^$$$$$${txt-3916}_", sumMap1);
  1054 + keyList.add("$$$$$${txt-3916}");
  1055 + keyMap.put("$$$$$${txt-3916}", sumMap2);
1056 1056
1057 for(String key : keyList){ 1057 for(String key : keyList){
1058 Map<String, Object> m = keyMap.get(key); 1058 Map<String, Object> m = keyMap.get(key);
@@ -1096,7 +1096,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;CalcInterval,Intege @@ -1096,7 +1096,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl&lt;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="$$$$$${txt-541}.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/CalcLbStatuAnalyServiceImpl.java
  View file @3e58009
@@ -134,7 +134,7 @@ public class CalcLbStatuAnalyServiceImpl extends BaseServiceImpl&lt;CalcLbStatuAnal @@ -134,7 +134,7 @@ public class CalcLbStatuAnalyServiceImpl extends BaseServiceImpl&lt;CalcLbStatuAnal
134 134
135 String company = "", subCompany = "", lineName = ""; 135 String company = "", subCompany = "", lineName = "";
136 Map<String, Object> lastMap = new HashMap<String, Object>(); 136 Map<String, Object> lastMap = new HashMap<String, Object>();
137 - lastMap.put("line", "合计"); 137 + lastMap.put("line", "$$$$$${txt-3916}");
138 for(String key : keyList){ 138 for(String key : keyList){
139 List<CalcLbStatuAnaly> list = keyMap.get(key); 139 List<CalcLbStatuAnaly> list = keyMap.get(key);
140 Map<String, Object> m = new HashMap<String, Object>(); 140 Map<String, Object> m = new HashMap<String, Object>();
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
  View file @3e58009
@@ -57,13 +57,13 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -57,13 +57,13 @@ public class CalcMixServiceImpl implements CalcMixService {
57 List<CalcWaybill> list = null; 57 List<CalcWaybill> list = null;
58 58
59 int flag = 0; 59 int flag = 0;
60 - if("驾驶员".equals(empnames)){ 60 + if("$$$$$${txt-3568}".equals(empnames)){
61 flag = 1; 61 flag = 1;
62 list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont); 62 list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont);
63 - } else if("售票员".equals(empnames)){ 63 + } else if("$$$$$${txt-3567}".equals(empnames)){
64 flag = 2; 64 flag = 2;
65 list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont); 65 list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
66 - } else if("车辆自编号".equals(empnames)){ 66 + } else if("$$$$$${txt-2008}".equals(empnames)){
67 flag = 3; 67 flag = 3;
68 list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont); 68 list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont);
69 } 69 }
@@ -72,7 +72,7 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -72,7 +72,7 @@ public class CalcMixServiceImpl implements CalcMixService {
72 Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>(); 72 Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>();
73 73
74 CalcWaybill zjCalc = this.initCalcWaybill(); 74 CalcWaybill zjCalc = this.initCalcWaybill();
75 - zjCalc.setjName("合计"); 75 + zjCalc.setjName("$$$$$${txt-3916}");
76 for(CalcWaybill c : list){ 76 for(CalcWaybill c : list){
77 String key = ""; 77 String key = "";
78 if(flag == 1){ 78 if(flag == 1){
@@ -105,7 +105,7 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -105,7 +105,7 @@ public class CalcMixServiceImpl implements CalcMixService {
105 105
106 } 106 }
107 calcList.add(zjCalc); 107 calcList.add(zjCalc);
108 - calcMap.put("合计", zjCalc); 108 + calcMap.put("$$$$$${txt-3916}", zjCalc);
109 109
110 for(CalcWaybill c : calcList){ 110 for(CalcWaybill c : calcList){
111 Map<String, Object> m = new HashMap<String, Object>(); 111 Map<String, Object> m = new HashMap<String, Object>();
@@ -178,13 +178,13 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -178,13 +178,13 @@ public class CalcMixServiceImpl implements CalcMixService {
178 List<CalcWaybill> list = null; 178 List<CalcWaybill> list = null;
179 179
180 int flag = 0; 180 int flag = 0;
181 - if("驾驶员".equals(tjtype)){ 181 + if("$$$$$${txt-3568}".equals(tjtype)){
182 flag = 1; 182 flag = 1;
183 list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont); 183 list = calcRepository.scheduleByJsy(line, date, date2, gsdm, fgsdm, cont);
184 - } else if("售票员".equals(tjtype)){ 184 + } else if("$$$$$${txt-3567}".equals(tjtype)){
185 flag = 2; 185 flag = 2;
186 list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont); 186 list = calcRepository.scheduleBySpy(line, date, date2, gsdm, fgsdm, cont);
187 - } else if("车辆自编号".equals(tjtype)){ 187 + } else if("$$$$$${txt-2008}".equals(tjtype)){
188 flag = 3; 188 flag = 3;
189 if("1".equals(sfdc)){ 189 if("1".equals(sfdc)){
190 list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, true); 190 list = calcRepository.scheduleByZbh(line, date, date2, gsdm, fgsdm, cont, true);
@@ -199,7 +199,7 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -199,7 +199,7 @@ public class CalcMixServiceImpl implements CalcMixService {
199 Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>(); 199 Map<String, CalcWaybill> calcMap = new HashMap<String, CalcWaybill>();
200 200
201 CalcWaybill zjCalc = this.initCalcWaybill(); 201 CalcWaybill zjCalc = this.initCalcWaybill();
202 - zjCalc.setjName("合计"); 202 + zjCalc.setjName("$$$$$${txt-3916}");
203 for(CalcWaybill c : list){ 203 for(CalcWaybill c : list){
204 String key = ""; 204 String key = "";
205 if(flag == 1){ 205 if(flag == 1){
@@ -237,7 +237,7 @@ public class CalcMixServiceImpl implements CalcMixService { @@ -237,7 +237,7 @@ public class CalcMixServiceImpl implements CalcMixService {
237 237
238 } 238 }
239 calcList.add(zjCalc); 239 calcList.add(zjCalc);
240 - calcMap.put("合计", zjCalc); 240 + calcMap.put("$$$$$${txt-3916}", zjCalc);
241 241
242 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>(); 242 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
243 for(CalcWaybill c : calcList){ 243 for(CalcWaybill c : calcList){
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
  View file @3e58009
@@ -176,22 +176,22 @@ public class CalcToolServiceImpl implements CalcToolService { @@ -176,22 +176,22 @@ public class CalcToolServiceImpl implements CalcToolService {
176 double ljfyylc_j=culateMileageService.culateLjfyylc_j(list_s);//无售 176 double ljfyylc_j=culateMileageService.culateLjfyylc_j(list_s);//无售
177 int lbbc=culateMileageService.culateLbbc(list_); 177 int lbbc=culateMileageService.culateLbbc(list_);
178 double lblc=culateMileageService.culateLbgl(list_); 178 double lblc=culateMileageService.culateLbgl(list_);
179 - double ssgl_lz= culateMileageService.culateCJLC(list_, "路阻");  
180 - double ssgl_dm= culateMileageService.culateCJLC(list_, "吊慢");  
181 - double ssgl_gz= culateMileageService.culateCJLC(list_, "故障");  
182 - double ssgl_jf= culateMileageService.culateCJLC(list_, "纠纷");  
183 - double ssgl_zs= culateMileageService.culateCJLC(list_, "肇事");  
184 - double ssgl_qr= culateMileageService.culateCJLC(list_, "缺人");  
185 - double ssgl_qc= culateMileageService.culateCJLC(list_, "缺车");  
186 - double ssgl_kx= culateMileageService.culateCJLC(list_, "客稀");  
187 - double ssgl_qh= culateMileageService.culateCJLC(list_, "气候");  
188 - double ssgl_yw= culateMileageService.culateCJLC(list_, "援外");  
189 - double ssgl_ljpm= culateMileageService.culateCJLC(list_, "路救抛锚"); 179 + double ssgl_lz= culateMileageService.culateCJLC(list_, "$$$$$${txt-3961}");
  180 + double ssgl_dm= culateMileageService.culateCJLC(list_, "$$$$$${txt-3963}");
  181 + double ssgl_gz= culateMileageService.culateCJLC(list_, "$$$$$${txt-3840}");
  182 + double ssgl_jf= culateMileageService.culateCJLC(list_, "$$$$$${txt-3838}");
  183 + double ssgl_zs= culateMileageService.culateCJLC(list_, "$$$$$${txt-3837}");
  184 + double ssgl_qr= culateMileageService.culateCJLC(list_, "$$$$$${txt-3957}");
  185 + double ssgl_qc= culateMileageService.culateCJLC(list_, "$$$$$${txt-3958}");
  186 + double ssgl_kx= culateMileageService.culateCJLC(list_, "$$$$$${txt-3962}");
  187 + double ssgl_qh= culateMileageService.culateCJLC(list_, "$$$$$${txt-3960}");
  188 + double ssgl_yw= culateMileageService.culateCJLC(list_, "$$$$$${txt-3956}");
  189 + double ssgl_ljpm= culateMileageService.culateCJLC(list_, "$$$$$${txt-2765}");
190 190
191 - double ssgl_pc=culateMileageService.culateCJLC(list_, "配车");  
192 - double ssgl_by=culateMileageService.culateCJLC(list_, "保养");  
193 - double ssgl_cj=culateMileageService.culateCJLC(list_, "抽减");  
194 - double ssgl_qt=culateMileageService.culateCJLC(list_, "其他"); 191 + double ssgl_pc=culateMileageService.culateCJLC(list_, "$$$$$${txt-4026}");
  192 + double ssgl_by=culateMileageService.culateCJLC(list_, "$$$$$${txt-4102}");
  193 + double ssgl_cj=culateMileageService.culateCJLC(list_, "$$$$$${txt-3876}");
  194 + double ssgl_qt=culateMileageService.culateCJLC(list_, "$$$$$${txt-4197}");
195 double ssgl_qtz=Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj,ssgl_qt)); 195 double ssgl_qtz=Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj,ssgl_qt));
196 int fzbc=culateMileageService.culateDtfzbc(list_s, "major", "");//放站 196 int fzbc=culateMileageService.culateDtfzbc(list_s, "major", "");//放站
197 int fzbcZgf=culateMileageService.culateDtfzbc(list_s, "major", "zgf"); 197 int fzbcZgf=culateMileageService.culateDtfzbc(list_s, "major", "zgf");
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @3e58009
@@ -353,7 +353,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -353,7 +353,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
353 lists.add(calc); 353 lists.add(calc);
354 } 354 }
355 CalcWaybill sum = new CalcWaybill(); 355 CalcWaybill sum = new CalcWaybill();
356 - sum.setXlName("合计"); 356 + sum.setXlName("$$$$$${txt-3916}");
357 for(CalcWaybill c : lists){ 357 for(CalcWaybill c : lists){
358 sum.setJhyylc(Arith.add(sum.getJhyylc()!=null?sum.getJhyylc():0, c.getJhyylc())); 358 sum.setJhyylc(Arith.add(sum.getJhyylc()!=null?sum.getJhyylc():0, c.getJhyylc()));
359 sum.setJhfyylc(Arith.add(sum.getJhfyylc()!=null?sum.getJhfyylc():0, c.getJhfyylc())); 359 sum.setJhfyylc(Arith.add(sum.getJhfyylc()!=null?sum.getJhfyylc():0, c.getJhfyylc()));
@@ -445,7 +445,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -445,7 +445,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
445 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 445 sdfSimple = new SimpleDateFormat("yyyyMMdd");
446 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 446 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
447 Map<String, Object> m = new HashMap<String, Object>(); 447 Map<String, Object> m = new HashMap<String, Object>();
448 - m.put("date", date+"至"+date2); 448 + m.put("date", date+"-"+date2);
449 ReportUtils ee = new ReportUtils(); 449 ReportUtils ee = new ReportUtils();
450 try { 450 try {
451 String dateTime = ""; 451 String dateTime = "";
@@ -458,7 +458,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -458,7 +458,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
458 listI.add(resList.iterator()); 458 listI.add(resList.iterator());
459 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 459 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
460 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", 460 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
461 - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); 461 + path + "export/" + dateTime + "-" + xlName + "-$$$$$${txt-2447}.xls");
462 } catch (Exception e) { 462 } catch (Exception e) {
463 // TODO: handle exception 463 // TODO: handle exception
464 //e.printStackTrace(); 464 //e.printStackTrace();
@@ -660,21 +660,21 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -660,21 +660,21 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
660 // map.put("zt", 1); 660 // map.put("zt", 1);
661 // } 661 // }
662 662
663 - s.setLzlc(culateService.culateCJLC(list, "路阻"));  
664 - s.setDmlc(culateService.culateCJLC(list, "吊慢"));  
665 - s.setGzlc(culateService.culateCJLC(list, "故障"));  
666 - s.setJflc(culateService.culateCJLC(list, "纠纷"));  
667 - s.setZslc(culateService.culateCJLC(list, "肇事"));  
668 - s.setQrlc(culateService.culateCJLC(list, "缺人"));  
669 - s.setQclc(culateService.culateCJLC(list, "缺车"));  
670 - s.setKxlc(culateService.culateCJLC(list, "客稀"));  
671 - s.setQhlc(culateService.culateCJLC(list, "气候"));  
672 - s.setYwlc(culateService.culateCJLC(list, "援外"));  
673 - s.setLjpmlc(culateService.culateCJLC(list, "路救抛锚"));  
674 - double ssgl_pc=culateService.culateCJLC(list, "配车");  
675 - double ssgl_by=culateService.culateCJLC(list, "保养");  
676 - double ssgl_cj=culateService.culateCJLC(list, "抽减");  
677 - double ssgl_qt=culateService.culateCJLC(list, "其他"); 663 + s.setLzlc(culateService.culateCJLC(list, "$$$$$${txt-3961}"));
  664 + s.setDmlc(culateService.culateCJLC(list, "$$$$$${txt-3963}"));
  665 + s.setGzlc(culateService.culateCJLC(list, "$$$$$${txt-3840}"));
  666 + s.setJflc(culateService.culateCJLC(list, "$$$$$${txt-3838}"));
  667 + s.setZslc(culateService.culateCJLC(list, "$$$$$${txt-3837}"));
  668 + s.setQrlc(culateService.culateCJLC(list, "$$$$$${txt-3957}"));
  669 + s.setQclc(culateService.culateCJLC(list, "$$$$$${txt-3958}"));
  670 + s.setKxlc(culateService.culateCJLC(list, "$$$$$${txt-3962}"));
  671 + s.setQhlc(culateService.culateCJLC(list, "$$$$$${txt-3960}"));
  672 + s.setYwlc(culateService.culateCJLC(list, "$$$$$${txt-3956}"));
  673 + s.setLjpmlc(culateService.culateCJLC(list, "$$$$$${txt-2765}"));
  674 + double ssgl_pc=culateService.culateCJLC(list, "$$$$$${txt-4026}");
  675 + double ssgl_by=culateService.culateCJLC(list, "$$$$$${txt-4102}");
  676 + double ssgl_cj=culateService.culateCJLC(list, "$$$$$${txt-3876}");
  677 + double ssgl_qt=culateService.culateCJLC(list, "$$$$$${txt-4197}");
678 s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt))); 678 s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
679 s.setLjlc(ljgl); 679 s.setLjlc(ljgl);
680 680
@@ -807,7 +807,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -807,7 +807,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
807 807
808 if(resList.size() > 0){ 808 if(resList.size() > 0){
809 CalcStatistics temp = new CalcStatistics(); 809 CalcStatistics temp = new CalcStatistics();
810 - temp.setXlName("合计"); 810 + temp.setXlName("$$$$$${txt-3916}");
811 temp.setFgsName(""); 811 temp.setFgsName("");
812 temp.setGsName(""); 812 temp.setGsName("");
813 for(CalcStatistics s : resList){ 813 for(CalcStatistics s : resList){
@@ -871,7 +871,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -871,7 +871,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
871 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 871 sdfSimple = new SimpleDateFormat("yyyyMMdd");
872 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 872 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
873 Map<String, Object> m = new HashMap<String, Object>(); 873 Map<String, Object> m = new HashMap<String, Object>();
874 - m.put("date", date+"至"+date2); 874 + m.put("date", date+"-"+date2);
875 ReportUtils ee = new ReportUtils(); 875 ReportUtils ee = new ReportUtils();
876 try { 876 try {
877 String dateTime = ""; 877 String dateTime = "";
@@ -884,7 +884,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -884,7 +884,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
884 listI.add(mapList.iterator()); 884 listI.add(mapList.iterator());
885 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 885 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
886 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls", 886 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_.xls",
887 - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); 887 + path + "export/" + dateTime + "-" + xlName + "-$$$$$${txt-2447}.xls");
888 } catch (Exception e) { 888 } catch (Exception e) {
889 // TODO: handle exception 889 // TODO: handle exception
890 //e.printStackTrace(); 890 //e.printStackTrace();
@@ -913,7 +913,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -913,7 +913,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
913 temp = tempMap.get(gsName); 913 temp = tempMap.get(gsName);
914 } else { 914 } else {
915 temp.put("gsName", gsName); 915 temp.put("gsName", gsName);
916 - temp.put("fgsName", "小计"); 916 + temp.put("fgsName", "$$$$$${txt-3918}");
917 temp.put("xlName", ""); 917 temp.put("xlName", "");
918 tempList.add(temp); 918 tempList.add(temp);
919 tempMap.put(gsName, temp); 919 tempMap.put(gsName, temp);
@@ -934,7 +934,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -934,7 +934,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
934 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 934 sdfSimple = new SimpleDateFormat("yyyyMMdd");
935 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 935 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
936 Map<String, Object> m = new HashMap<String, Object>(); 936 Map<String, Object> m = new HashMap<String, Object>();
937 - m.put("date", date + "至" + date2); 937 + m.put("date", date + "-" + date2);
938 ReportUtils ee = new ReportUtils(); 938 ReportUtils ee = new ReportUtils();
939 try { 939 try {
940 String dateTime = ""; 940 String dateTime = "";
@@ -947,7 +947,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -947,7 +947,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
947 listI.add(mapList.iterator()); 947 listI.add(mapList.iterator());
948 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 948 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
949 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", 949 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls",
950 - path + "export/" + dateTime + "-全部公司-统计日报.xls"); 950 + path + "export/" + dateTime + "-$$$$$${txt-2416}-$$$$$${txt-2447}.xls");
951 } catch (Exception e) { 951 } catch (Exception e) {
952 // TODO: handle exception 952 // TODO: handle exception
953 //e.printStackTrace(); 953 //e.printStackTrace();
@@ -1062,7 +1062,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1062,7 +1062,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1062 1062
1063 if(resList.size() > 0){ 1063 if(resList.size() > 0){
1064 CalcStatistics temp = new CalcStatistics(); 1064 CalcStatistics temp = new CalcStatistics();
1065 - temp.setXlName("合计"); 1065 + temp.setXlName("$$$$$${txt-3916}");
1066 temp.setXl("hj"); 1066 temp.setXl("hj");
1067 for(CalcStatistics s : resList){ 1067 for(CalcStatistics s : resList){
1068 temp = addStatistics(temp, s); 1068 temp = addStatistics(temp, s);
@@ -1254,7 +1254,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1254,7 +1254,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1254 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 1254 sdfSimple = new SimpleDateFormat("yyyyMMdd");
1255 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 1255 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
1256 Map<String, Object> m = new HashMap<String, Object>(); 1256 Map<String, Object> m = new HashMap<String, Object>();
1257 - m.put("date", date+"至"+date2); 1257 + m.put("date", date+"-"+date2);
1258 ReportUtils ee = new ReportUtils(); 1258 ReportUtils ee = new ReportUtils();
1259 try { 1259 try {
1260 String dateTime = ""; 1260 String dateTime = "";
@@ -1267,7 +1267,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1267,7 +1267,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1267 listI.add(mapListHj.iterator()); 1267 listI.add(mapListHj.iterator());
1268 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1268 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1269 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", 1269 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
1270 - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); 1270 + path + "export/" + dateTime + "-" + xlName + "-$$$$$${txt-2447}.xls");
1271 } catch (Exception e) { 1271 } catch (Exception e) {
1272 // TODO: handle exception 1272 // TODO: handle exception
1273 //e.printStackTrace(); 1273 //e.printStackTrace();
@@ -1381,7 +1381,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1381,7 +1381,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1381 List<Map<String, Object>> countByList = reportService.countByList(map); 1381 List<Map<String, Object>> countByList = reportService.countByList(map);
1382 for(Map<String, Object> m : countByList){ 1382 for(Map<String, Object> m : countByList){
1383 if(!m.containsKey("xlName") || m.get("xlName")==null 1383 if(!m.containsKey("xlName") || m.get("xlName")==null
1384 - || m.get("xlName").toString().equals("合计")) 1384 + || m.get("xlName").toString().equals("$$$$$${txt-3916}"))
1385 continue; 1385 continue;
1386 CalcLineMileage c = new CalcLineMileage(); 1386 CalcLineMileage c = new CalcLineMileage();
1387 c.setDate(sdf.parse(date)); 1387 c.setDate(sdf.parse(date));
@@ -1508,7 +1508,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1508,7 +1508,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1508 List<Map<String, Object>> countByList = reportService.countByBusList(map); 1508 List<Map<String, Object>> countByList = reportService.countByBusList(map);
1509 for(Map<String, Object> m : countByList){ 1509 for(Map<String, Object> m : countByList){
1510 if(!m.containsKey("xlName") || m.get("xlName")==null 1510 if(!m.containsKey("xlName") || m.get("xlName")==null
1511 - || m.get("xlName").toString().equals("合计")) 1511 + || m.get("xlName").toString().equals("$$$$$${txt-3916}"))
1512 continue; 1512 continue;
1513 CalcBusMileage c = new CalcBusMileage(); 1513 CalcBusMileage c = new CalcBusMileage();
1514 c.setDate(sdf.parse(date)); 1514 c.setDate(sdf.parse(date));
@@ -1609,7 +1609,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1609,7 +1609,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1609 } 1609 }
1610 1610
1611 CalcLineMileage temp = new CalcLineMileage(); 1611 CalcLineMileage temp = new CalcLineMileage();
1612 - temp.setXlName("合计"); 1612 + temp.setXlName("$$$$$${txt-3916}");
1613 for(CalcLineMileage c : calcs){ 1613 for(CalcLineMileage c : calcs){
1614 temp = addLineMileage(temp, c); 1614 temp = addLineMileage(temp, c);
1615 resList.add(c); 1615 resList.add(c);
@@ -1619,7 +1619,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1619,7 +1619,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1619 1619
1620 for(CalcLineMileage c : resList){ 1620 for(CalcLineMileage c : resList){
1621 Map<String, Object> m = new HashMap<String, Object>(); 1621 Map<String, Object> m = new HashMap<String, Object>();
1622 - if(c.getXlName().equals("合计")){ 1622 + if(c.getXlName().equals("$$$$$${txt-3916}")){
1623 m.put("gsdm", ""); 1623 m.put("gsdm", "");
1624 m.put("gs", ""); 1624 m.put("gs", "");
1625 m.put("fgsdm", ""); 1625 m.put("fgsdm", "");
@@ -1691,7 +1691,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1691,7 +1691,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1691 listI.add(lMap.iterator()); 1691 listI.add(lMap.iterator());
1692 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1692 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1693 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 1693 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
1694 - path + "export/"+dateTime+"-"+xlName+"-线路公里统计表.xls"); 1694 + path + "export/"+dateTime+"-"+xlName+"-$$$$$${txt-996}.xls");
1695 } catch (Exception e) { 1695 } catch (Exception e) {
1696 // TODO: handle exception 1696 // TODO: handle exception
1697 e.printStackTrace(); 1697 e.printStackTrace();
@@ -1789,7 +1789,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1789,7 +1789,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1789 if(date.equals(date2)){ 1789 if(date.equals(date2)){
1790 m.put("rq", date); 1790 m.put("rq", date);
1791 } else { 1791 } else {
1792 - m.put("rq", date + "至" + date2); 1792 + m.put("rq", date + "-" + date2);
1793 } 1793 }
1794 m.put("fgs", c.getFgsName()); 1794 m.put("fgs", c.getFgsName());
1795 m.put("xlName", c.getXlName()); 1795 m.put("xlName", c.getXlName());
@@ -1857,7 +1857,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -1857,7 +1857,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
1857 listI.add(lMap.iterator()); 1857 listI.add(lMap.iterator());
1858 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1858 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1859 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 1859 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
1860 - path + "export/"+dateTime+"-"+xlName+"-路单数据统计表.xls"); 1860 + path + "export/"+dateTime+"-"+xlName+"-$$$$$${txt-1004}.xls");
1861 } catch (Exception e) { 1861 } catch (Exception e) {
1862 // TODO: handle exception 1862 // TODO: handle exception
1863 e.printStackTrace(); 1863 e.printStackTrace();
@@ -2385,7 +2385,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -2385,7 +2385,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2385 } 2385 }
2386 2386
2387 CalcWaybillDetail zjCalc = this.initCalcWaybillDetail(); 2387 CalcWaybillDetail zjCalc = this.initCalcWaybillDetail();
2388 - zjCalc.setjName("合计"); 2388 + zjCalc.setjName("$$$$$${txt-3916}");
2389 // 横向数据的第几天下标 2389 // 横向数据的第几天下标
2390 int dayIndex = 0; 2390 int dayIndex = 0;
2391 int dayIndexPrev = -1; 2391 int dayIndexPrev = -1;
@@ -2554,30 +2554,30 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -2554,30 +2554,30 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2554 Iterator iter = keyMap.entrySet().iterator(); 2554 Iterator iter = keyMap.entrySet().iterator();
2555 2555
2556 List<String> list1 = new ArrayList<>(); 2556 List<String> list1 = new ArrayList<>();
2557 - list1.add("序号");  
2558 - list1.add("所属公司");  
2559 - list1.add("线路"); 2557 + list1.add("$$$$$${txt-3934}");
  2558 + list1.add("$$$$$${txt-2686}");
  2559 + list1.add("$$$$$${txt-3815}");
2560 if(flag==1 ||flag==2 ){ 2560 if(flag==1 ||flag==2 ){
2561 list1.add("工号"); 2561 list1.add("工号");
2562 - list1.add("姓名"); 2562 + list1.add("$$$$$${txt-3949}");
2563 } else if(flag==3){ 2563 } else if(flag==3){
2564 - list1.add("自编号");  
2565 - list1.add("车牌号");  
2566 - list1.add("燃油类型"); 2564 + list1.add("$$$$$${txt-3764}");
  2565 + list1.add("$$$$$${txt-3704}");
  2566 + list1.add("$$$$$${txt-2595}");
2567 } 2567 }
2568 - list1.add("计划公里"); 2568 + list1.add("$$$$$${txt-3185}");
2569 list1.add("总公里"); 2569 list1.add("总公里");
2570 - list1.add("空驶公里");  
2571 - list1.add("临加公里");  
2572 - list1.add("烂班公里"); 2570 + list1.add("$$$$$${txt-2437}");
  2571 + list1.add("$$$$$${txt-2781}");
  2572 + list1.add("$$$$$${txt-2468}");
2573 list1.add("m".equals(timeType)?"天数":"月数"); 2573 list1.add("m".equals(timeType)?"天数":"月数");
2574 for(int i=day; i<=day2; i++){ 2574 for(int i=day; i<=day2; i++){
2575 list1.add((i<10?"0"+i:i)+("m".equals(timeType)?"日":"月")); 2575 list1.add((i<10?"0"+i:i)+("m".equals(timeType)?"日":"月"));
2576 } 2576 }
2577 if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){ 2577 if("bgldh".equals(itemDetails) || "bglyh".equals(itemDetails)){
2578 - list1.add("平均"); 2578 + list1.add("$$$$$${txt-3986}");
2579 } else 2579 } else
2580 - list1.add("合计"); 2580 + list1.add("$$$$$${txt-3916}");
2581 resList.add(list1); 2581 resList.add(list1);
2582 2582
2583 Map<String, String> carsMap = new HashMap<>(); 2583 Map<String, String> carsMap = new HashMap<>();
@@ -2676,7 +2676,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer @@ -2676,7 +2676,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2676 2676
2677 // 合计列 2677 // 合计列
2678 List<String> listEnd = new ArrayList<>(); 2678 List<String> listEnd = new ArrayList<>();
2679 - listEnd.add("合计"); 2679 + listEnd.add("$$$$$${txt-3916}");
2680 listEnd.add(df.format(Arith.add(zjCalc.getJhyylc(), zjCalc.getJhfyylc()))); 2680 listEnd.add(df.format(Arith.add(zjCalc.getJhyylc(), zjCalc.getJhfyylc())));
2681 listEnd.add(df.format(Arith.add(Arith.add(zjCalc.getSjyylc(), zjCalc.getSjfyylc()), 2681 listEnd.add(df.format(Arith.add(Arith.add(zjCalc.getSjyylc(), zjCalc.getSjfyylc()),
2682 Arith.add(zjCalc.getLjyylc(), zjCalc.getLjfyylc()))));//总公里 2682 Arith.add(zjCalc.getLjyylc(), zjCalc.getLjfyylc()))));//总公里
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
  View file @3e58009
@@ -22,6 +22,7 @@ import com.bsth.repository.directive.D80Repository; @@ -22,6 +22,7 @@ import com.bsth.repository.directive.D80Repository;
22 import com.bsth.security.util.SecurityUtils; 22 import com.bsth.security.util.SecurityUtils;
23 import com.bsth.service.directive.dto.DeviceConfigDto; 23 import com.bsth.service.directive.dto.DeviceConfigDto;
24 import com.bsth.service.impl.BaseServiceImpl; 24 import com.bsth.service.impl.BaseServiceImpl;
  25 +import com.bsth.util.I18n;
25 import com.bsth.websocket.handler.RealControlSocketHandler; 26 import com.bsth.websocket.handler.RealControlSocketHandler;
26 import com.fasterxml.jackson.core.JsonProcessingException; 27 import com.fasterxml.jackson.core.JsonProcessingException;
27 import com.fasterxml.jackson.databind.ObjectMapper; 28 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -71,6 +72,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -71,6 +72,9 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
71 @Autowired 72 @Autowired
72 JdbcTemplate jdbcTemplate; 73 JdbcTemplate jdbcTemplate;
73 74
  75 + @Autowired
  76 + private I18n i18n;
  77 +
74 //static Long schDiff = 1000 * 60 * 60L; 78 //static Long schDiff = 1000 * 60 * 60L;
75 79
76 private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分"); 80 private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm"), fmtHHmm_CN = DateTimeFormat.forPattern("HH点mm分");
@@ -114,14 +118,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -114,14 +118,13 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
114 118
115 //待发应到时间 119 //待发应到时间
116 String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000)); 120 String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
117 - String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"  
118 - + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + dfsj; 121 + String text = "$$$$$${txt-4332}";
119 122
120 if(sch.getBcType().equals("venting")){ 123 if(sch.getBcType().equals("venting")){
121 - text += " (直放)"; 124 + text += " ($$$$$${txt-3988})";
122 } 125 }
123 else if(sch.getBcType().equals("major")){ 126 else if(sch.getBcType().equals("major")){
124 - text += " (放站到"+sch.getMajorStationName()+"带客)"; 127 + text += i18n.getMessage("txt-4490", new String[]{ sch.getMajorStationName() });
125 } else if ("ldks".equals(sch.getBcType())) { 128 } else if ("ldks".equals(sch.getBcType())) {
126 text += " (两点空驶)"; 129 text += " (两点空驶)";
127 } 130 }
@@ -209,7 +212,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -209,7 +212,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
209 public int send60Operation(String nbbm, int state, int upDown, String sender) { 212 public int send60Operation(String nbbm, int state, int upDown, String sender) {
210 logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown); 213 logger.info("切换运营状态, nbbm: " + nbbm + " ,state: " + state + " ,upDown:" + upDown);
211 214
212 - String text = "切换为 " + (upDown == 0 ? "上行" : "下行") + (state == 0 ? "营运" : "未营运"); 215 + String text = "切换为 " + (upDown == 0 ? "$$$$$${txt-3858}" : "$$$$$${txt-3857}") + (state == 0 ? "$$$$$${txt-3966}" : "$$$$$${txt-4457}");
213 D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null); 216 D60 d60 = new DirectiveCreator().createD60(nbbm, text, (short) 0x03, upDown, state, null);
214 217
215 if (null == d60) 218 if (null == d60)
@@ -259,7 +262,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen @@ -259,7 +262,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
259 int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64)); 262 int code = GatewayHttpUtils.postJson(JSON.toJSONString(d64));
260 // 入库 263 // 入库
261 d64.setHttpCode(code); 264 d64.setHttpCode(code);
262 - d64.getData().setTxtContent("切换线路[" + BasicData.lineCode2NameMap.get(lineCode) + "]"); 265 + d64.getData().setTxtContent("$$$$$${txt-3269}[" + BasicData.lineCode2NameMap.get(lineCode) + "]");
263 // 通知设备刷新线路文件，忽略结果 266 // 通知设备刷新线路文件，忽略结果
264 if (code == 0) 267 if (code == 0)
265 GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode)); 268 GatewayHttpUtils.postJson(crt.createDeviceRefreshData(deviceId, lineCode));
src/main/java/com/bsth/service/excep/impl/NowOfflineServiceImpl.java
  View file @3e58009
@@ -397,11 +397,11 @@ public class NowOfflineServiceImpl implements NowOfflineService { @@ -397,11 +397,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
403 else 403 else
404 - newMap.put("xAxis", "无效"); 404 + newMap.put("xAxis", "$$$$$${txt-4006}");
405 405
406 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 406 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
407 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 407 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/excep/impl/NowOutboundServiceImpl.java
  View file @3e58009
@@ -301,11 +301,11 @@ public class NowOutboundServiceImpl implements NowOutboundService{ @@ -301,11 +301,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
307 else 307 else
308 - newMap.put("xAxis", "无效"); 308 + newMap.put("xAxis", "$$$$$${txt-4006}");
309 309
310 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 310 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
311 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 311 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/excep/impl/NowSpeedingServiceImpl.java
  View file @3e58009
@@ -276,11 +276,11 @@ public class NowSpeedingServiceImpl implements NowSpeedingService { @@ -276,11 +276,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
282 else 282 else
283 - newMap.put("xAxis", "无效"); 283 + newMap.put("xAxis", "$$$$$${txt-4006}");
284 284
285 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 285 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
286 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 286 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
  View file @3e58009
@@ -399,11 +399,11 @@ public class OfflineServiceImpl implements OfflineService { @@ -399,11 +399,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
405 else 405 else
406 - newMap.put("xAxis", "无效"); 406 + newMap.put("xAxis", "$$$$$${txt-4006}");
407 407
408 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 408 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
409 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 409 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
  View file @3e58009
@@ -290,11 +290,11 @@ public class OutboundServiceImpl implements OutboundService{ @@ -290,11 +290,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
296 else 296 else
297 - newMap.put("xAxis", "无效"); 297 + newMap.put("xAxis", "$$$$$${txt-4006}");
298 298
299 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 299 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
300 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 300 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
  View file @3e58009
@@ -278,11 +278,11 @@ public class SpeedingServiceImpl implements SpeedingService { @@ -278,11 +278,11 @@ 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", "$$$$$${txt-3858}");
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", "$$$$$${txt-3857}");
284 else 284 else
285 - newMap.put("xAxis", "无效"); 285 + newMap.put("xAxis", "$$$$$${txt-4006}");
286 286
287 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" ) 287 if(BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!=null && BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())!="" )
288 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString())); 288 newMap.put("legend", BasicData.lineCode2NameMap.get(rs.getObject("legend").toString()));
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
  View file @3e58009
@@ -269,7 +269,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -269,7 +269,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
269 }catch (Exception e) { 269 }catch (Exception e) {
270 // TODO Auto-generated catch block 270 // TODO Auto-generated catch block
271 e.printStackTrace(); 271 e.printStackTrace();
272 - return msg.length()>0?msg:"文件导入失败"; 272 + return msg.length()>0?msg:"$$$$$${txt-1429}";
273 } finally { 273 } finally {
274 file.delete(); 274 file.delete();
275 } 275 }
@@ -819,7 +819,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -819,7 +819,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
819 listI.add(resList.iterator()); 819 listI.add(resList.iterator());
820 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 820 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
821 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 821 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
822 - path + "export/"+dateTime+"-预算公里明细表.xls"); 822 + path + "export/"+dateTime+"-$$$$$${txt-993}.xls");
823 } catch (Exception e) { 823 } catch (Exception e) {
824 // TODO: handle exception 824 // TODO: handle exception
825 e.printStackTrace(); 825 e.printStackTrace();
@@ -842,7 +842,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -842,7 +842,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
842 } 842 }
843 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 843 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
844 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetMileage_data.xls", 844 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetMileage_data.xls",
845 - path + "export/" + year + "-预算公里明细表-线路明细.xls"); 845 + path + "export/" + year + "-$$$$$${txt-993}-$$$$$${txt-2642}.xls");
846 } catch (Exception e) { 846 } catch (Exception e) {
847 // TODO: handle exception 847 // TODO: handle exception
848 e.printStackTrace(); 848 e.printStackTrace();
@@ -1259,7 +1259,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1259,7 +1259,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1259 listI.add(resList.iterator()); 1259 listI.add(resList.iterator());
1260 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1260 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1261 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 1261 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
1262 - path + "export/"+dateTime+"-预算人次明细表.xls"); 1262 + path + "export/"+dateTime+"-$$$$$${txt-992}.xls");
1263 } catch (Exception e) { 1263 } catch (Exception e) {
1264 // TODO: handle exception 1264 // TODO: handle exception
1265 e.printStackTrace(); 1265 e.printStackTrace();
@@ -1282,7 +1282,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1282,7 +1282,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1282 } 1282 }
1283 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1283 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1284 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetPerson_data.xls", 1284 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetPerson_data.xls",
1285 - path + "export/" + year + "-预算人次明细表-线路明细.xls"); 1285 + path + "export/" + year + "-$$$$$${txt-992}-$$$$$${txt-2642}.xls");
1286 } catch (Exception e) { 1286 } catch (Exception e) {
1287 // TODO: handle exception 1287 // TODO: handle exception
1288 e.printStackTrace(); 1288 e.printStackTrace();
@@ -1744,7 +1744,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1744,7 +1744,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1744 listI.add(resList.iterator()); 1744 listI.add(resList.iterator());
1745 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1745 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1746 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 1746 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
1747 - path + "export/"+dateTime+"-预算营收明细表.xls"); 1747 + path + "export/"+dateTime+"-$$$$$${txt-991}.xls");
1748 } catch (Exception e) { 1748 } catch (Exception e) {
1749 // TODO: handle exception 1749 // TODO: handle exception
1750 e.printStackTrace(); 1750 e.printStackTrace();
@@ -1767,7 +1767,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1767,7 +1767,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1767 } 1767 }
1768 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1768 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1769 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetAmounts_data.xls", 1769 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetAmounts_data.xls",
1770 - path + "export/" + year + "-预算营收明细表-线路明细.xls"); 1770 + path + "export/" + year + "-$$$$$${txt-991}-$$$$$${txt-2642}.xls");
1771 } catch (Exception e) { 1771 } catch (Exception e) {
1772 // TODO: handle exception 1772 // TODO: handle exception
1773 e.printStackTrace(); 1773 e.printStackTrace();
@@ -1833,7 +1833,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1833,7 +1833,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1833 m.put("gsName", b.getGsName()); 1833 m.put("gsName", b.getGsName());
1834 m.put("xlBm", xlBm); 1834 m.put("xlBm", xlBm);
1835 m.put("xlName", xlName); 1835 m.put("xlName", xlName);
1836 - m.put("type", "公里"); 1836 + m.put("type", "$$$$$${txt-4138}");
1837 m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):""); 1837 m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
1838 m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):""); 1838 m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
1839 m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):""); 1839 m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
@@ -1887,7 +1887,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1887,7 +1887,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1887 m.put("gsName", b.getGsName()); 1887 m.put("gsName", b.getGsName());
1888 m.put("xlBm", xlBm); 1888 m.put("xlBm", xlBm);
1889 m.put("xlName", xlName); 1889 m.put("xlName", xlName);
1890 - m.put("type", "人次"); 1890 + m.put("type", "$$$$$${txt-4008}");
1891 m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):""); 1891 m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
1892 m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):""); 1892 m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
1893 m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):""); 1893 m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
@@ -1941,7 +1941,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1941,7 +1941,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1941 m.put("gsName", b.getGsName()); 1941 m.put("gsName", b.getGsName());
1942 m.put("xlBm", xlBm); 1942 m.put("xlBm", xlBm);
1943 m.put("xlName", xlName); 1943 m.put("xlName", xlName);
1944 - m.put("type", "营收"); 1944 + m.put("type", "$$$$$${txt-3937}");
1945 m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):""); 1945 m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
1946 m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):""); 1946 m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
1947 m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):""); 1947 m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
@@ -2012,7 +2012,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2012,7 +2012,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2012 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm)); 2012 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm));
2013 m.put("xlBm", xlBm); 2013 m.put("xlBm", xlBm);
2014 m.put("xlName", xlName); 2014 m.put("xlName", xlName);
2015 - m.put("type", "公里"); 2015 + m.put("type", "$$$$$${txt-4138}");
2016 m.put("budget", ""); 2016 m.put("budget", "");
2017 m.put("change", ""); 2017 m.put("change", "");
2018 m.put("formal", ""); 2018 m.put("formal", "");
@@ -2060,7 +2060,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2060,7 +2060,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2060 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm)); 2060 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm));
2061 m.put("xlBm", xlBm); 2061 m.put("xlBm", xlBm);
2062 m.put("xlName", xlName); 2062 m.put("xlName", xlName);
2063 - m.put("type", "人次"); 2063 + m.put("type", "$$$$$${txt-4008}");
2064 m.put("budget", ""); 2064 m.put("budget", "");
2065 m.put("change", ""); 2065 m.put("change", "");
2066 m.put("formal", ""); 2066 m.put("formal", "");
@@ -2091,7 +2091,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2091,7 +2091,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2091 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm)); 2091 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm));
2092 m.put("xlBm", xlBm); 2092 m.put("xlBm", xlBm);
2093 m.put("xlName", xlName); 2093 m.put("xlName", xlName);
2094 - m.put("type", "营收"); 2094 + m.put("type", "$$$$$${txt-3937}");
2095 m.put("budget", ""); 2095 m.put("budget", "");
2096 m.put("change", ""); 2096 m.put("change", "");
2097 m.put("formal", ""); 2097 m.put("formal", "");
@@ -2139,7 +2139,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2139,7 +2139,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2139 m.put("gsName", BasicData.businessCodeNameMap.get(gsdm)); 2139 m.put("gsName", BasicData.businessCodeNameMap.get(gsdm));
2140 m.put("xlBm", xlBm); 2140 m.put("xlBm", xlBm);
2141 m.put("xlName", xlName); 2141 m.put("xlName", xlName);
2142 - m.put("type", "公里"); 2142 + m.put("type", "$$$$$${txt-4138}");
2143 m.put("budget", ""); 2143 m.put("budget", "");
2144 m.put("change", ""); 2144 m.put("change", "");
2145 m.put("formal", ""); 2145 m.put("formal", "");
@@ -2187,7 +2187,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2187,7 +2187,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2187 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm)); 2187 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm));
2188 m.put("xlBm", xlBm); 2188 m.put("xlBm", xlBm);
2189 m.put("xlName", xlName); 2189 m.put("xlName", xlName);
2190 - m.put("type", "人次"); 2190 + m.put("type", "$$$$$${txt-4008}");
2191 m.put("budget", ""); 2191 m.put("budget", "");
2192 m.put("change", ""); 2192 m.put("change", "");
2193 m.put("formal", ""); 2193 m.put("formal", "");
@@ -2218,7 +2218,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2218,7 +2218,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2218 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm)); 2218 m.put("gsName", BasicData.businessCodeNameMap.get(gsBm));
2219 m.put("xlBm", xlBm); 2219 m.put("xlBm", xlBm);
2220 m.put("xlName", xlName); 2220 m.put("xlName", xlName);
2221 - m.put("type", "营收"); 2221 + m.put("type", "$$$$$${txt-3937}");
2222 m.put("budget", ""); 2222 m.put("budget", "");
2223 m.put("change", ""); 2223 m.put("change", "");
2224 m.put("formal", ""); 2224 m.put("formal", "");
@@ -2247,11 +2247,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2247,11 +2247,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2247 2247
2248 String gsBm = m.get("gsBm").toString(); 2248 String gsBm = m.get("gsBm").toString();
2249 String type = m.get("type").toString(); 2249 String type = m.get("type").toString();
2250 - if("公里".equals(type)){ 2250 + if("$$$$$${txt-4138}".equals(type)){
2251 type = "1"; 2251 type = "1";
2252 - } else if("人次".equals(type)){ 2252 + } else if("$$$$$${txt-4008}".equals(type)){
2253 type = "2"; 2253 type = "2";
2254 - } else if("营收".equals(type)){ 2254 + } else if("$$$$$${txt-3937}".equals(type)){
2255 type = "3"; 2255 type = "3";
2256 } 2256 }
2257 List<String> strList = new ArrayList<String>(); 2257 List<String> strList = new ArrayList<String>();
@@ -2318,7 +2318,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2318,7 +2318,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2318 } 2318 }
2319 2319
2320 String digit = "10000"; 2320 String digit = "10000";
2321 - if("营收".equals(m.get("type").toString())){ 2321 + if("$$$$$${txt-3937}".equals(m.get("type").toString())){
2322 digit = "1000000"; 2322 digit = "1000000";
2323 } 2323 }
2324 BigDecimal monAll = new BigDecimal("0"); 2324 BigDecimal monAll = new BigDecimal("0");
@@ -2411,7 +2411,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2411,7 +2411,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2411 BigDecimal monAll = new BigDecimal("0"); 2411 BigDecimal monAll = new BigDecimal("0");
2412 BigDecimal preAll = new BigDecimal("0"); 2412 BigDecimal preAll = new BigDecimal("0");
2413 String digit = "10000"; 2413 String digit = "10000";
2414 - if("营收".equals(m.get("type").toString())){ 2414 + if("$$$$$${txt-3937}".equals(m.get("type").toString())){
2415 digit = "1000000"; 2415 digit = "1000000";
2416 } 2416 }
2417 for(int i = 1; i <= 12; i++){ 2417 for(int i = 1; i <= 12; i++){
@@ -2484,7 +2484,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2484,7 +2484,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2484 listI.add(resList.iterator()); 2484 listI.add(resList.iterator());
2485 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 2485 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2486 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls, 2486 ee.excelReplace(listI, new Object[]{m}, path + "mould/"+xls,
2487 - path + "export/"+dateTime+"-预算汇总表.xls"); 2487 + path + "export/"+dateTime+"-$$$$$${txt-1893}.xls");
2488 } catch (Exception e) { 2488 } catch (Exception e) {
2489 // TODO: handle exception 2489 // TODO: handle exception
2490 e.printStackTrace(); 2490 e.printStackTrace();
@@ -2541,7 +2541,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2541,7 +2541,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2541 } 2541 }
2542 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 2542 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2543 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetSum_data.xls", 2543 ee.excelReplace(listI, new Object[]{m}, path + "mould/budgetSum_data.xls",
2544 - path + "export/" + year + "-预算汇总表-线路明细.xls"); 2544 + path + "export/" + year + "-$$$$$${txt-1893}-$$$$$${txt-2642}.xls");
2545 } catch (Exception e) { 2545 } catch (Exception e) {
2546 // TODO: handle exception 2546 // TODO: handle exception
2547 e.printStackTrace(); 2547 e.printStackTrace();
@@ -2572,7 +2572,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2572,7 +2572,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2572 } 2572 }
2573 2573
2574 List<Object[]> findPersonnelSchedule = schedulePlanRepository.findPersonnelSchedule(d1, d2); 2574 List<Object[]> findPersonnelSchedule = schedulePlanRepository.findPersonnelSchedule(d1, d2);
2575 - List<Object[]> findCancelSchedule = scheduleRealRepository.findCancelSchedule(date1, date2, "缺人"); 2575 + List<Object[]> findCancelSchedule = scheduleRealRepository.findCancelSchedule(date1, date2, "$$$$$${txt-3957}");
2576 Map<String, Long> psMap = new HashMap<String, Long>(), 2576 Map<String, Long> psMap = new HashMap<String, Long>(),
2577 csMap = new HashMap<String, Long>(); 2577 csMap = new HashMap<String, Long>();
2578 for(Object[] objects : findPersonnelSchedule){ 2578 for(Object[] objects : findPersonnelSchedule){
@@ -2822,8 +2822,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2822,8 +2822,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2822 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 2822 sdfSimple = new SimpleDateFormat("yyyyMMdd");
2823 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 2823 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
2824 Map<String, Object> m = new HashMap<String, Object>(); 2824 Map<String, Object> m = new HashMap<String, Object>();
2825 - m.put("date", date1 + "至" + date2);  
2826 - m.put("typeName", "线路性质"); 2825 + m.put("date", date1 + "-" + date2);
  2826 + m.put("typeName", "$$$$$${txt-2717}");
2827 ReportUtils ee = new ReportUtils(); 2827 ReportUtils ee = new ReportUtils();
2828 try { 2828 try {
2829 String dateTime = ""; 2829 String dateTime = "";
@@ -2836,7 +2836,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2836,7 +2836,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2836 listI.add(resList.iterator()); 2836 listI.add(resList.iterator());
2837 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 2837 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2838 ee.excelReplace(listI, new Object[]{m}, path + "mould/timeSum.xls", 2838 ee.excelReplace(listI, new Object[]{m}, path + "mould/timeSum.xls",
2839 - path + "export/" + dateTime + "-时刻表汇总表.xls"); 2839 + path + "export/" + dateTime + "-$$$$$${txt-1347}.xls");
2840 } catch (Exception e) { 2840 } catch (Exception e) {
2841 // TODO: handle exception 2841 // TODO: handle exception
2842 e.printStackTrace(); 2842 e.printStackTrace();
@@ -2849,8 +2849,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2849,8 +2849,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2849 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 2849 sdfSimple = new SimpleDateFormat("yyyyMMdd");
2850 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 2850 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
2851 Map<String, Object> m = new HashMap<String, Object>(); 2851 Map<String, Object> m = new HashMap<String, Object>();
2852 - m.put("date", date1 + "至" + date2);  
2853 - m.put("typeName", "线路名"); 2852 + m.put("date", date1 + "-" + date2);
  2853 + m.put("typeName", "$$$$$${txt-3347}");
2854 ReportUtils ee = new ReportUtils(); 2854 ReportUtils ee = new ReportUtils();
2855 try { 2855 try {
2856 String dateTime = ""; 2856 String dateTime = "";
@@ -2871,7 +2871,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -2871,7 +2871,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2871 } 2871 }
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/timeSum.xls", 2873 ee.excelReplace(listI, new Object[]{m}, path + "mould/timeSum.xls",
2874 - path + "export/" + dateTime + "-时刻表汇总表-线路明细.xls"); 2874 + path + "export/" + dateTime + "-$$$$$${txt-1347}-$$$$$${txt-2642}.xls");
2875 } catch (Exception e) { 2875 } catch (Exception e) {
2876 // TODO: handle exception 2876 // TODO: handle exception
2877 e.printStackTrace(); 2877 e.printStackTrace();
@@ -3154,7 +3154,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -3154,7 +3154,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; 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) + "-$$$$$${txt-536}.xls");
3158 } catch (Exception e) { 3158 } catch (Exception e) {
3159 // TODO: handle exception 3159 // TODO: handle exception
3160 e.printStackTrace(); 3160 e.printStackTrace();
@@ -3189,19 +3189,19 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -3189,19 +3189,19 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
3189 num = "0"; 3189 num = "0";
3190 } 3190 }
3191 if("1".equals(sp[1])){ 3191 if("1".equals(sp[1])){
3192 - type = "营运线路"; 3192 + type = "$$$$$${txt-2679}";
3193 } else if("0".equals(sp[1])){ 3193 } else if("0".equals(sp[1])){
3194 - type = "非营运线路"; 3194 + type = "$$$$$${txt-1994}";
3195 } else if("all".equals(sp[1])){ 3195 } else if("all".equals(sp[1])){
3196 - type = "全部线路"; 3196 + type = "$$$$$${txt-2484}";
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 = "$$$$$${txt-2679}";
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])){
3204 - item = "小计"; 3204 + item = "$$$$$${txt-3918}";
3205 } 3205 }
3206 } 3206 }
3207 m1.put("gsName", gs);m1.put("type", type);m1.put("item", item); 3207 m1.put("gsName", gs);m1.put("type", type);m1.put("item", item);
@@ -3246,11 +3246,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -3246,11 +3246,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
3246 num = "0"; 3246 num = "0";
3247 } 3247 }
3248 if("1".equals(sp[1])){ 3248 if("1".equals(sp[1])){
3249 - type = "公里"; 3249 + type = "$$$$$${txt-4138}";
3250 } else if("2".equals(sp[1])){ 3250 } else if("2".equals(sp[1])){
3251 - type = "人次"; 3251 + type = "$$$$$${txt-4008}";
3252 } else if("3".equals(sp[1])){ 3252 } else if("3".equals(sp[1])){
3253 - type = "营收"; 3253 + type = "$$$$$${txt-3937}";
3254 } 3254 }
3255 m1.put("gsName", gs);m1.put("type", type); 3255 m1.put("gsName", gs);m1.put("type", type);
3256 m1.put("budget", num);m1.put("change", num);m1.put("formal", num); 3256 m1.put("budget", num);m1.put("change", num);m1.put("formal", num);
@@ -3294,11 +3294,11 @@ public String[] createBudgetMap_sum2(List&lt;Map&lt;String, Object&gt;&gt; list, Map&lt;String, @@ -3294,11 +3294,11 @@ public String[] createBudgetMap_sum2(List&lt;Map&lt;String, Object&gt;&gt; list, Map&lt;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 = "$$$$$${txt-2679}";
3298 } else if("2".equals(sp[1])){ 3298 } else if("2".equals(sp[1])){
3299 - type = "非营运线路"; 3299 + type = "$$$$$${txt-1994}";
3300 } else if("0".equals(sp[1])){ 3300 } else if("0".equals(sp[1])){
3301 - type = "小计"; 3301 + type = "$$$$$${txt-3918}";
3302 } 3302 }
3303 m1.put("gsName", gs); 3303 m1.put("gsName", gs);
3304 m1.put("type", type); 3304 m1.put("type", type);
src/main/java/com/bsth/service/forms/impl/ExportServiceImpl.java
  View file @3e58009
@@ -51,7 +51,7 @@ public class ExportServiceImpl implements ExportService{ @@ -51,7 +51,7 @@ 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+"-$$$$$${txt-1008}.xls");
55 } catch (Exception e) { 55 } catch (Exception e) {
56 e.printStackTrace(); 56 e.printStackTrace();
57 } 57 }
@@ -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/$$$$$${txt-995}" + 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 + //$$$$$${txt-591}
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/$$$$$${txt-543}" + 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/$$$$$${txt-542}" + sdfSimple.format(sdfMonth.parse(startDate)) + ".xls");
160 } catch (Exception e) { 160 } catch (Exception e) {
161 e.printStackTrace(); 161 e.printStackTrace();
162 } 162 }
@@ -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/$$$$$${txt-2462}" + 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 + //$$$$$${txt-730}
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/$$$$$${txt-730}" + 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
  View file @3e58009
@@ -172,7 +172,7 @@ public class FormsServiceImpl implements FormsService { @@ -172,7 +172,7 @@ public class FormsServiceImpl implements FormsService {
172 } 172 }
173 173
174 Waybillday way = new Waybillday(); 174 Waybillday way = new Waybillday();
175 - way.setNbbm("汇总合计"); 175 + way.setNbbm("$$$$$${txt-2513}");
176 BigDecimal ksgl = new BigDecimal("0.0"); 176 BigDecimal ksgl = new BigDecimal("0.0");
177 BigDecimal jzl_ = new BigDecimal("0.0"); 177 BigDecimal jzl_ = new BigDecimal("0.0");
178 BigDecimal sh_ = new BigDecimal("0.0"); 178 BigDecimal sh_ = new BigDecimal("0.0");
@@ -259,9 +259,9 @@ public class FormsServiceImpl implements FormsService { @@ -259,9 +259,9 @@ public class FormsServiceImpl implements FormsService {
259 fgsdmManth=map.get("fgsdmManth").toString(); 259 fgsdmManth=map.get("fgsdmManth").toString();
260 } 260 }
261 String sql ="select "; 261 String sql ="select ";
262 - if(empnames.equals("驾驶员")){ 262 + if(empnames.equals("$$$$$${txt-3568}")){
263 sql += " r.j_gh "; 263 sql += " r.j_gh ";
264 - }else if(empnames.equals("售票员")){ 264 + }else if(empnames.equals("$$$$$${txt-3567}")){
265 sql += " r.s_gh "; 265 sql += " r.s_gh ";
266 }else{ 266 }else{
267 sql += " r.cl_zbh "; 267 sql += " r.cl_zbh ";
@@ -274,10 +274,10 @@ public class FormsServiceImpl implements FormsService { @@ -274,10 +274,10 @@ public class FormsServiceImpl implements FormsService {
274 } 274 }
275 sql+=" and r.gs_bm like'%"+gsdmManth+"%' and r.fgs_bm like'%"+fgsdmManth+"%'"; 275 sql+=" and r.gs_bm like'%"+gsdmManth+"%' and r.fgs_bm like'%"+fgsdmManth+"%'";
276 276
277 - if(empnames.equals("驾驶员")){ 277 + if(empnames.equals("$$$$$${txt-3568}")){
278 sql += " GROUP BY " 278 sql += " GROUP BY "
279 + " r.j_gh "; 279 + " r.j_gh ";
280 - }else if(empnames.equals("售票员")){ 280 + }else if(empnames.equals("$$$$$${txt-3567}")){
281 sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh"; 281 sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
282 }else{ 282 }else{
283 sql += " GROUP BY r.cl_zbh"; 283 sql += " GROUP BY r.cl_zbh";
@@ -288,13 +288,13 @@ public class FormsServiceImpl implements FormsService { @@ -288,13 +288,13 @@ public class FormsServiceImpl implements FormsService {
288 @Override 288 @Override
289 public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException { 289 public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
290 Shiftuehiclemanth shif = new Shiftuehiclemanth(); 290 Shiftuehiclemanth shif = new Shiftuehiclemanth();
291 - if(empnames.equals("驾驶员")){ 291 + if(empnames.equals("$$$$$${txt-3568}")){
292 // shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh")); 292 // shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
293 shif.setJgh(arg0.getString("j_gh")); 293 shif.setJgh(arg0.getString("j_gh"));
294 - }else if(empnames.equals("售票员")){ 294 + }else if(empnames.equals("$$$$$${txt-3567}")){
295 // shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh")); 295 // shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
296 shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh")); 296 shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
297 - }else if(empnames.equals("车辆自编号")){ 297 + }else if(empnames.equals("$$$$$${txt-2008}")){
298 shif.setjName(arg0.getString("cl_zbh")); 298 shif.setjName(arg0.getString("cl_zbh"));
299 } 299 }
300 return shif; 300 return shif;
@@ -313,7 +313,7 @@ public class FormsServiceImpl implements FormsService { @@ -313,7 +313,7 @@ public class FormsServiceImpl implements FormsService {
313 // if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){ 313 // if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
314 // sList.add(s); 314 // sList.add(s);
315 // } 315 // }
316 - if(empnames.equals("驾驶员")){ 316 + if(empnames.equals("$$$$$${txt-3568}")){
317 if(d.getJgh().equals(s.getjGh())){ 317 if(d.getJgh().equals(s.getjGh())){
318 sList.add(s); 318 sList.add(s);
319 Set<ChildTaskPlan> cts = s.getcTasks(); 319 Set<ChildTaskPlan> cts = s.getcTasks();
@@ -330,7 +330,7 @@ public class FormsServiceImpl implements FormsService { @@ -330,7 +330,7 @@ public class FormsServiceImpl implements FormsService {
330 d.setjName(s.getjName() + "/" + d.getJgh()); 330 d.setjName(s.getjName() + "/" + d.getJgh());
331 } 331 }
332 } 332 }
333 - }else if(empnames.equals("售票员")){ 333 + }else if(empnames.equals("$$$$$${txt-3567}")){
334 String sgh=s.getsGh()==null?"":s.getsGh(); 334 String sgh=s.getsGh()==null?"":s.getsGh();
335 if(d.getSgh().equals(sgh)){ 335 if(d.getSgh().equals(sgh)){
336 sList.add(s); 336 sList.add(s);
@@ -348,7 +348,7 @@ public class FormsServiceImpl implements FormsService { @@ -348,7 +348,7 @@ public class FormsServiceImpl implements FormsService {
348 d.setjName(s.getsName() + "/" + d.getSgh()); 348 d.setjName(s.getsName() + "/" + d.getSgh());
349 } 349 }
350 } 350 }
351 - }else if(empnames.equals("车辆自编号")){ 351 + }else if(empnames.equals("$$$$$${txt-2008}")){
352 if(d.getjName().equals(s.getClZbh())){ 352 if(d.getjName().equals(s.getClZbh())){
353 sList.add(s); 353 sList.add(s);
354 Set<ChildTaskPlan> cts = s.getcTasks(); 354 Set<ChildTaskPlan> cts = s.getcTasks();
@@ -387,7 +387,7 @@ public class FormsServiceImpl implements FormsService { @@ -387,7 +387,7 @@ public class FormsServiceImpl implements FormsService {
387 } 387 }
388 388
389 Shiftuehiclemanth shif = new Shiftuehiclemanth(); 389 Shiftuehiclemanth shif = new Shiftuehiclemanth();
390 - shif.setjName("汇总合计"); 390 + shif.setjName("$$$$$${txt-2513}");
391 BigDecimal yylc = new BigDecimal("0.0"); 391 BigDecimal yylc = new BigDecimal("0.0");
392 BigDecimal kslc = new BigDecimal("0.0"); 392 BigDecimal kslc = new BigDecimal("0.0");
393 BigDecimal cjlc = new BigDecimal("0.0"); 393 BigDecimal cjlc = new BigDecimal("0.0");
@@ -431,9 +431,9 @@ public class FormsServiceImpl implements FormsService { @@ -431,9 +431,9 @@ public class FormsServiceImpl implements FormsService {
431 fgsdmManth=map.get("fgsdmManth").toString(); 431 fgsdmManth=map.get("fgsdmManth").toString();
432 } 432 }
433 String sql ="select "; 433 String sql ="select ";
434 - if(empnames.equals("驾驶员")){ 434 + if(empnames.equals("$$$$$${txt-3568}")){
435 sql += " r.j_gh "; 435 sql += " r.j_gh ";
436 - }else if(empnames.equals("售票员")){ 436 + }else if(empnames.equals("$$$$$${txt-3567}")){
437 sql += " r.s_gh "; 437 sql += " r.s_gh ";
438 }else{ 438 }else{
439 sql += " r.cl_zbh "; 439 sql += " r.cl_zbh ";
@@ -446,10 +446,10 @@ public class FormsServiceImpl implements FormsService { @@ -446,10 +446,10 @@ public class FormsServiceImpl implements FormsService {
446 } 446 }
447 sql+=" and r.gs_bm like'%"+gsdmManth+"%' and r.fgs_bm like'%"+fgsdmManth+"%'"; 447 sql+=" and r.gs_bm like'%"+gsdmManth+"%' and r.fgs_bm like'%"+fgsdmManth+"%'";
448 448
449 - if(empnames.equals("驾驶员")){ 449 + if(empnames.equals("$$$$$${txt-3568}")){
450 sql += " GROUP BY " 450 sql += " GROUP BY "
451 + " r.j_gh "; 451 + " r.j_gh ";
452 - }else if(empnames.equals("售票员")){ 452 + }else if(empnames.equals("$$$$$${txt-3567}")){
453 sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh"; 453 sql+="and r.s_gh is not null AND r.s_gh !='' GROUP BY r.s_gh";
454 }else{ 454 }else{
455 sql += " GROUP BY r.cl_zbh"; 455 sql += " GROUP BY r.cl_zbh";
@@ -460,13 +460,13 @@ public class FormsServiceImpl implements FormsService { @@ -460,13 +460,13 @@ public class FormsServiceImpl implements FormsService {
460 @Override 460 @Override
461 public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException { 461 public Shiftuehiclemanth mapRow(ResultSet arg0, int arg1) throws SQLException {
462 Shiftuehiclemanth shif = new Shiftuehiclemanth(); 462 Shiftuehiclemanth shif = new Shiftuehiclemanth();
463 - if(empnames.equals("驾驶员")){ 463 + if(empnames.equals("$$$$$${txt-3568}")){
464 // shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh")); 464 // shif.setjName(arg0.getString("j_name")+"/"+arg0.getString("j_gh"));
465 shif.setJgh(arg0.getString("j_gh")); 465 shif.setJgh(arg0.getString("j_gh"));
466 - }else if(empnames.equals("售票员")){ 466 + }else if(empnames.equals("$$$$$${txt-3567}")){
467 // shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh")); 467 // shif.setjName(arg0.getString("s_name")+"/"+arg0.getString("s_gh"));
468 shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh")); 468 shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
469 - }else if(empnames.equals("车辆自编号")){ 469 + }else if(empnames.equals("$$$$$${txt-2008}")){
470 shif.setjName(arg0.getString("cl_zbh")); 470 shif.setjName(arg0.getString("cl_zbh"));
471 } 471 }
472 return shif; 472 return shif;
@@ -485,7 +485,7 @@ public class FormsServiceImpl implements FormsService { @@ -485,7 +485,7 @@ public class FormsServiceImpl implements FormsService {
485 // if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){ 485 // if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
486 // sList.add(s); 486 // sList.add(s);
487 // } 487 // }
488 - if(empnames.equals("驾驶员")){ 488 + if(empnames.equals("$$$$$${txt-3568}")){
489 if(d.getJgh().equals(s.getjGh())){ 489 if(d.getJgh().equals(s.getjGh())){
490 sList.add(s); 490 sList.add(s);
491 Set<ChildTaskPlan> cts = s.getcTasks(); 491 Set<ChildTaskPlan> cts = s.getcTasks();
@@ -502,7 +502,7 @@ public class FormsServiceImpl implements FormsService { @@ -502,7 +502,7 @@ public class FormsServiceImpl implements FormsService {
502 d.setjName(s.getjName() + "/" + d.getJgh()); 502 d.setjName(s.getjName() + "/" + d.getJgh());
503 } 503 }
504 } 504 }
505 - }else if(empnames.equals("售票员")){ 505 + }else if(empnames.equals("$$$$$${txt-3567}")){
506 String sgh=s.getsGh()==null?"":s.getsGh(); 506 String sgh=s.getsGh()==null?"":s.getsGh();
507 if(d.getSgh().equals(sgh)){ 507 if(d.getSgh().equals(sgh)){
508 sList.add(s); 508 sList.add(s);
@@ -520,7 +520,7 @@ public class FormsServiceImpl implements FormsService { @@ -520,7 +520,7 @@ public class FormsServiceImpl implements FormsService {
520 d.setjName(s.getsName() + "/" + d.getSgh()); 520 d.setjName(s.getsName() + "/" + d.getSgh());
521 } 521 }
522 } 522 }
523 - }else if(empnames.equals("车辆自编号")){ 523 + }else if(empnames.equals("$$$$$${txt-2008}")){
524 if(d.getjName().equals(s.getClZbh())){ 524 if(d.getjName().equals(s.getClZbh())){
525 sList.add(s); 525 sList.add(s);
526 Set<ChildTaskPlan> cts = s.getcTasks(); 526 Set<ChildTaskPlan> cts = s.getcTasks();
@@ -536,7 +536,7 @@ public class FormsServiceImpl implements FormsService { @@ -536,7 +536,7 @@ public class FormsServiceImpl implements FormsService {
536 536
537 } 537 }
538 538
539 - if(empnames.equals("售票员")){ 539 + if(empnames.equals("$$$$$${txt-3567}")){
540 double zksgl=culateMileageService.culateSjfyylc_spy(list_s); 540 double zksgl=culateMileageService.culateSjfyylc_spy(list_s);
541 double ljgl=culateMileageService.culateLjgl_spy(list_s); 541 double ljgl=culateMileageService.culateLjgl_spy(list_s);
542 double sjgl=culateMileageService.culateSjgl_spy(list_s); 542 double sjgl=culateMileageService.culateSjgl_spy(list_s);
@@ -578,7 +578,7 @@ public class FormsServiceImpl implements FormsService { @@ -578,7 +578,7 @@ public class FormsServiceImpl implements FormsService {
578 } 578 }
579 579
580 Shiftuehiclemanth shif = new Shiftuehiclemanth(); 580 Shiftuehiclemanth shif = new Shiftuehiclemanth();
581 - shif.setjName("汇总合计"); 581 + shif.setjName("$$$$$${txt-2513}");
582 BigDecimal yylc = new BigDecimal("0.0"); 582 BigDecimal yylc = new BigDecimal("0.0");
583 BigDecimal kslc = new BigDecimal("0.0"); 583 BigDecimal kslc = new BigDecimal("0.0");
584 BigDecimal cjlc = new BigDecimal("0.0"); 584 BigDecimal cjlc = new BigDecimal("0.0");
@@ -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 + // $$$$$${txt-591}
613 @Override 613 @Override
614 public List<Shifday> shifday(Map<String, Object> map) { 614 public List<Shifday> shifday(Map<String, Object> map) {
615 615
@@ -727,7 +727,7 @@ public class FormsServiceImpl implements FormsService { @@ -727,7 +727,7 @@ public class FormsServiceImpl implements FormsService {
727 } 727 }
728 728
729 Shifday shif = new Shifday(); 729 Shifday shif = new Shifday();
730 - shif.setjName("汇总合计"); 730 + shif.setjName("$$$$$${txt-2513}");
731 BigDecimal jhlc = new BigDecimal("0.0"); 731 BigDecimal jhlc = new BigDecimal("0.0");
732 BigDecimal sjlc = new BigDecimal("0.0"); 732 BigDecimal sjlc = new BigDecimal("0.0");
733 BigDecimal yylc = new BigDecimal("0.0"); 733 BigDecimal yylc = new BigDecimal("0.0");
@@ -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 + // $$$$$${txt-597}
772 String rq; 772 String rq;
773 773
774 @Override 774 @Override
@@ -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 + // $$$$$${txt-730}
2456 @Override 2456 @Override
2457 public List<Operationservice> operationservice(Map<String, Object> map) { 2457 public List<Operationservice> operationservice(Map<String, Object> map) {
2458 2458
@@ -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 + // $$$$$${txt-406}
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
@@ -2892,7 +2892,7 @@ public class FormsServiceImpl implements FormsService { @@ -2892,7 +2892,7 @@ public class FormsServiceImpl implements FormsService {
2892 sjbc += Integer.valueOf(m.get("sjbc").toString()); 2892 sjbc += Integer.valueOf(m.get("sjbc").toString());
2893 qz += Integer.valueOf(m.get("qz").toString()); 2893 qz += Integer.valueOf(m.get("qz").toString());
2894 } 2894 }
2895 - tempMap.put("rq", "分类汇总"); 2895 + tempMap.put("rq", "$$$$$${txt-2677}");
2896 tempMap.put("line", "共" + resList.size() + "条线路"); 2896 tempMap.put("line", "共" + resList.size() + "条线路");
2897 tempMap.put("jhcc", jhcc); 2897 tempMap.put("jhcc", jhcc);
2898 tempMap.put("sjcc", sjcc); 2898 tempMap.put("sjcc", sjcc);
@@ -2916,7 +2916,7 @@ public class FormsServiceImpl implements FormsService { @@ -2916,7 +2916,7 @@ public class FormsServiceImpl implements FormsService {
2916 } 2916 }
2917 2917
2918 2918
2919 - //班次执行率统计表 2919 + //$$$$$${txt-741}
2920 @Override 2920 @Override
2921 public List<Executionrate> executionrate(Map<String, Object> map) { 2921 public List<Executionrate> executionrate(Map<String, Object> map) {
2922 List<Executionrate> resList = new ArrayList<Executionrate>(); 2922 List<Executionrate> resList = new ArrayList<Executionrate>();
@@ -3014,7 +3014,7 @@ public class FormsServiceImpl implements FormsService { @@ -3014,7 +3014,7 @@ public class FormsServiceImpl implements FormsService {
3014 return resList; 3014 return resList;
3015 } 3015 }
3016 3016
3017 - // 营运线路名称统计表 3017 + // $$$$$${txt-534}
3018 @Override 3018 @Override
3019 public List<Allline> allline(Map<String, Object> map) { 3019 public List<Allline> allline(Map<String, Object> map) {
3020 List<Allline> resList = new ArrayList<Allline>(); 3020 List<Allline> resList = new ArrayList<Allline>();
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
  View file @3e58009
@@ -28,6 +28,7 @@ import java.util.Set; @@ -28,6 +28,7 @@ import java.util.Set;
28 28
29 import javax.servlet.http.HttpServletResponse; 29 import javax.servlet.http.HttpServletResponse;
30 30
  31 +import com.bsth.util.I18n;
31 import org.apache.commons.lang3.StringUtils; 32 import org.apache.commons.lang3.StringUtils;
32 import org.apache.poi.hssf.usermodel.HSSFCellStyle; 33 import org.apache.poi.hssf.usermodel.HSSFCellStyle;
33 import org.apache.poi.hssf.usermodel.HSSFWorkbook; 34 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -121,6 +122,9 @@ public class GpsServiceImpl implements GpsService { @@ -121,6 +122,9 @@ public class GpsServiceImpl implements GpsService {
121 @Autowired 122 @Autowired
122 LsSectionRouteRepository lsSectionRouteRepository; 123 LsSectionRouteRepository lsSectionRouteRepository;
123 124
  125 + @Autowired
  126 + private I18n i18n;
  127 +
124 // 历史gps查询 128 // 历史gps查询
125 @Override 129 @Override
126 public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) { 130 public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -938,18 +942,18 @@ public class GpsServiceImpl implements GpsService { @@ -938,18 +942,18 @@ public class GpsServiceImpl implements GpsService {
938 942
939 //创建excel工作簿 943 //创建excel工作簿
940 Workbook wb = new HSSFWorkbook(); 944 Workbook wb = new HSSFWorkbook();
941 - Sheet sheet = wb.createSheet("行车轨迹"); 945 + Sheet sheet = wb.createSheet("$$$$$${txt-3343}");
942 //表头 946 //表头
943 Row row = sheet.createRow(0); 947 Row row = sheet.createRow(0);
944 row.setHeight((short) (1.5 * 256)); 948 row.setHeight((short) (1.5 * 256));
945 - row.createCell(0).setCellValue("序号");  
946 - row.createCell(1).setCellValue("车辆");  
947 - row.createCell(2).setCellValue("牌照号");  
948 - row.createCell(3).setCellValue("所在道路");  
949 - row.createCell(4).setCellValue("经度");  
950 - row.createCell(5).setCellValue("纬度");  
951 - row.createCell(6).setCellValue("时间");  
952 - row.createCell(7).setCellValue("速度"); 949 + row.createCell(0).setCellValue("$$$$$${txt-3934}");
  950 + row.createCell(1).setCellValue("$$$$$${txt-4009}");
  951 + row.createCell(2).setCellValue("$$$$$${txt-3550}");
  952 + row.createCell(3).setCellValue("$$$$$${txt-3055}");
  953 + row.createCell(4).setCellValue("$$$$$${txt-4077}");
  954 + row.createCell(5).setCellValue("$$$$$${txt-4071}");
  955 + row.createCell(6).setCellValue("$$$$$${txt-4004}");
  956 + row.createCell(7).setCellValue("$$$$$${txt-3933}");
953 //数据 957 //数据
954 DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"), 958 DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
955 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm"); 959 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
@@ -969,7 +973,7 @@ public class GpsServiceImpl implements GpsService { @@ -969,7 +973,7 @@ public class GpsServiceImpl implements GpsService {
969 973
970 st = st * 1000; 974 st = st * 1000;
971 et = et * 1000; 975 et = et * 1000;
972 - String filename = nbbm + "轨迹数据" + fmt.print(st) + "至" + fmt.print(et) + ".xls"; 976 + String filename = i18n.getMessage("$$$$$${txt-3320}", new String[] { nbbm, fmt.print(st), fmt.print(et)});
973 try { 977 try {
974 resp.setContentType("application/x-msdownload"); 978 resp.setContentType("application/x-msdownload");
975 resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); 979 resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
@@ -998,22 +1002,22 @@ public class GpsServiceImpl implements GpsService { @@ -998,22 +1002,22 @@ public class GpsServiceImpl implements GpsService {
998 DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"), 1002 DateTimeFormatter fmtHHmmss = DateTimeFormat.forPattern("HH:mm.ss"),
999 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm"); 1003 fmt = DateTimeFormat.forPattern("yyyyMMddHHmm");
1000 if(speedList.size() > 0){ 1004 if(speedList.size() > 0){
1001 - Sheet sheet = wb.createSheet("超速"); 1005 + Sheet sheet = wb.createSheet("$$$$$${txt-3899}");
1002 //表头 1006 //表头
1003 Row row = sheet.createRow(0); 1007 Row row = sheet.createRow(0);
1004 row.setHeight((short) (1.5 * 256)); 1008 row.setHeight((short) (1.5 * 256));
1005 - row.createCell(0).setCellValue("异常信息");  
1006 - row.createCell(1).setCellValue("最大速度");  
1007 - row.createCell(2).setCellValue("开始时间");  
1008 - row.createCell(3).setCellValue("结束时间");  
1009 - row.createCell(4).setCellValue("持续（秒）");  
1010 - row.createCell(5).setCellValue("所在路段"); 1009 + row.createCell(0).setCellValue("$$$$$${txt-3235}");
  1010 + row.createCell(1).setCellValue("$$$$$${txt-4453}");
  1011 + row.createCell(2).setCellValue("$$$$$${txt-2587}");
  1012 + row.createCell(3).setCellValue("$$$$$${txt-2588}");
  1013 + row.createCell(4).setCellValue("$$$$$${txt-4498}");
  1014 + row.createCell(5).setCellValue("$$$$$${txt-2828}");
1011 1015
1012 GpsSpeed_DTO speed; 1016 GpsSpeed_DTO speed;
1013 for(int i = 0; i < speedList.size(); i++){ 1017 for(int i = 0; i < speedList.size(); i++){
1014 speed = speedList.get(i); 1018 speed = speedList.get(i);
1015 row = sheet.createRow(i + 1); 1019 row = sheet.createRow(i + 1);
1016 - row.createCell(0).setCellValue("超速"); 1020 + row.createCell(0).setCellValue("$$$$$${txt-3899}");
1017 row.createCell(1).setCellValue(speed.getSpeed()); 1021 row.createCell(1).setCellValue(speed.getSpeed());
1018 row.createCell(2).setCellValue(fmtHHmmss.print(speed.getSt())); 1022 row.createCell(2).setCellValue(fmtHHmmss.print(speed.getSt()));
1019 row.createCell(3).setCellValue(fmtHHmmss.print(speed.getEt())); 1023 row.createCell(3).setCellValue(fmtHHmmss.print(speed.getEt()));
@@ -1024,16 +1028,16 @@ public class GpsServiceImpl implements GpsService { @@ -1024,16 +1028,16 @@ public class GpsServiceImpl implements GpsService {
1024 } 1028 }
1025 1029
1026 if(outboundList.size() > 0){ 1030 if(outboundList.size() > 0){
1027 - Sheet sheet = wb.createSheet("越界"); 1031 + Sheet sheet = wb.createSheet("$$$$$${txt-3895}");
1028 //表头 1032 //表头
1029 Row row = sheet.createRow(0); 1033 Row row = sheet.createRow(0);
1030 row.setHeight((short) (1.5 * 256)); 1034 row.setHeight((short) (1.5 * 256));
1031 - row.createCell(0).setCellValue("异常信息");  
1032 - row.createCell(1).setCellValue("开始时间");  
1033 - row.createCell(2).setCellValue("结束时间");  
1034 - row.createCell(3).setCellValue("持续（秒）");  
1035 - row.createCell(4).setCellValue("所在路段");  
1036 - row.createCell(5).setCellValue("路径"); 1035 + row.createCell(0).setCellValue("$$$$$${txt-3235}");
  1036 + row.createCell(1).setCellValue("$$$$$${txt-2587}");
  1037 + row.createCell(2).setCellValue("$$$$$${txt-2588}");
  1038 + row.createCell(3).setCellValue("$$$$$${txt-4498}");
  1039 + row.createCell(4).setCellValue("$$$$$${txt-2828}");
  1040 + row.createCell(5).setCellValue("$$$$$${txt-4499}");
1037 1041
1038 GpsOutbound_DTO outbound; 1042 GpsOutbound_DTO outbound;
1039 //设置路径单元格 水平对齐 填充 1043 //设置路径单元格 水平对齐 填充
@@ -1042,7 +1046,7 @@ public class GpsServiceImpl implements GpsService { @@ -1042,7 +1046,7 @@ public class GpsServiceImpl implements GpsService {
1042 for(int i = 0; i < outboundList.size(); i++){ 1046 for(int i = 0; i < outboundList.size(); i++){
1043 outbound = outboundList.get(i); 1047 outbound = outboundList.get(i);
1044 row = sheet.createRow(i + 1); 1048 row = sheet.createRow(i + 1);
1045 - row.createCell(0).setCellValue("超速"); 1049 + row.createCell(0).setCellValue("$$$$$${txt-3899}");
1046 row.createCell(1).setCellValue(fmtHHmmss.print(outbound.getSt())); 1050 row.createCell(1).setCellValue(fmtHHmmss.print(outbound.getSt()));
1047 row.createCell(2).setCellValue(fmtHHmmss.print(outbound.getEt())); 1051 row.createCell(2).setCellValue(fmtHHmmss.print(outbound.getEt()));
1048 if(outbound.getEt() != 0) 1052 if(outbound.getEt() != 0)
@@ -1056,7 +1060,7 @@ public class GpsServiceImpl implements GpsService { @@ -1056,7 +1060,7 @@ public class GpsServiceImpl implements GpsService {
1056 1060
1057 st = st * 1000; 1061 st = st * 1000;
1058 et = et * 1000; 1062 et = et * 1000;
1059 - String filename = nbbm + "异常信息" + fmt.print(st) + "至" + fmt.print(et) + ".xls"; 1063 + String filename = nbbm + "异常信息" + fmt.print(st) + "-" + fmt.print(et) + ".xls";
1060 try { 1064 try {
1061 resp.setContentType("application/x-msdownload"); 1065 resp.setContentType("application/x-msdownload");
1062 resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8")); 1066 resp.addHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
@@ -1514,7 +1518,7 @@ public class GpsServiceImpl implements GpsService { @@ -1514,7 +1518,7 @@ public class GpsServiceImpl implements GpsService {
1514 1518
1515 sch = dayOfSchedule.executeCurr(nbbm); 1519 sch = dayOfSchedule.executeCurr(nbbm);
1516 if(null != sch){ 1520 if(null != sch){
1517 - execStr = (sch.getXlDir().equals("0")?"上行":"下行") + "("+sch.getDfsj()+")"; 1521 + execStr = (sch.getXlDir().equals("0")?"$$$$$${txt-3858}":"$$$$$${txt-3857}") + "("+sch.getDfsj()+")";
1518 if(!sch.getXlBm().equals(lineCode)) 1522 if(!sch.getXlBm().equals(lineCode))
1519 execStr = sch.getXlName()+execStr; 1523 execStr = sch.getXlName()+execStr;
1520 else 1524 else
@@ -1526,7 +1530,7 @@ public class GpsServiceImpl implements GpsService { @@ -1526,7 +1530,7 @@ public class GpsServiceImpl implements GpsService {
1526 if(null != gps){ 1530 if(null != gps){
1527 item.put("loc", gps.getStationName()); 1531 item.put("loc", gps.getStationName());
1528 item.put("lineCodeReal", gps.getLineId()); 1532 item.put("lineCodeReal", gps.getLineId());
1529 - item.put("status", gps.isOffline()?"离线":"在线"); 1533 + item.put("status", gps.isOffline()?"$$$$$${txt-4184}":"$$$$$${txt-3811}");
1530 item.put("gpsTs", gps.getTimestamp()); 1534 item.put("gpsTs", gps.getTimestamp());
1531 } 1535 }
1532 //请求出场时间 1536 //请求出场时间
@@ -1552,7 +1556,7 @@ public class GpsServiceImpl implements GpsService { @@ -1552,7 +1556,7 @@ public class GpsServiceImpl implements GpsService {
1552 item.put("device", d); 1556 item.put("device", d);
1553 item.put("loc", gps.getStationName()); 1557 item.put("loc", gps.getStationName());
1554 item.put("lineCodeReal", gps.getLineId()); 1558 item.put("lineCodeReal", gps.getLineId());
1555 - item.put("status", gps.isOffline()?"离线":"在线"); 1559 + item.put("status", gps.isOffline()?"$$$$$${txt-4184}":"$$$$$${txt-3811}");
1556 item.put("gpsTs", gps.getTimestamp()); 1560 item.put("gpsTs", gps.getTimestamp());
1557 1561
1558 //请求出场时间 1562 //请求出场时间
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @3e58009
@@ -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 + "-$$$$$${txt-1010}.xls");
757 } catch (Exception e) { 757 } catch (Exception e) {
758 // TODO: handle exception 758 // TODO: handle exception
759 e.printStackTrace(); 759 e.printStackTrace();
@@ -1196,7 +1196,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1196,7 +1196,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1196 for(ChildTaskPlan childTaskPlan : cTasks){ 1196 for(ChildTaskPlan childTaskPlan : cTasks){
1197 Map<String, Object> temp = new HashMap<String, Object>(); 1197 Map<String, Object> temp = new HashMap<String, Object>();
1198 if(!childTaskPlan.getMileageType().equals("service") || childTaskPlan.isDestroy() 1198 if(!childTaskPlan.getMileageType().equals("service") || childTaskPlan.isDestroy()
1199 - || !childTaskPlan.getType1().equals("正常") || childTaskPlan.getCcId() != null){ 1199 + || !childTaskPlan.getType1().equals("$$$$$${txt-3979}") || childTaskPlan.getCcId() != null){
1200 temp.put("lc", null); 1200 temp.put("lc", null);
1201 temp.put("fcsj", null); 1201 temp.put("fcsj", null);
1202 temp.put("zdsj", null); 1202 temp.put("zdsj", null);
@@ -1553,9 +1553,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1553,9 +1553,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1553 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 1553 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
1554 ReportUtils ee = new ReportUtils(); 1554 ReportUtils ee = new ReportUtils();
1555 if(statu.equals("0")) 1555 if(statu.equals("0"))
1556 - modelMap.put("lpType", "路牌数量"); 1556 + modelMap.put("lpType", "$$$$$${txt-2473}");
1557 else if(statu.equals("1")) 1557 else if(statu.equals("1"))
1558 - modelMap.put("lpType", "路牌名"); 1558 + modelMap.put("lpType", "$$$$$${txt-3515}");
1559 try { 1559 try {
1560 String dateTime = ""; 1560 String dateTime = "";
1561 if(startDate.equals(endDate)){ 1561 if(startDate.equals(endDate)){
@@ -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 + "-$$$$$${txt-410}.xls");
1571 } catch (Exception e) { 1571 } catch (Exception e) {
1572 // TODO: handle exception 1572 // TODO: handle exception
1573 e.printStackTrace(); 1573 e.printStackTrace();
@@ -1802,16 +1802,16 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1802,16 +1802,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1802 tzsj_ += sjtz; 1802 tzsj_ += sjtz;
1803 ++tzsjs; 1803 ++tzsjs;
1804 } 1804 }
1805 - tempMap.put("ddwd1", (ddtqs!=0?ddtq_/ddtqs:0) + "分");  
1806 - tempMap.put("ddwd2", (ddyws!=0?ddyw_/ddyws:0) + "分");  
1807 - tempMap.put("wdfc1", (fctqs!=0?fctq_/fctqs:0) + "分");  
1808 - tempMap.put("wdfc2", (fcyws!=0?fcyw_/fcyws:0) + "分");  
1809 - tempMap.put("pjys", (yssjs!=0?yssj_/yssjs:0) + "分");  
1810 - tempMap.put("pjtz", (tzsjs!=0?tzsj_/tzsjs:0) + "分"); 1805 + tempMap.put("ddwd1", (ddtqs!=0?ddtq_/ddtqs:0) + "$$$$$${txt-4273}");
  1806 + tempMap.put("ddwd2", (ddyws!=0?ddyw_/ddyws:0) + "$$$$$${txt-4273}");
  1807 + tempMap.put("wdfc1", (fctqs!=0?fctq_/fctqs:0) + "$$$$$${txt-4273}");
  1808 + tempMap.put("wdfc2", (fcyws!=0?fcyw_/fcyws:0) + "$$$$$${txt-4273}");
  1809 + tempMap.put("pjys", (yssjs!=0?yssj_/yssjs:0) + "$$$$$${txt-4273}");
  1810 + tempMap.put("pjtz", (tzsjs!=0?tzsj_/tzsjs:0) + "$$$$$${txt-4273}");
1811 1811
1812 Map<String, Object> m = mapList.get(0); 1812 Map<String, Object> m = mapList.get(0);
1813 tempMap.put("dates", date); 1813 tempMap.put("dates", date);
1814 - tempMap.put("times", times.length()==0?"全日":times); 1814 + tempMap.put("times", times.length()==0?"$$$$$${txt-3959}":times);
1815 tempMap.put("line", m.get("line")); 1815 tempMap.put("line", m.get("line"));
1816 tempMap.put("lp", m.get("lp")); 1816 tempMap.put("lp", m.get("lp"));
1817 tempMap.put("station", m.get("station")); 1817 tempMap.put("station", m.get("station"));
@@ -2015,37 +2015,37 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2015,37 +2015,37 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2015 sjbc++; 2015 sjbc++;
2016 // sjlc = sjlc.add(lc); 2016 // sjlc = sjlc.add(lc);
2017 } else if(schedule.getStatus() == -1){ 2017 } else if(schedule.getStatus() == -1){
2018 - if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){ 2018 + if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3961}") != -1){
2019 lzbc++; 2019 lzbc++;
2020 // lzlc = lzlc.add(lc); 2020 // lzlc = lzlc.add(lc);
2021 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){ 2021 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3963}") != -1){
2022 dmbc++; 2022 dmbc++;
2023 // dmlc = dmlc.add(lc); 2023 // dmlc = dmlc.add(lc);
2024 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){ 2024 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3840}") != -1){
2025 gzbc++; 2025 gzbc++;
2026 // gzlc = gzlc.add(lc); 2026 // gzlc = gzlc.add(lc);
2027 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){ 2027 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3838}") != -1){
2028 jfbc++; 2028 jfbc++;
2029 // jflc = jflc.add(lc); 2029 // jflc = jflc.add(lc);
2030 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){ 2030 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3837}") != -1){
2031 zsbc++; 2031 zsbc++;
2032 // zslc = zslc.add(lc); 2032 // zslc = zslc.add(lc);
2033 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){ 2033 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3957}") != -1){
2034 qrbc++; 2034 qrbc++;
2035 // qrlc = qrlc.add(lc); 2035 // qrlc = qrlc.add(lc);
2036 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){ 2036 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3958}") != -1){
2037 qcbc++; 2037 qcbc++;
2038 // qclc = qclc.add(lc); 2038 // qclc = qclc.add(lc);
2039 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){ 2039 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3962}") != -1){
2040 kxbc++; 2040 kxbc++;
2041 // kxlc = kxlc.add(lc); 2041 // kxlc = kxlc.add(lc);
2042 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){ 2042 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3960}") != -1){
2043 qhbc++; 2043 qhbc++;
2044 // qhlc = qhlc.add(lc); 2044 // qhlc = qhlc.add(lc);
2045 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){ 2045 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-3956}") != -1){
2046 wybc++; 2046 wybc++;
2047 // wylc = wylc.add(lc); 2047 // wylc = wylc.add(lc);
2048 - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路救抛锚") != -1){ 2048 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("$$$$$${txt-2765}") != -1){
2049 ljpmbc++; 2049 ljpmbc++;
2050 } else { 2050 } else {
2051 qtbc++; 2051 qtbc++;
@@ -2067,21 +2067,21 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2067,21 +2067,21 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2067 } 2067 }
2068 2068
2069 sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList)); 2069 sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList));
2070 - lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));  
2071 - dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));  
2072 - gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));  
2073 - jflc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "纠纷"));  
2074 - zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "肇事"));  
2075 - qrlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺人"));  
2076 - qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺车"));  
2077 - kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "客稀"));  
2078 - qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));  
2079 - wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));  
2080 - ljpmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路救抛锚"));  
2081 - qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(  
2082 - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(  
2083 - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(  
2084 - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他"))); 2070 + lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3961}"));
  2071 + dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3963}"));
  2072 + gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3840}"));
  2073 + jflc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3838}"));
  2074 + zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3837}"));
  2075 + qrlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3957}"));
  2076 + qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3958}"));
  2077 + kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3962}"));
  2078 + qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3960}"));
  2079 + wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3956}"));
  2080 + ljpmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-2765}"));
  2081 + qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-4026}")).add(
  2082 + new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-4102}"))).add(
  2083 + new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-3876}"))).add(
  2084 + new BigDecimal(culateService.culateCJLC(keyMap.get(key), "$$$$$${txt-4197}")));
2085 2085
2086 boolean flag = true; 2086 boolean flag = true;
2087 if(jhlc.doubleValue() == 0d){ 2087 if(jhlc.doubleValue() == 0d){
@@ -2092,7 +2092,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2092,7 +2092,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2092 tempMap.put("company", companyName); 2092 tempMap.put("company", companyName);
2093 tempMap.put("subCompany", subCompanyName); 2093 tempMap.put("subCompany", subCompanyName);
2094 // tempMap.put("subCompany", keys[1]); 2094 // tempMap.put("subCompany", keys[1]);
2095 - tempMap.put("times", sfqr == 1 ? times : "全日"); 2095 + tempMap.put("times", sfqr == 1 ? times : "$$$$$${txt-3959}");
2096 tempMap.put("line", keys[0]); 2096 tempMap.put("line", keys[0]);
2097 tempMap.put("jhbc", jhbc); 2097 tempMap.put("jhbc", jhbc);
2098 tempMap.put("sjbc", sjbc); 2098 tempMap.put("sjbc", sjbc);
@@ -2164,7 +2164,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2164,7 +2164,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2164 temp.put("company", ""); 2164 temp.put("company", "");
2165 temp.put("subCompany", ""); 2165 temp.put("subCompany", "");
2166 temp.put("times", ""); 2166 temp.put("times", "");
2167 - temp.put("line", "合计"); 2167 + temp.put("line", "$$$$$${txt-3916}");
2168 temp.put("jhbc", jhbc_); 2168 temp.put("jhbc", jhbc_);
2169 temp.put("sjbc", sjbc_); 2169 temp.put("sjbc", sjbc_);
2170 temp.put("bcbfb", df.format(jhbc_>0?(double)sjbc_/jhbc_*100:0)+"%"); 2170 temp.put("bcbfb", df.format(jhbc_>0?(double)sjbc_/jhbc_*100:0)+"%");
@@ -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 + "-$$$$$${txt-4330}.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("$$$$$${txt-3025}");
2393 if(schedule.isDfAuto()) 2393 if(schedule.isDfAuto())
2394 zddf++; 2394 zddf++;
2395 else 2395 else
@@ -2444,7 +2444,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2444,7 +2444,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2444 // dxtz += (int)m.get("dxtz"); 2444 // dxtz += (int)m.get("dxtz");
2445 lbtz += (int)m.get("lbtz"); 2445 lbtz += (int)m.get("lbtz");
2446 Map<String, Object> temp = new HashMap<String, Object>(); 2446 Map<String, Object> temp = new HashMap<String, Object>();
2447 - temp.put("date", "合计"); 2447 + temp.put("date", "$$$$$${txt-3916}");
2448 temp.put("lines", m.get("lines")); 2448 temp.put("lines", m.get("lines"));
2449 temp.put("sjbc", m.get("sjbc")); 2449 temp.put("sjbc", m.get("sjbc"));
2450 temp.put("sddf", m.get("sddf")); 2450 temp.put("sddf", m.get("sddf"));
@@ -2457,7 +2457,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2457,7 +2457,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2457 temp.put("dxbl", m.get("dxbl")); 2457 temp.put("dxbl", m.get("dxbl"));
2458 temp.put("lbbl", m.get("lbbl")); 2458 temp.put("lbbl", m.get("lbbl"));
2459 } 2459 }
2460 - tempMap.put("date", "合计"); 2460 + tempMap.put("date", "$$$$$${txt-3916}");
2461 tempMap.put("lines", lines); 2461 tempMap.put("lines", lines);
2462 tempMap.put("sjbc", sjbc); 2462 tempMap.put("sjbc", sjbc);
2463 tempMap.put("sddf", sddf); 2463 tempMap.put("sddf", sddf);
@@ -2492,7 +2492,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2492,7 +2492,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2492 int sjbc=Integer.parseInt(resMap.get("sjbc").toString()); 2492 int sjbc=Integer.parseInt(resMap.get("sjbc").toString());
2493 int correct=Integer.parseInt(resMap.get("correct").toString()); 2493 int correct=Integer.parseInt(resMap.get("correct").toString());
2494 2494
2495 - if(date_1.equals("合计")){ 2495 + if(date_1.equals("$$$$$${txt-3916}")){
2496 resMap.put("dxtz", dxtzz); 2496 resMap.put("dxtz", dxtzz);
2497 resMap.put("correct",correct+dxtzz); 2497 resMap.put("correct",correct+dxtzz);
2498 if(sjbc<=0){ 2498 if(sjbc<=0){
@@ -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+"-$$$$$${txt-2459}";
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()) { //判断是否已存在重名
@@ -2746,7 +2746,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2746,7 +2746,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2746 } 2746 }
2747 } 2747 }
2748 } 2748 }
2749 - Map.put("rylx", "加注类别:"+rylx); 2749 + Map.put("rylx", "$$$$$${txt-2768}:"+rylx);
2750 Map.put("jzl", jzl); 2750 Map.put("jzl", jzl);
2751 Map.put("yh", yh); 2751 Map.put("yh", yh);
2752 Map.put("ccyl", ccyl); 2752 Map.put("ccyl", ccyl);
@@ -2883,7 +2883,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2883,7 +2883,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2883 ss.setFcsjActual(""); 2883 ss.setFcsjActual("");
2884 ss.setZdsjActual(""); 2884 ss.setZdsjActual("");
2885 ss.setJhlc(0.0); 2885 ss.setJhlc(0.0);
2886 - remarks += "(烂班)"; 2886 + remarks += "($$$$$${txt-3847})";
2887 ss.setRemarks(remarks); 2887 ss.setRemarks(remarks);
2888 } 2888 }
2889 2889
@@ -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 + "-$$$$$${txt-2459}.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 + "-$$$$$${txt-2459}.xls");
2979 String fileName = file.getName(); 2979 String fileName = file.getName();
2980 files.add(temp); 2980 files.add(temp);
2981 } 2981 }
@@ -3147,9 +3147,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3147,9 +3147,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3147 temp.put("lp", s.getLpName()); 3147 temp.put("lp", s.getLpName());
3148 temp.put("zd", s.getQdzName()); 3148 temp.put("zd", s.getQdzName());
3149 temp.put("fcsj", s.getFcsj()!=null?s.getFcsj():""); 3149 temp.put("fcsj", s.getFcsj()!=null?s.getFcsj():"");
3150 - temp.put("fcsjA", s.getFcsjActual()!=null?s.getFcsjActual():"烂班"); 3150 + temp.put("fcsjA", s.getFcsjActual()!=null?s.getFcsjActual():"$$$$$${txt-3847}");
3151 temp.put("zdsj", s.getZdsj()!=null?s.getZdsj():""); 3151 temp.put("zdsj", s.getZdsj()!=null?s.getZdsj():"");
3152 - temp.put("zdsjA", s.getZdsjActual()!=null?s.getZdsjActual():"烂班"); 3152 + temp.put("zdsjA", s.getZdsjActual()!=null?s.getZdsjActual():"$$$$$${txt-3847}");
3153 if(s.getFcsj() != null && s.getFcsjActual()!=null){ 3153 if(s.getFcsj() != null && s.getFcsjActual()!=null){
3154 String[] split1 = s.getFcsj().split(":"); 3154 String[] split1 = s.getFcsj().split(":");
3155 String[] split2 = s.getFcsjActual().split(":"); 3155 String[] split2 = s.getFcsjActual().split(":");
@@ -3158,9 +3158,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3158,9 +3158,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3158 if(fcsj > 23*60 && fcsjA < 60) 3158 if(fcsj > 23*60 && fcsjA < 60)
3159 fcsjA += 1440; 3159 fcsjA += 1440;
3160 if(fcsjA - fcsj <= 3 && fcsjA - fcsj >= -1){ 3160 if(fcsjA - fcsj <= 3 && fcsjA - fcsj >= -1){
3161 - temp.put("fcsjzd", "准点"); 3161 + temp.put("fcsjzd", "$$$$$${txt-3844}");
3162 } else { 3162 } else {
3163 - temp.put("fcsjzd", "不准点"); 3163 + temp.put("fcsjzd", "$$$$$${txt-3451}");
3164 temp.put("fcsjflag", 1); 3164 temp.put("fcsjflag", 1);
3165 } 3165 }
3166 } 3166 }
@@ -3172,9 +3172,9 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3172,9 +3172,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3172 if(zdsj > 23*60 && zdsjA < 60) 3172 if(zdsj > 23*60 && zdsjA < 60)
3173 zdsjA += 1440; 3173 zdsjA += 1440;
3174 if(zdsjA - zdsj <= 3 && zdsjA - zdsj >= -1){ 3174 if(zdsjA - zdsj <= 3 && zdsjA - zdsj >= -1){
3175 - temp.put("zdsjzd", "准点"); 3175 + temp.put("zdsjzd", "$$$$$${txt-3844}");
3176 } else { 3176 } else {
3177 - temp.put("zdsjzd", "不准点"); 3177 + temp.put("zdsjzd", "$$$$$${txt-3451}");
3178 temp.put("zdsjflag", 1); 3178 temp.put("zdsjflag", 1);
3179 } 3179 }
3180 } 3180 }
@@ -3237,7 +3237,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3237,7 +3237,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3237 m.put("date2", endDate); 3237 m.put("date2", endDate);
3238 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 3238 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
3239 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime.xls", 3239 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime.xls",
3240 - path+"export/" + dateTime + "-" + lineName + "-发车到站准点率.xls"); 3240 + path+"export/" + dateTime + "-" + lineName + "-$$$$$${txt-1009}.xls");
3241 } catch (Exception e) { 3241 } catch (Exception e) {
3242 // TODO: handle exception 3242 // TODO: handle exception
3243 e.printStackTrace(); 3243 e.printStackTrace();
@@ -3296,7 +3296,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3296,7 +3296,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3296 m.put("date2", endDate); 3296 m.put("date2", endDate);
3297 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 3297 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
3298 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime1.xls", 3298 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime1.xls",
3299 - path+"export/"+dateTime+"-"+lineName+"-发车到站准点率明细.xls"); 3299 + path+"export/"+dateTime+"-"+lineName+"-$$$$$${txt-583}.xls");
3300 } catch (Exception e) { 3300 } catch (Exception e) {
3301 // TODO: handle exception 3301 // TODO: handle exception
3302 e.printStackTrace(); 3302 e.printStackTrace();
@@ -3342,7 +3342,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -3342,7 +3342,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
3342 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 3342 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
3343 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime2.xls", 3343 ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime2.xls",
3344 path+"export/"+sdfSimple.format(sdfMonth.parse(startDate)) 3344 path+"export/"+sdfSimple.format(sdfMonth.parse(startDate))
3345 - +"-"+lineName+"-发车到站准点率详细.xls"); 3345 + +"-"+lineName+"-$$$$$${txt-582}.xls");
3346 } catch (Exception e) { 3346 } catch (Exception e) {
3347 // TODO: handle exception 3347 // TODO: handle exception
3348 e.printStackTrace(); 3348 e.printStackTrace();
src/main/java/com/bsth/service/impl/GeoPremiseServiceImpl.java
  View file @3e58009
@@ -37,7 +37,7 @@ public class GeoPremiseServiceImpl extends BaseServiceImpl&lt;GeoPremise, Integer&gt; @@ -37,7 +37,7 @@ public class GeoPremiseServiceImpl extends BaseServiceImpl&lt;GeoPremise, Integer&gt;
37 geoPremise.setLineCode(stationRoute.getLineCode()); 37 geoPremise.setLineCode(stationRoute.getLineCode());
38 geoPremise.setUpDown(stationRoute.getDirections()); 38 geoPremise.setUpDown(stationRoute.getDirections());
39 geoPremise.setStationCode(stationRoute.getStationCode()); 39 geoPremise.setStationCode(stationRoute.getStationCode());
40 - geoPremise.setName(String.format("%s-%s", stationRoute.getStationName(), stationRoute.getDirections() == 0 ? "上行" : "下行")); 40 + geoPremise.setName(String.format("%s-%s", stationRoute.getStationName(), stationRoute.getDirections() == 0 ? "$$$$$${txt-3858}" : "下行"));
41 geoPremiseRepository.save(geoPremise); 41 geoPremiseRepository.save(geoPremise);
42 42
43 return result; 43 return result;
src/main/java/com/bsth/service/impl/LineServiceImpl.java
  View file @3e58009
@@ -105,7 +105,7 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L @@ -105,7 +105,7 @@ public class LineServiceImpl extends BaseServiceImpl&lt;Line, Integer&gt; implements L
105 try{ 105 try{
106 if(null == id){ 106 if(null == id){
107 map.put("status", ResponseCode.ERROR); 107 map.put("status", ResponseCode.ERROR);
108 - map.put("msg", "参数异常"); 108 + map.put("msg", "$$$$$${txt-2425}");
109 return map; 109 return map;
110 } 110 }
111 111
src/main/java/com/bsth/service/impl/RefuelServiceImpl.java
  View file @3e58009
@@ -411,7 +411,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements @@ -411,7 +411,7 @@ public class RefuelServiceImpl extends BaseServiceImpl&lt;Refuel, Long&gt; implements
411 } catch (Exception e) { 411 } catch (Exception e) {
412 // TODO Auto-generated catch block 412 // TODO Auto-generated catch block
413 e.printStackTrace(); 413 e.printStackTrace();
414 - return "文件导入失败" + msg; 414 + return "$$$$$${txt-1429}" + msg;
415 } finally { 415 } finally {
416 file.delete(); 416 file.delete();
417 } 417 }
src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java
  View file @3e58009
@@ -84,15 +84,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -84,15 +84,15 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
84 Map<String,Object> resultExcel = new HashMap<String,Object>();//导出参数的对象 84 Map<String,Object> resultExcel = new HashMap<String,Object>();//导出参数的对象
85 /* 添加表头*/ 85 /* 添加表头*/
86 List<String> title = new ArrayList<String>(); 86 List<String> title = new ArrayList<String>();
87 - title.add("线路ID");  
88 - title.add("方向"); 87 + title.add("$$$$$${txt-3381}");
  88 + title.add("$$$$$${txt-4016}");
89 title.add("站点编码"); 89 title.add("站点编码");
90 title.add("站点顺序号"); 90 title.add("站点顺序号");
91 title.add("站点备注"); 91 title.add("站点备注");
92 - title.add("站点名称");  
93 - title.add("站点距离(km)");  
94 - title.add("站点时长(min)");  
95 - title.add("线路名称"); 92 + title.add("$$$$$${txt-2797}");
  93 + title.add("$$$$$${txt-2833}");
  94 + title.add("$$$$$${txt-2832}");
  95 + title.add("$$$$$${txt-3347}");
96 resultExcel.put("title", title); 96 resultExcel.put("title", title);
97 /* 添加表单*/ 97 /* 添加表单*/
98 Map<String,List<String>> temp = new HashMap<String,List<String>>(); 98 Map<String,List<String>> temp = new HashMap<String,List<String>>();
@@ -305,8 +305,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -305,8 +305,8 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
305 } else { 305 } else {
306 if(stationList.size()>0) { 306 if(stationList.size()>0) {
307 Map<String, Object> tempM = new HashMap<String, Object>(); 307 Map<String, Object> tempM = new HashMap<String, Object>();
308 - tempM.put("name", "添加路段");  
309 - tempM.put("text", "添加路段"); 308 + tempM.put("name", "$$$$$${txt-2452}");
  309 + tempM.put("text", "$$$$$${txt-2452}");
310 tempM.put("lineId", stationList.get(0).getLine().getId()); 310 tempM.put("lineId", stationList.get(0).getLine().getId());
311 tempM.put("lineCode", stationList.get(0).getLine().getLineCode()); 311 tempM.put("lineCode", stationList.get(0).getLine().getLineCode());
312 tempM.put("dir", stationList.get(0).getDirections()); 312 tempM.put("dir", stationList.get(0).getDirections());
@@ -335,9 +335,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -335,9 +335,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
335 335
336 childrenStationMap.put("icon", null); 336 childrenStationMap.put("icon", null);
337 childrenStationMap.put("id", 200); 337 childrenStationMap.put("id", 200);
338 - childrenStationMap.put("name", "站点"); 338 + childrenStationMap.put("name", "$$$$$${txt-4148}");
339 childrenStationMap.put("pId", 100); 339 childrenStationMap.put("pId", 100);
340 - childrenStationMap.put("text", "站点"); 340 + childrenStationMap.put("text", "$$$$$${txt-4148}");
341 childrenTwo.add(childrenStationMap); 341 childrenTwo.add(childrenStationMap);
342 342
343 // 路段节点 343 // 路段节点
@@ -349,9 +349,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -349,9 +349,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
349 childrenSectionMap.put("chaildredType", null); 349 childrenSectionMap.put("chaildredType", null);
350 childrenSectionMap.put("icon", null); 350 childrenSectionMap.put("icon", null);
351 childrenSectionMap.put("id", 300); 351 childrenSectionMap.put("id", 300);
352 - childrenSectionMap.put("name", "路段"); 352 + childrenSectionMap.put("name", "$$$$$${txt-4194}");
353 childrenSectionMap.put("pId", 100); 353 childrenSectionMap.put("pId", 100);
354 - childrenSectionMap.put("text", "路段"); 354 + childrenSectionMap.put("text", "$$$$$${txt-4194}");
355 childrenTwo.add(childrenSectionMap); 355 childrenTwo.add(childrenSectionMap);
356 356
357 // 站点与路段 357 // 站点与路段
@@ -363,9 +363,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ @@ -363,9 +363,9 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
363 resultMap.put("chaildredType", null); 363 resultMap.put("chaildredType", null);
364 resultMap.put("icon", null); 364 resultMap.put("icon", null);
365 resultMap.put("id", 100); 365 resultMap.put("id", 100);
366 - resultMap.put("name", "站点与路段"); 366 + resultMap.put("name", "$$$$$${txt-2171}");
367 resultMap.put("pId", null); 367 resultMap.put("pId", null);
368 - resultMap.put("text", "站点与路段"); 368 + resultMap.put("text", "$$$$$${txt-2171}");
369 resultList.add(resultMap); 369 resultList.add(resultMap);
370 370
371 return resultList; 371 return resultList;
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @3e58009
@@ -482,7 +482,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -482,7 +482,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
482 sf.append("<SJGH>").append(scheduleRealInfo.getjGh()).append("</SJGH>"); 482 sf.append("<SJGH>").append(scheduleRealInfo.getjGh()).append("</SJGH>");
483 sf.append("<SXX>").append(scheduleRealInfo.getXlDir()).append("</SXX>"); 483 sf.append("<SXX>").append(scheduleRealInfo.getXlDir()).append("</SXX>");
484 sf.append("<FCZDMC>").append(scheduleRealInfo.getQdzName()).append("</FCZDMC>"); 484 sf.append("<FCZDMC>").append(scheduleRealInfo.getQdzName()).append("</FCZDMC>");
485 - // 起点站的参数  
486 otherMap.put("stationMark","B"); 485 otherMap.put("stationMark","B");
487 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap); 486 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
488 sf.append("<FCZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</FCZDXH>"); 487 sf.append("<FCZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</FCZDXH>");
@@ -492,7 +491,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -492,7 +491,6 @@ public class TrafficManageServiceImpl implements TrafficManageService{
492 sf.append("<SJFCSJ>").append(scheduleRealInfo.getFcsjActual()).append("</SJFCSJ>"); 491 sf.append("<SJFCSJ>").append(scheduleRealInfo.getFcsjActual()).append("</SJFCSJ>");
493 sf.append("<FCZDLX></FCZDLX>"); 492 sf.append("<FCZDLX></FCZDLX>");
494 sf.append("<DDZDMC>").append(scheduleRealInfo.getZdzName()).append("</DDZDMC>"); 493 sf.append("<DDZDMC>").append(scheduleRealInfo.getZdzName()).append("</DDZDMC>");
495 - // 终点站的参数  
496 otherMap.put("stationMark","E"); 494 otherMap.put("stationMark","E");
497 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap); 495 paramMap = packageYgcStationNumParam(scheduleRealInfo,otherMap);
498 sf.append("<DDZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</DDZDXH>"); 496 sf.append("<DDZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,stationNumMap)).append("</DDZDXH>");
@@ -866,13 +864,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -866,13 +864,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
866 sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>"); 864 sBuffer.append("<SJGH>").append(schedulePlanInfo.getjGh()).append("</SJGH>");
867 sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>"); 865 sBuffer.append("<SXX>").append(schedulePlanInfo.getXlDir()).append("</SXX>");
868 sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>"); 866 sBuffer.append("<FCZDMC>").append(schedulePlanInfo.getQdzName()).append("</FCZDMC>");
869 - // 起点站的参数  
870 otherMap.put("stationMark","B"); 867 otherMap.put("stationMark","B");
871 paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap); 868 paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
872 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>"); 869 sBuffer.append("<ZDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</ZDXH>");
873 sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>"); 870 sBuffer.append("<JHFCSJ>").append(schedulePlanInfo.getFcsj()).append("</JHFCSJ>");
874 sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>"); 871 sBuffer.append("<DDZDMC>").append(schedulePlanInfo.getZdzName()).append("</DDZDMC>");
875 - // 起点站的参数  
876 otherMap.put("stationMark","E"); 872 otherMap.put("stationMark","E");
877 paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap); 873 paramMap = packageYgcStationNumParam(schedulePlanInfo,otherMap);
878 sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>"); 874 sBuffer.append("<DDXH>").append(getYgcStationNumByLineCodeAndDirectionAndStationName(paramMap,null)).append("</DDXH>");
@@ -925,7 +921,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -925,7 +921,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
925 */ 921 */
926 @Override 922 @Override
927 public String setSKB(String ids, String qyrqs) { 923 public String setSKB(String ids, String qyrqs) {
928 - String result = "上传失败，"; 924 + String result = "$$$$$${txt-3154}，";
929 StringBuffer sBuffer = new StringBuffer("<SKBs>"); 925 StringBuffer sBuffer = new StringBuffer("<SKBs>");
930 DecimalFormat df = new DecimalFormat("######0.000"); 926 DecimalFormat df = new DecimalFormat("######0.000");
931 Map<String,String> lsStationCode2NameMap = null; 927 Map<String,String> lsStationCode2NameMap = null;
@@ -1039,10 +1035,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1039,10 +1035,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1039 sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>"); 1035 sBufferC.append("<LPBH>").append(ttInfoDetail.getLp().getLpNo()).append("</LPBH>");
1040 sBufferC.append("<SXX>").append(sxx).append("</SXX>"); 1036 sBufferC.append("<SXX>").append(sxx).append("</SXX>");
1041 sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>"); 1037 sBufferC.append("<FCZDMC>").append(fczdmc).append("</FCZDMC>");
1042 - // 起点站的参数  
1043 otherMap.put("stationMark","B"); 1038 otherMap.put("stationMark","B");
1044 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 1039 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
1045 - if(isLogStation){// 输出起点站信息 1040 + if(isLogStation){
1046 logger.info("setSKB:"+"起点站信息："+paramMap); 1041 logger.info("setSKB:"+"起点站信息："+paramMap);
1047 } 1042 }
1048 // 发车站点序号 1043 // 发车站点序号
@@ -1060,10 +1055,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1060,10 +1055,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1060 sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>"); 1055 sBufferC.append("<ZDXH>").append(zdxh).append("</ZDXH>");
1061 sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>"); 1056 sBufferC.append("<JHFCSJ>").append(changeTimeFormat(ttInfoDetail)).append("</JHFCSJ>");
1062 sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>"); 1057 sBufferC.append("<DDZDMC>").append(ddzdmc).append("</DDZDMC>");
1063 - // 终点站的参数  
1064 otherMap.put("stationMark","E"); 1058 otherMap.put("stationMark","E");
1065 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap); 1059 paramMap = packageYgcStationNumParam(ttInfoDetail,otherMap);
1066 - if(isLogStation){// 输出终点站信息 1060 + if(isLogStation){
1067 logger.info("setSKB:"+"终点站信息："+paramMap); 1061 logger.info("setSKB:"+"终点站信息："+paramMap);
1068 } 1062 }
1069 // 到达站点序号 1063 // 到达站点序号
@@ -1097,10 +1091,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1097,10 +1091,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1097 sBuffer.append("</SKBs>"); 1091 sBuffer.append("</SKBs>");
1098 String state;// 是否上传成功 1092 String state;// 是否上传成功
1099 if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){ 1093 if(ssop.setSKB(userNameOther, passwordOther, sBuffer.toString()).isSuccess()){
1100 - result = "上传成功"; 1094 + result = "$$$$$${txt-3155}";
1101 state = "1"; 1095 state = "1";
1102 }else{// 上传失败 1096 }else{// 上传失败
1103 - result = "上传失败"; 1097 + result = "$$$$$${txt-3154}";
1104 state = "0"; 1098 state = "0";
1105 } 1099 }
1106 // 保存运管处上传记录 1100 // 保存运管处上传记录
@@ -1169,7 +1163,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1169,7 +1163,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1169 }else{ 1163 }else{
1170 if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){ 1164 if(type.equals(TrafficManageServiceImpl.UPLOAD_TYPE_XL)){
1171 Line line = (Line) obj; 1165 Line line = (Line) obj;
1172 - String name = line.getName() + "线路停靠站上传"; 1166 + String name = line.getName() + "$$$$$${txt-1011}";
1173 skbUploadLogger.setLine(line); 1167 skbUploadLogger.setLine(line);
1174 skbUploadLogger.setName(name); 1168 skbUploadLogger.setName(name);
1175 skbUploadLoggerRepository.save(skbUploadLogger); 1169 skbUploadLoggerRepository.save(skbUploadLogger);
@@ -1177,7 +1171,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1177,7 +1171,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1177 Map<String ,Line> logLineMap = (Map<String ,Line> )obj; 1171 Map<String ,Line> logLineMap = (Map<String ,Line> )obj;
1178 for (String key : logLineMap.keySet()) { 1172 for (String key : logLineMap.keySet()) {
1179 Line line = logLineMap.get(key); 1173 Line line = logLineMap.get(key);
1180 - String name = line.getName() + "路单上传"; 1174 + String name = line.getName() + "$$$$$${txt-2472}";
1181 skbUploadLogger = new SKBUploadLogger(); 1175 skbUploadLogger = new SKBUploadLogger();
1182 skbUploadLogger.setType(type);// 设置类型 1176 skbUploadLogger.setType(type);// 设置类型
1183 // skbUploadLogger.setUploadXml(xml);// 上传的参数 1177 // skbUploadLogger.setUploadXml(xml);// 上传的参数
@@ -1488,7 +1482,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1488,7 +1482,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1488 int size = stationsList.size(); 1482 int size = stationsList.size();
1489 StationRoute srRoute; 1483 StationRoute srRoute;
1490 HashMap<String,String> paraMap; 1484 HashMap<String,String> paraMap;
1491 - String zdlx ;// 站点类型：0：起点站、1：终点站、2：中途站 1485 + String zdlx ;
1492 for (int i = 0; i < size; i++) { 1486 for (int i = 0; i < size; i++) {
1493 srRoute = stationsList.get(i); 1487 srRoute = stationsList.get(i);
1494 zdlx = srRoute.getStationMark(); 1488 zdlx = srRoute.getStationMark();
@@ -1565,13 +1559,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1565,13 +1559,11 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1565 String direction = map.get("direction"); 1559 String direction = map.get("direction");
1566 // 站点编码 1560 // 站点编码
1567 String stationCode = map.get("stationCode"); 1561 String stationCode = map.get("stationCode");
1568 - // 站点类型：B：起点站 Z：中途站 E：终点站 T：停车场  
1569 String stationMark = map.get("stationMark"); 1562 String stationMark = map.get("stationMark");
1570 String[] marks = null; 1563 String[] marks = null;
1571 - // 起点站，先从起点找，找不到再从中途站找，最后从终点找  
1572 if(stationMark.equals("B")){ 1564 if(stationMark.equals("B")){
1573 marks= new String[]{"B","Z","E"}; 1565 marks= new String[]{"B","Z","E"};
1574 - }else if(stationMark.equals("E")){// 终点站相反 1566 + }else if(stationMark.equals("E")){
1575 marks= new String[]{"E","Z","B"}; 1567 marks= new String[]{"E","Z","B"};
1576 }else if(stationMark.equals("Z")){ 1568 }else if(stationMark.equals("Z")){
1577 marks= new String[]{"Z"}; 1569 marks= new String[]{"Z"};
@@ -1613,9 +1605,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1613,9 +1605,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1613 direction = sri.getXlDir(); 1605 direction = sri.getXlDir();
1614 if(otherParam != null && otherParam.get("stationMark") != null){ 1606 if(otherParam != null && otherParam.get("stationMark") != null){
1615 stationMark = otherParam.get("stationMark"); 1607 stationMark = otherParam.get("stationMark");
1616 - if(stationMark.equals("B")){ // 起点站 1608 + if(stationMark.equals("B")){
1617 stationCode = sri.getQdzCode(); 1609 stationCode = sri.getQdzCode();
1618 - }else if(stationMark.equals("E")){ // 终点站 1610 + }else if(stationMark.equals("E")){
1619 stationCode = sri.getZdzCode(); 1611 stationCode = sri.getZdzCode();
1620 } 1612 }
1621 } 1613 }
@@ -1625,9 +1617,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1625,9 +1617,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1625 direction = spi.getXlDir(); 1617 direction = spi.getXlDir();
1626 if(otherParam != null && otherParam.get("stationMark") != null){ 1618 if(otherParam != null && otherParam.get("stationMark") != null){
1627 stationMark = otherParam.get("stationMark"); 1619 stationMark = otherParam.get("stationMark");
1628 - if(stationMark.equals("B")){ // 起点站 1620 + if(stationMark.equals("B")){
1629 stationCode = spi.getQdzCode(); 1621 stationCode = spi.getQdzCode();
1630 - }else if(stationMark.equals("E")){ // 终点站 1622 + }else if(stationMark.equals("E")){
1631 stationCode = spi.getZdzCode(); 1623 stationCode = spi.getZdzCode();
1632 } 1624 }
1633 } 1625 }
@@ -1637,9 +1629,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1637,9 +1629,9 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1637 direction = ttid.getXlDir(); 1629 direction = ttid.getXlDir();
1638 if(otherParam != null && otherParam.get("stationMark") != null){ 1630 if(otherParam != null && otherParam.get("stationMark") != null){
1639 stationMark = otherParam.get("stationMark"); 1631 stationMark = otherParam.get("stationMark");
1640 - if(stationMark.equals("B")){ // 起点站 1632 + if(stationMark.equals("B")){
1641 stationCode = ttid.getQdzCode(); 1633 stationCode = ttid.getQdzCode();
1642 - }else if(stationMark.equals("E")){ // 终点站 1634 + }else if(stationMark.equals("E")){
1643 stationCode = ttid.getZdzCode(); 1635 stationCode = ttid.getZdzCode();
1644 } 1636 }
1645 } 1637 }
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
  View file @3e58009
@@ -305,7 +305,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -305,7 +305,7 @@ public class JdtestServiceImpl implements JdtestService {
305 zlc_line2=Arith.add(zlc_line2, zlc2); 305 zlc_line2=Arith.add(zlc_line2, zlc2);
306 306
307 Map<String, Object> mmm=new HashMap<>(); 307 Map<String, Object> mmm=new HashMap<>();
308 - mmm.put("xlName", "小计"); 308 + mmm.put("xlName", "$$$$$${txt-3918}");
309 mmm.put("lp", ""); 309 mmm.put("lp", "");
310 mmm.put("jGh", ""); 310 mmm.put("jGh", "");
311 mmm.put("clZbh", ""); 311 mmm.put("clZbh", "");
@@ -350,7 +350,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -350,7 +350,7 @@ public class JdtestServiceImpl implements JdtestService {
350 zlc_line=Arith.add(zlc_line, zlc); 350 zlc_line=Arith.add(zlc_line, zlc);
351 zlc_line2=Arith.add(zlc_line2, zlc2); 351 zlc_line2=Arith.add(zlc_line2, zlc2);
352 Map<String, Object> mmm=new HashMap<>(); 352 Map<String, Object> mmm=new HashMap<>();
353 - mmm.put("xlName", "小计"); 353 + mmm.put("xlName", "$$$$$${txt-3918}");
354 mmm.put("lp", ""); 354 mmm.put("lp", "");
355 mmm.put("jGh", ""); 355 mmm.put("jGh", "");
356 mmm.put("clZbh", ""); 356 mmm.put("clZbh", "");
@@ -372,7 +372,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -372,7 +372,7 @@ public class JdtestServiceImpl implements JdtestService {
372 } else { 372 } else {
373 373
374 Map<String, Object> mmm=new HashMap<>(); 374 Map<String, Object> mmm=new HashMap<>();
375 - mmm.put("xlName", "小计"); 375 + mmm.put("xlName", "$$$$$${txt-3918}");
376 mmm.put("lp", ""); 376 mmm.put("lp", "");
377 mmm.put("jGh", ""); 377 mmm.put("jGh", "");
378 mmm.put("clZbh", ""); 378 mmm.put("clZbh", "");
@@ -395,7 +395,7 @@ public class JdtestServiceImpl implements JdtestService { @@ -395,7 +395,7 @@ public class JdtestServiceImpl implements JdtestService {
395 } 395 }
396 } 396 }
397 Map<String, Object> mmp=new HashMap<>(); 397 Map<String, Object> mmp=new HashMap<>();
398 - mmp.put("xlName", "合计"); 398 + mmp.put("xlName", "$$$$$${txt-3916}");
399 mmp.put("lp", ""); 399 mmp.put("lp", "");
400 mmp.put("jGh", ""); 400 mmp.put("jGh", "");
401 mmp.put("clZbh", ""); 401 mmp.put("clZbh", "");
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
  View file @3e58009
@@ -583,7 +583,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw @@ -583,7 +583,7 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
583 } catch (Exception e) { 583 } catch (Exception e) {
584 // TODO Auto-generated catch block 584 // TODO Auto-generated catch block
585 e.printStackTrace(); 585 e.printStackTrace();
586 - return "文件导入失败"; 586 + return "$$$$$${txt-1429}";
587 } finally { 587 } finally {
588 file.delete(); 588 file.delete();
589 } 589 }
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
  View file @3e58009
@@ -975,7 +975,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -975,7 +975,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
975 SysUser user = SecurityUtils.getCurrentUser(); 975 SysUser user = SecurityUtils.getCurrentUser();
976 Nylog nylog=new Nylog(); 976 Nylog nylog=new Nylog();
977 nylog.setCreatedate(new Date()); 977 nylog.setCreatedate(new Date());
978 - nylog.setCzmc("手动添加"); 978 + nylog.setCzmc("$$$$$${txt-2862}");
979 nylog.setNylx("电"); 979 nylog.setNylx("电");
980 nylog.setUserid(user.getUserName()); 980 nylog.setUserid(user.getUserName());
981 nylog.setUsername(user.getName()); 981 nylog.setUsername(user.getName());
@@ -1004,7 +1004,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS @@ -1004,7 +1004,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
1004 SysUser user = SecurityUtils.getCurrentUser(); 1004 SysUser user = SecurityUtils.getCurrentUser();
1005 Nylog nylog=new Nylog(); 1005 Nylog nylog=new Nylog();
1006 nylog.setCreatedate(new Date()); 1006 nylog.setCreatedate(new Date());
1007 - nylog.setCzmc("删除"); 1007 + nylog.setCzmc("$$$$$${txt-3868}");
1008 nylog.setNylx("电"); 1008 nylog.setNylx("电");
1009 nylog.setUserid(user.getUserName()); 1009 nylog.setUserid(user.getUserName());
1010 nylog.setUsername(user.getName()); 1010 nylog.setUsername(user.getName());
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
  View file @3e58009
@@ -98,7 +98,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl @@ -98,7 +98,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
98 } catch (Exception e) { 98 } catch (Exception e) {
99 // TODO Auto-generated catch block 99 // TODO Auto-generated catch block
100 e.printStackTrace(); 100 e.printStackTrace();
101 - return "文件导入失败"; 101 + return "$$$$$${txt-1429}";
102 } finally { 102 } finally {
103 file.delete(); 103 file.delete();
104 } 104 }
@@ -144,7 +144,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl @@ -144,7 +144,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; 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/$$$$$${txt-2119}" + 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
  View file @3e58009
@@ -98,7 +98,7 @@ public class JqlServiceImpl extends BaseServiceImpl&lt;Jql, Integer&gt; implements Jql @@ -98,7 +98,7 @@ public class JqlServiceImpl extends BaseServiceImpl&lt;Jql, Integer&gt; implements Jql
98 } catch (Exception e) { 98 } catch (Exception e) {
99 // TODO Auto-generated catch block 99 // TODO Auto-generated catch block
100 e.printStackTrace(); 100 e.printStackTrace();
101 - return "文件导入失败"; 101 + return "$$$$$${txt-1429}";
102 } finally { 102 } finally {
103 file.delete(); 103 file.delete();
104 } 104 }
@@ -144,7 +144,7 @@ public class JqlServiceImpl extends BaseServiceImpl&lt;Jql, Integer&gt; implements Jql @@ -144,7 +144,7 @@ public class JqlServiceImpl extends BaseServiceImpl&lt;Jql, Integer&gt; 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/$$$$$${txt-2119}" + 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/QlbServiceImpl.java
  View file @3e58009
@@ -929,7 +929,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS @@ -929,7 +929,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
929 SysUser user = SecurityUtils.getCurrentUser(); 929 SysUser user = SecurityUtils.getCurrentUser();
930 Nylog nylog=new Nylog(); 930 Nylog nylog=new Nylog();
931 nylog.setCreatedate(new Date()); 931 nylog.setCreatedate(new Date());
932 - nylog.setCzmc("手动添加"); 932 + nylog.setCzmc("$$$$$${txt-2862}");
933 nylog.setNylx("氢"); 933 nylog.setNylx("氢");
934 nylog.setUserid(user.getUserName()); 934 nylog.setUserid(user.getUserName());
935 nylog.setUsername(user.getName()); 935 nylog.setUsername(user.getName());
@@ -958,7 +958,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS @@ -958,7 +958,7 @@ public class QlbServiceImpl extends BaseServiceImpl&lt;Qlb,Integer&gt; implements QlbS
958 SysUser user = SecurityUtils.getCurrentUser(); 958 SysUser user = SecurityUtils.getCurrentUser();
959 Nylog nylog=new Nylog(); 959 Nylog nylog=new Nylog();
960 nylog.setCreatedate(new Date()); 960 nylog.setCreatedate(new Date());
961 - nylog.setCzmc("删除"); 961 + nylog.setCzmc("$$$$$${txt-3868}");
962 nylog.setNylx("氢"); 962 nylog.setNylx("氢");
963 nylog.setUserid(user.getUserName()); 963 nylog.setUserid(user.getUserName());
964 nylog.setUsername(user.getName()); 964 nylog.setUsername(user.getName());
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
  View file @3e58009
@@ -1081,7 +1081,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1081,7 +1081,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1081 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 1081 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
1082 ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls", 1082 ee.excelReplace(listI, new Object[] { m }, path+"mould/oilListMonth.xls",
1083 path+"export/" + sdfSimple.format(sdfMonth.parse(date)) 1083 path+"export/" + sdfSimple.format(sdfMonth.parse(date))
1084 - + "-" + lineName + "-月存油报表.xls"); 1084 + + "-" + lineName + "-$$$$$${txt-2193}.xls");
1085 } catch (Exception e) { 1085 } catch (Exception e) {
1086 // TODO: handle exception 1086 // TODO: handle exception
1087 e.printStackTrace(); 1087 e.printStackTrace();
@@ -1089,8 +1089,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1089,8 +1089,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1089 }else{ 1089 }else{
1090 m_=new HashMap<String,Object>(); 1090 m_=new HashMap<String,Object>();
1091 m_.put("xh0", "99"); 1091 m_.put("xh0", "99");
1092 - m_.put("nbbm0", "存油合计:"+ycyhj +" 非营运用油： 其他用油:"+qtyy +",车队:"+cdyy+",保养用油:"+byyy  
1093 - +",车间(小修):"+cjxx+",车间(高保):"+cjgb+",非营运用油合计:"+fyyyhj); 1092 + m_.put("nbbm0", "$$$$$${txt-4397}"+ycyhj);
1094 mapList.add(m_); 1093 mapList.add(m_);
1095 } 1094 }
1096 1095
@@ -1571,7 +1570,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1571,7 +1570,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1571 SysUser user = SecurityUtils.getCurrentUser(); 1570 SysUser user = SecurityUtils.getCurrentUser();
1572 Nylog nylog=new Nylog(); 1571 Nylog nylog=new Nylog();
1573 nylog.setCreatedate(new Date()); 1572 nylog.setCreatedate(new Date());
1574 - nylog.setCzmc("拆分"); 1573 + nylog.setCzmc("$$$$$${txt-3855}");
1575 nylog.setNylx("油"); 1574 nylog.setNylx("油");
1576 nylog.setUserid(user.getUserName()); 1575 nylog.setUserid(user.getUserName());
1577 nylog.setUsername(user.getName()); 1576 nylog.setUsername(user.getName());
@@ -1712,7 +1711,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1712,7 +1711,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1712 SysUser user = SecurityUtils.getCurrentUser(); 1711 SysUser user = SecurityUtils.getCurrentUser();
1713 Nylog nylog=new Nylog(); 1712 Nylog nylog=new Nylog();
1714 nylog.setCreatedate(new Date()); 1713 nylog.setCreatedate(new Date());
1715 - nylog.setCzmc("手动添加"); 1714 + nylog.setCzmc("$$$$$${txt-2862}");
1716 nylog.setNylx("油"); 1715 nylog.setNylx("油");
1717 nylog.setUserid(user.getUserName()); 1716 nylog.setUserid(user.getUserName());
1718 nylog.setUsername(user.getName()); 1717 nylog.setUsername(user.getName());
@@ -1740,7 +1739,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -1740,7 +1739,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
1740 SysUser user = SecurityUtils.getCurrentUser(); 1739 SysUser user = SecurityUtils.getCurrentUser();
1741 Nylog nylog=new Nylog(); 1740 Nylog nylog=new Nylog();
1742 nylog.setCreatedate(new Date()); 1741 nylog.setCreatedate(new Date());
1743 - nylog.setCzmc("删除"); 1742 + nylog.setCzmc("$$$$$${txt-3868}");
1744 nylog.setNylx("油"); 1743 nylog.setNylx("油");
1745 nylog.setUserid(user.getUserName()); 1744 nylog.setUserid(user.getUserName());
1746 nylog.setUsername(user.getName()); 1745 nylog.setUsername(user.getName());
@@ -2140,7 +2139,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS @@ -2140,7 +2139,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
2140 SysUser user = SecurityUtils.getCurrentUser(); 2139 SysUser user = SecurityUtils.getCurrentUser();
2141 Nylog nylog=new Nylog(); 2140 Nylog nylog=new Nylog();
2142 nylog.setCreatedate(new Date()); 2141 nylog.setCreatedate(new Date());
2143 - nylog.setCzmc("重新统计"); 2142 + nylog.setCzmc("$$$$$${txt-3258}");
2144 nylog.setNylx("油"); 2143 nylog.setNylx("油");
2145 nylog.setUserid(user.getUserName()); 2144 nylog.setUserid(user.getUserName());
2146 nylog.setUsername(user.getName()); 2145 nylog.setUsername(user.getName());
src/main/java/com/bsth/service/realcontrol/impl/RealChartsServiceImpl.java
  View file @3e58009
@@ -157,7 +157,7 @@ public class RealChartsServiceImpl implements RealChartsService { @@ -157,7 +157,7 @@ public class RealChartsServiceImpl implements RealChartsService {
157 } 157 }
158 158
159 /** 159 /**
160 - * 首末班次准点率 160 + * $$$$$${txt-1154}
161 * @param month 161 * @param month
162 * @param idx 162 * @param idx
163 * @return 163 * @return
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @3e58009
@@ -621,11 +621,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -621,11 +621,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
621 } 621 }
622 if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) { 622 if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) {
623 rs.put("status", ResponseCode.ERROR); 623 rs.put("status", ResponseCode.ERROR);
624 - rs.put("msg", "路牌信息缺失"); 624 + rs.put("msg", "$$$$$${txt-1752}");
625 return rs; 625 return rs;
626 } 626 }
627 if (!carExist(t.getGsBm(), clZbh)) { 627 if (!carExist(t.getGsBm(), clZbh)) {
628 - rs.put("msg", "车辆 " + clZbh + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！"); 628 + rs.put("msg", "i18n('$$$$$${txt-4337}', [clZbh])");
629 rs.put("status", ResponseCode.ERROR); 629 rs.put("status", ResponseCode.ERROR);
630 return rs; 630 return rs;
631 } 631 }
@@ -725,7 +725,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -725,7 +725,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
725 String clZbh = sch.getClZbh(), lpName = sch.getLpName(); 725 String clZbh = sch.getClZbh(), lpName = sch.getLpName();
726 if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) { 726 if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) {
727 rs.put("status", ResponseCode.ERROR); 727 rs.put("status", ResponseCode.ERROR);
728 - rs.put("msg", "路牌信息缺失"); 728 + rs.put("msg", "$$$$$${txt-1752}");
729 return rs; 729 return rs;
730 } 730 }
731 if (StringUtils.isNotEmpty(clZbh)) { 731 if (StringUtils.isNotEmpty(clZbh)) {
@@ -1199,7 +1199,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1199,7 +1199,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1199 s.setFcsjActual(""); 1199 s.setFcsjActual("");
1200 s.setZdsjActual(""); 1200 s.setZdsjActual("");
1201 s.setJhlc(0.0); 1201 s.setJhlc(0.0);
1202 - remarks += "(烂班)"; 1202 + remarks += "($$$$$${txt-3847})";
1203 s.setRemarks(remarks); 1203 s.setRemarks(remarks);
1204 } 1204 }
1205 1205
@@ -1288,7 +1288,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1288,7 +1288,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1288 1288
1289 list.add(listMap.iterator()); 1289 list.add(listMap.iterator());
1290 ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/" + xls, 1290 ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/" + xls,
1291 - path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); 1291 + path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-$$$$$${txt-2459}.xls");
1292 return scheduleRealInfos; 1292 return scheduleRealInfos;
1293 } 1293 }
1294 1294
@@ -1437,8 +1437,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1437,8 +1437,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1437 map.put("sender", obj[1]); 1437 map.put("sender", obj[1]);
1438 map.put("date", obj[3]); 1438 map.put("date", obj[3]);
1439 map.put("text", obj[2]); 1439 map.put("text", obj[2]);
1440 - map.put("reply46", "0".equals(obj[5]+"")?"是":"");  
1441 - map.put("reply47", "0".equals(obj[6]+"")?"是":""); 1440 + map.put("reply46", "0".equals(obj[5]+"")?"$$$$$${txt-4257}":"");
  1441 + map.put("reply47", "0".equals(obj[6]+"")?"$$$$$${txt-4257}":"");
1442 newList.add(map); 1442 newList.add(map);
1443 } 1443 }
1444 try { 1444 try {
@@ -1446,7 +1446,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1446,7 +1446,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1446 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1446 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1447 ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls", 1447 ee.excelReplace(listI, new Object[]{m}, path + "mould/historyMessage.xls",
1448 path + "export/" + sdfSimple.format(sdfMonth.parse(date)) 1448 path + "export/" + sdfSimple.format(sdfMonth.parse(date))
1449 - + "-" + lineName + "-调度历史消息.xls"); 1449 + + "-" + lineName + "-$$$$$${txt-1345}.xls");
1450 } catch (Exception e) { 1450 } catch (Exception e) {
1451 // TODO: handle exception 1451 // TODO: handle exception
1452 e.printStackTrace(); 1452 e.printStackTrace();
@@ -1475,7 +1475,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1475,7 +1475,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1475 listI.add(newList.iterator()); 1475 listI.add(newList.iterator());
1476 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 1476 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
1477 ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls", 1477 ee.excelReplace(listI, new Object[]{m}, path + "mould/message.xls",
1478 - path + "export/调度消息分析" + sdfSimple.format(sdfMonth.parse(date)) + ".xls"); 1478 + path + "export/$$$$$${txt-1452}" + sdfSimple.format(sdfMonth.parse(date)) + ".xls");
1479 } catch (Exception e) { 1479 } catch (Exception e) {
1480 // TODO: handle exception 1480 // TODO: handle exception
1481 e.printStackTrace(); 1481 e.printStackTrace();
@@ -1704,7 +1704,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1704,7 +1704,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1704 rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + clZbh + "】的车辆"); 1704 rs.put("msg", sch.getXlName() + "所属的公司编码下找不到自编号为【" + clZbh + "】的车辆");
1705 return rs; 1705 return rs;
1706 } else { 1706 } else {
1707 - fLog.log("换车", sch.getClZbh(), clZbh); 1707 + fLog.log("$$$$$${txt-4116}", sch.getClZbh(), clZbh);
1708 dayOfSchedule.changeCar(sch, clZbh); 1708 dayOfSchedule.changeCar(sch, clZbh);
1709 } 1709 }
1710 } 1710 }
@@ -1777,7 +1777,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1777,7 +1777,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1777 LateAdjustHandle.remove(sch); 1777 LateAdjustHandle.remove(sch);
1778 //} 1778 //}
1779 } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)) { 1779 } else if (StringUtils.isNotEmpty(sch.getFcsjActual()) && StringUtils.isEmpty(fcsjActual)) {
1780 - fLog.log("撤销实发时间", sch.getFcsjActual(), ""); 1780 + fLog.log("$$$$$${txt-4386}", sch.getFcsjActual(), "");
1781 //撤销实发 1781 //撤销实发
1782 revokeRealOutgo(sch.getId()); 1782 revokeRealOutgo(sch.getId());
1783 } 1783 }
@@ -1831,7 +1831,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -1831,7 +1831,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
1831 if (map.get("status") != null 1831 if (map.get("status") != null
1832 && Integer.parseInt(map.get("status").toString()) == -1) { 1832 && Integer.parseInt(map.get("status").toString()) == -1) {
1833 destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null); 1833 destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null);
1834 - fLog.log("烂班"); 1834 + fLog.log("$$$$$${txt-3847}");
1835 } 1835 }
1836 1836
1837 /** 1837 /**
@@ -2288,16 +2288,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2288,16 +2288,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2288 Map<String, Object> m = new HashMap<String, Object>(); 2288 Map<String, Object> m = new HashMap<String, Object>();
2289 ReportUtils ee = new ReportUtils(); 2289 ReportUtils ee = new ReportUtils();
2290 Map<String, Object> typeMap = new HashMap<String, Object>(); 2290 Map<String, Object> typeMap = new HashMap<String, Object>();
2291 - typeMap.put("0xA1", "请求恢复运营");  
2292 - typeMap.put("0xA2", "申请调档");  
2293 - typeMap.put("0xA3", "出场请求");  
2294 - typeMap.put("0xA5", "进场请求");  
2295 - typeMap.put("0xA7", "加油请求");  
2296 - typeMap.put("0x50", "车辆故障");  
2297 - typeMap.put("0x70", "路阻报告");  
2298 - typeMap.put("0x60", "事故报告");  
2299 - typeMap.put("0x11", "扣证纠纷");  
2300 - typeMap.put("0x12", "报警"); 2291 + typeMap.put("0xA1", "$$$$$${txt-1302}");
  2292 + typeMap.put("0xA2", "$$$$$${txt-2535}");
  2293 + typeMap.put("0xA3", "$$$$$${txt-2534}");
  2294 + typeMap.put("0xA5", "$$$$$${txt-2533}");
  2295 + typeMap.put("0xA7", "$$$$$${txt-2532}");
  2296 + typeMap.put("0x50", "$$$$$${txt-2528}");
  2297 + typeMap.put("0x70", "$$$$$${txt-2537}");
  2298 + typeMap.put("0x60", "$$$$$${txt-2527}");
  2299 + typeMap.put("0x11", "$$$$$${txt-2531}");
  2300 + typeMap.put("0x12", "$$$$$${txt-3853}");
2301 for (Map<String, Object> map1 : listMap) { 2301 for (Map<String, Object> map1 : listMap) {
2302 map1.put("requestText", typeMap.get(map1.get("requestType"))); 2302 map1.put("requestText", typeMap.get(map1.get("requestType")));
2303 } 2303 }
@@ -2306,7 +2306,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2306,7 +2306,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2306 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 2306 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2307 ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls", 2307 ee.excelReplace(listI, new Object[]{m}, path + "mould/account.xls",
2308 path + "export/" + sdfSimple.format(sdfMonth.parse(date)) 2308 path + "export/" + sdfSimple.format(sdfMonth.parse(date))
2309 - + "-" + xlName + "-驾驶员请求台账.xls"); 2309 + + "-" + xlName + "-$$$$$${txt-1006}.xls");
2310 } catch (Exception e) { 2310 } catch (Exception e) {
2311 // TODO: handle exception 2311 // TODO: handle exception
2312 e.printStackTrace(); 2312 e.printStackTrace();
@@ -2320,17 +2320,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2320,17 +2320,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2320 public List<SchEditInfoDto> correctForm(String line, String date, String endDate, 2320 public List<SchEditInfoDto> correctForm(String line, String date, String endDate,
2321 String lpName, String code, String type, String changType) { 2321 String lpName, String code, String type, String changType) {
2322 2322
2323 -// var types = {'DFTZ': '待发调整', 'FCXXWT':'发车信息微调', 'JHLB': '计划烂班', 'CXLB': '撤销烂班',  
2324 -// 'CXZX': '撤销执行', 'CXSF': '撤销实发', 'SFTZ': '实发调整', 'TZRC': '调整人车'};  
2325 Map<String, Object> map = new HashMap<String, Object>(); 2323 Map<String, Object> map = new HashMap<String, Object>();
2326 - map.put("DFTZ", "待发调整");  
2327 - map.put("FCXXWT", "发车信息微调");  
2328 - map.put("JHLB", "计划烂班");  
2329 - map.put("CXLB", "撤销烂班");  
2330 - map.put("CXZX", "撤销执行");  
2331 - map.put("CXSF", "撤销实发");  
2332 - map.put("SFTZ", "实发调整");  
2333 - map.put("TZRC", "调整人车"); 2324 + map.put("DFTZ", "$$$$$${txt-3025}");
  2325 + map.put("FCXXWT", "$$$$$${txt-1677}");
  2326 + map.put("JHLB", "$$$$$${txt-4436}");
  2327 + map.put("CXLB", "$$$$$${txt-3027}");
  2328 + map.put("CXZX", "$$$$$${txt-3286}");
  2329 + map.put("CXSF", "$$$$$${txt-3025}");
  2330 + map.put("SFTZ", "$$$$$${txt-3023}");
  2331 + map.put("TZRC", "$$$$$${txt-3037}");
2334 2332
2335 SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm"); 2333 SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm");
2336 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); 2334 SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -2443,7 +2441,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2443,7 +2441,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2443 listI.add(tempList.iterator()); 2441 listI.add(tempList.iterator());
2444 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 2442 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
2445 ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls", 2443 ee.excelReplace(listI, new Object[]{m}, path + "mould/correctForm.xls",
2446 - path + "export/" + dateTime + "-" + lineName + "-修正报表.xls"); 2444 + path + "export/" + dateTime + "-" + lineName + "-$$$$$${txt-2445}.xls");
2447 } catch (Exception e) { 2445 } catch (Exception e) {
2448 // TODO: handle exception 2446 // TODO: handle exception
2449 e.printStackTrace(); 2447 e.printStackTrace();
@@ -2528,7 +2526,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2528,7 +2526,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2528 s.setFcsjActual(""); 2526 s.setFcsjActual("");
2529 s.setZdsjActual(""); 2527 s.setZdsjActual("");
2530 s.setJhlc(0.0); 2528 s.setJhlc(0.0);
2531 - remarks += "(烂班)"; 2529 + remarks += "($$$$$${txt-3847})";
2532 s.setRemarks(remarks); 2530 s.setRemarks(remarks);
2533 } 2531 }
2534 2532
@@ -2641,7 +2639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2641,7 +2639,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2641 s.setFcsjActual(""); 2639 s.setFcsjActual("");
2642 s.setZdsjActual(""); 2640 s.setZdsjActual("");
2643 s.setJhlc(0.0); 2641 s.setJhlc(0.0);
2644 - remarks += "(烂班)"; 2642 + remarks += "($$$$$${txt-3847})";
2645 s.setRemarks(remarks); 2643 s.setRemarks(remarks);
2646 } 2644 }
2647 } 2645 }
@@ -2718,21 +2716,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2718,21 +2716,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2718 map.put("sjgl", Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists))); 2716 map.put("sjgl", Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists)));
2719 double lbgl = culateService.culateLbgl(list_s); 2717 double lbgl = culateService.culateLbgl(list_s);
2720 map.put("ssgl", lbgl); 2718 map.put("ssgl", lbgl);
2721 - map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));  
2722 - map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));  
2723 - map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));  
2724 - map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));  
2725 - map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));  
2726 - map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));  
2727 - map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));  
2728 - map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));  
2729 - map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));  
2730 - map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));  
2731 - map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));  
2732 - double ssgl_pc = culateService.culateCJLC(list_s, "配车");  
2733 - double ssgl_by = culateService.culateCJLC(list_s, "保养");  
2734 - double ssgl_cj = culateService.culateCJLC(list_s, "抽减");  
2735 - double ssgl_qt = culateService.culateCJLC(list_s, "其他"); 2719 + map.put("ssgl_lz", culateService.culateCJLC(list_s, "$$$$$${txt-3961}"));
  2720 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "$$$$$${txt-3963}"));
  2721 + map.put("ssgl_gz", culateService.culateCJLC(list_s, "$$$$$${txt-3840}"));
  2722 + map.put("ssgl_jf", culateService.culateCJLC(list_s, "$$$$$${txt-3838}"));
  2723 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "$$$$$${txt-3837}"));
  2724 + map.put("ssgl_qr", culateService.culateCJLC(list_s, "$$$$$${txt-3957}"));
  2725 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "$$$$$${txt-3958}"));
  2726 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "$$$$$${txt-3962}"));
  2727 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "$$$$$${txt-3960}"));
  2728 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "$$$$$${txt-3956}"));
  2729 + map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "$$$$$${txt-2765}"));
  2730 + double ssgl_pc = culateService.culateCJLC(list_s, "$$$$$${txt-4026}");
  2731 + double ssgl_by = culateService.culateCJLC(list_s, "$$$$$${txt-4102}");
  2732 + double ssgl_cj = culateService.culateCJLC(list_s, "$$$$$${txt-3876}");
  2733 + double ssgl_qt = culateService.culateCJLC(list_s, "$$$$$${txt-4197}");
2736 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 2734 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
2737 map.put("ssbc", culateService.culateLbbc(list_s)); 2735 map.put("ssbc", culateService.culateLbbc(list_s));
2738 double ljgl = culateService.culateLjgl(lists); 2736 double ljgl = culateService.culateLjgl(lists);
@@ -2826,21 +2824,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2826,21 +2824,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2826 map.put("sjgl", Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists))); 2824 map.put("sjgl", Arith.add(culateService.culateSjgl(lists), culateService.culateLjgl(lists)));
2827 double lbgl = culateService.culateLbgl(list_s); 2825 double lbgl = culateService.culateLbgl(list_s);
2828 map.put("ssgl", lbgl); 2826 map.put("ssgl", lbgl);
2829 - map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));  
2830 - map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));  
2831 - map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));  
2832 - map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));  
2833 - map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));  
2834 - map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));  
2835 - map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));  
2836 - map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));  
2837 - map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));  
2838 - map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));  
2839 - map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));  
2840 - double ssgl_pc = culateService.culateCJLC(list_s, "配车");  
2841 - double ssgl_by = culateService.culateCJLC(list_s, "保养");  
2842 - double ssgl_cj = culateService.culateCJLC(list_s, "抽减");  
2843 - double ssgl_qt = culateService.culateCJLC(list_s, "其他"); 2827 + map.put("ssgl_lz", culateService.culateCJLC(list_s, "$$$$$${txt-3961}"));
  2828 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "$$$$$${txt-3963}"));
  2829 + map.put("ssgl_gz", culateService.culateCJLC(list_s, "$$$$$${txt-3840}"));
  2830 + map.put("ssgl_jf", culateService.culateCJLC(list_s, "$$$$$${txt-3838}"));
  2831 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "$$$$$${txt-3837}"));
  2832 + map.put("ssgl_qr", culateService.culateCJLC(list_s, "$$$$$${txt-3957}"));
  2833 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "$$$$$${txt-3958}"));
  2834 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "$$$$$${txt-3962}"));
  2835 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "$$$$$${txt-3960}"));
  2836 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "$$$$$${txt-3956}"));
  2837 + map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "$$$$$${txt-2765}"));
  2838 + double ssgl_pc = culateService.culateCJLC(list_s, "$$$$$${txt-4026}");
  2839 + double ssgl_by = culateService.culateCJLC(list_s, "$$$$$${txt-4102}");
  2840 + double ssgl_cj = culateService.culateCJLC(list_s, "$$$$$${txt-3876}");
  2841 + double ssgl_qt = culateService.culateCJLC(list_s, "$$$$$${txt-4197}");
2844 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 2842 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
2845 map.put("ssbc", culateService.culateLbbc(list_s)); 2843 map.put("ssbc", culateService.culateLbbc(list_s));
2846 double ljgl = culateService.culateLjgl(lists); 2844 double ljgl = culateService.culateLjgl(lists);
@@ -2926,21 +2924,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -2926,21 +2924,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2926 map.put("zt", 1); 2924 map.put("zt", 1);
2927 } 2925 }
2928 2926
2929 - map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));  
2930 - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));  
2931 - map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));  
2932 - map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));  
2933 - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));  
2934 - map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));  
2935 - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));  
2936 - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));  
2937 - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));  
2938 - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));  
2939 - map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));  
2940 - double ssgl_pc = culateService.culateCJLC(list, "配车");  
2941 - double ssgl_by = culateService.culateCJLC(list, "保养");  
2942 - double ssgl_cj = culateService.culateCJLC(list, "抽减");  
2943 - double ssgl_qt = culateService.culateCJLC(list, "其他"); 2927 + map.put("ssgl_lz", culateService.culateCJLC(list, "$$$$$${txt-3961}"));
  2928 + map.put("ssgl_dm", culateService.culateCJLC(list, "$$$$$${txt-3963}"));
  2929 + map.put("ssgl_gz", culateService.culateCJLC(list, "$$$$$${txt-3840}"));
  2930 + map.put("ssgl_jf", culateService.culateCJLC(list, "$$$$$${txt-3838}"));
  2931 + map.put("ssgl_zs", culateService.culateCJLC(list, "$$$$$${txt-3837}"));
  2932 + map.put("ssgl_qr", culateService.culateCJLC(list, "$$$$$${txt-3957}"));
  2933 + map.put("ssgl_qc", culateService.culateCJLC(list, "$$$$$${txt-3958}"));
  2934 + map.put("ssgl_kx", culateService.culateCJLC(list, "$$$$$${txt-3962}"));
  2935 + map.put("ssgl_qh", culateService.culateCJLC(list, "$$$$$${txt-3960}"));
  2936 + map.put("ssgl_yw", culateService.culateCJLC(list, "$$$$$${txt-3956}"));
  2937 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "$$$$$${txt-2765}"));
  2938 + double ssgl_pc = culateService.culateCJLC(list, "$$$$$${txt-4026}");
  2939 + double ssgl_by = culateService.culateCJLC(list, "$$$$$${txt-4102}");
  2940 + double ssgl_cj = culateService.culateCJLC(list, "$$$$$${txt-3876}");
  2941 + double ssgl_qt = culateService.culateCJLC(list, "$$$$$${txt-4197}");
2944 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 2942 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
2945 map.put("ssbc", culateService.culateLbbc(list)); 2943 map.put("ssbc", culateService.culateLbbc(list));
2946 map.put("ljgl", ljgl); 2944 map.put("ljgl", ljgl);
@@ -3014,7 +3012,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3014,7 +3012,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3014 temp.put("gsName", "杨高");temp.put("fgsName", "周浦分");temp.put("key", "05_6"); 3012 temp.put("gsName", "杨高");temp.put("fgsName", "周浦分");temp.put("key", "05_6");
3015 resList.add(temp);keyMap.put("05_6", temp); 3013 resList.add(temp);keyMap.put("05_6", temp);
3016 temp = new HashMap<String, Object>(); 3014 temp = new HashMap<String, Object>();
3017 - temp.put("gsName", "杨高");temp.put("fgsName", "小计");temp.put("key", "05_sum"); 3015 + temp.put("gsName", "杨高");temp.put("fgsName", "$$$$$${txt-3918}");temp.put("key", "05_sum");
3018 resList.add(temp);keyMap.put("05_sum", temp); 3016 resList.add(temp);keyMap.put("05_sum", temp);
3019 3017
3020 temp = new HashMap<String, Object>(); 3018 temp = new HashMap<String, Object>();
@@ -3030,7 +3028,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3030,7 +3028,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3030 temp.put("gsName", "上南");temp.put("fgsName", "六分");temp.put("key", "55_3"); 3028 temp.put("gsName", "上南");temp.put("fgsName", "六分");temp.put("key", "55_3");
3031 resList.add(temp);keyMap.put("55_3", temp); 3029 resList.add(temp);keyMap.put("55_3", temp);
3032 temp = new HashMap<String, Object>(); 3030 temp = new HashMap<String, Object>();
3033 - temp.put("gsName", "上南");temp.put("fgsName", "小计");temp.put("key", "55_sum"); 3031 + temp.put("gsName", "上南");temp.put("fgsName", "$$$$$${txt-3918}");temp.put("key", "55_sum");
3034 resList.add(temp);keyMap.put("55_sum", temp); 3032 resList.add(temp);keyMap.put("55_sum", temp);
3035 3033
3036 temp = new HashMap<String, Object>(); 3034 temp = new HashMap<String, Object>();
@@ -3046,7 +3044,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3046,7 +3044,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3046 temp.put("gsName", "金高");temp.put("fgsName", "四分");temp.put("key", "22_1"); 3044 temp.put("gsName", "金高");temp.put("fgsName", "四分");temp.put("key", "22_1");
3047 resList.add(temp);keyMap.put("22_1", temp); 3045 resList.add(temp);keyMap.put("22_1", temp);
3048 temp = new HashMap<String, Object>(); 3046 temp = new HashMap<String, Object>();
3049 - temp.put("gsName", "金高");temp.put("fgsName", "小计");temp.put("key", "22_sum"); 3047 + temp.put("gsName", "金高");temp.put("fgsName", "$$$$$${txt-3918}");temp.put("key", "22_sum");
3050 resList.add(temp);keyMap.put("22_sum", temp); 3048 resList.add(temp);keyMap.put("22_sum", temp);
3051 3049
3052 temp = new HashMap<String, Object>(); 3050 temp = new HashMap<String, Object>();
@@ -3062,7 +3060,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3062,7 +3060,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3062 temp.put("gsName", "南汇");temp.put("fgsName", "六分");temp.put("key", "26_6"); 3060 temp.put("gsName", "南汇");temp.put("fgsName", "六分");temp.put("key", "26_6");
3063 resList.add(temp);keyMap.put("26_6", temp); 3061 resList.add(temp);keyMap.put("26_6", temp);
3064 temp = new HashMap<String, Object>(); 3062 temp = new HashMap<String, Object>();
3065 - temp.put("gsName", "南汇");temp.put("fgsName", "小计");temp.put("key", "26_sum"); 3063 + temp.put("gsName", "南汇");temp.put("fgsName", "$$$$$${txt-3918}");temp.put("key", "26_sum");
3066 resList.add(temp);keyMap.put("26_sum", temp); 3064 resList.add(temp);keyMap.put("26_sum", temp);
3067 3065
3068 temp = new HashMap<String, Object>(); 3066 temp = new HashMap<String, Object>();
@@ -3203,14 +3201,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3203,14 +3201,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3203 m.put("date", date); 3201 m.put("date", date);
3204 dateTime = sdfSimple.format(sdfMonth.parse(date)); 3202 dateTime = sdfSimple.format(sdfMonth.parse(date));
3205 } else { 3203 } else {
3206 - m.put("date", date + "至" + date2); 3204 + m.put("date", date + "-" + date2);
3207 dateTime = sdfSimple.format(sdfMonth.parse(date)) 3205 dateTime = sdfSimple.format(sdfMonth.parse(date))
3208 + "-" + sdfSimple.format(sdfMonth.parse(date2)); 3206 + "-" + sdfSimple.format(sdfMonth.parse(date2));
3209 } 3207 }
3210 listI.add(resList.iterator()); 3208 listI.add(resList.iterator());
3211 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 3209 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
3212 ee.excelReplace(listI, new Object[]{m}, path + "mould/dispatchDailySum.xls", 3210 ee.excelReplace(listI, new Object[]{m}, path + "mould/dispatchDailySum.xls",
3213 - path + "export/" + dateTime + "-调度日报汇总表.xls"); 3211 + path + "export/" + dateTime + "-$$$$$${txt-998}.xls");
3214 } catch (Exception e) { 3212 } catch (Exception e) {
3215 // TODO: handle exception 3213 // TODO: handle exception
3216 //e.printStackTrace(); 3214 //e.printStackTrace();
@@ -3326,7 +3324,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3326,7 +3324,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3326 3324
3327 Collections.sort(lMap, new AccountXlbm()); 3325 Collections.sort(lMap, new AccountXlbm());
3328 Map<String, Object> map = new HashMap<String, Object>(); 3326 Map<String, Object> map = new HashMap<String, Object>();
3329 - map.put("xlName", "合计"); 3327 + map.put("xlName", "$$$$$${txt-3916}");
3330 map.put("fgsName", ""); 3328 map.put("fgsName", "");
3331 map.put("gsName", ""); 3329 map.put("gsName", "");
3332 double jhyygl = culateService.culateJhgl(list);//计划营运公里 3330 double jhyygl = culateService.culateJhgl(list);//计划营运公里
@@ -3356,21 +3354,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3356,21 +3354,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3356 } else { 3354 } else {
3357 map.put("zt", 1); 3355 map.put("zt", 1);
3358 } 3356 }
3359 - map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));  
3360 - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));  
3361 - map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));  
3362 - map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));  
3363 - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));  
3364 - map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));  
3365 - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));  
3366 - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));  
3367 - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));  
3368 - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));  
3369 - map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));  
3370 - double ssgl_pc = culateService.culateCJLC(list, "配车");  
3371 - double ssgl_by = culateService.culateCJLC(list, "保养");  
3372 - double ssgl_cj = culateService.culateCJLC(list, "抽减");  
3373 - double ssgl_qt = culateService.culateCJLC(list, "其他"); 3357 + map.put("ssgl_lz", culateService.culateCJLC(list, "$$$$$${txt-3961}"));
  3358 + map.put("ssgl_dm", culateService.culateCJLC(list, "$$$$$${txt-3963}"));
  3359 + map.put("ssgl_gz", culateService.culateCJLC(list, "$$$$$${txt-3840}"));
  3360 + map.put("ssgl_jf", culateService.culateCJLC(list, "$$$$$${txt-3838}"));
  3361 + map.put("ssgl_zs", culateService.culateCJLC(list, "$$$$$${txt-3837}"));
  3362 + map.put("ssgl_qr", culateService.culateCJLC(list, "$$$$$${txt-3957}"));
  3363 + map.put("ssgl_qc", culateService.culateCJLC(list, "$$$$$${txt-3958}"));
  3364 + map.put("ssgl_kx", culateService.culateCJLC(list, "$$$$$${txt-3962}"));
  3365 + map.put("ssgl_qh", culateService.culateCJLC(list, "$$$$$${txt-3960}"));
  3366 + map.put("ssgl_yw", culateService.culateCJLC(list, "$$$$$${txt-3956}"));
  3367 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "$$$$$${txt-2765}"));
  3368 + double ssgl_pc = culateService.culateCJLC(list, "$$$$$${txt-4026}");
  3369 + double ssgl_by = culateService.culateCJLC(list, "$$$$$${txt-4102}");
  3370 + double ssgl_cj = culateService.culateCJLC(list, "$$$$$${txt-3876}");
  3371 + double ssgl_qt = culateService.culateCJLC(list, "$$$$$${txt-4197}");
3374 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 3372 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
3375 3373
3376 map.put("ssbc", culateService.culateLbbc(list)); 3374 map.put("ssbc", culateService.culateLbbc(list));
@@ -3427,7 +3425,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3427,7 +3425,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3427 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 3425 sdfSimple = new SimpleDateFormat("yyyyMMdd");
3428 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 3426 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
3429 Map<String, Object> m = new HashMap<String, Object>(); 3427 Map<String, Object> m = new HashMap<String, Object>();
3430 - m.put("date", date + "至" + date2); 3428 + m.put("date", date + "-" + date2);
3431 ReportUtils ee = new ReportUtils(); 3429 ReportUtils ee = new ReportUtils();
3432 try { 3430 try {
3433 String dateTime = ""; 3431 String dateTime = "";
@@ -3440,7 +3438,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3440,7 +3438,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3440 listI.add(lMap.iterator()); 3438 listI.add(lMap.iterator());
3441 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 3439 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
3442 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls", 3440 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_2.xls",
3443 - path + "export/" + dateTime + "-" + xlName + "-统计日报.xls"); 3441 + path + "export/" + dateTime + "-" + xlName + "-$$$$$${txt-2447}.xls");
3444 } catch (Exception e) { 3442 } catch (Exception e) {
3445 // TODO: handle exception 3443 // TODO: handle exception
3446 //e.printStackTrace(); 3444 //e.printStackTrace();
@@ -3469,7 +3467,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3469,7 +3467,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3469 temp = tempMap.get(gsName); 3467 temp = tempMap.get(gsName);
3470 } else { 3468 } else {
3471 temp.put("gsName", gsName); 3469 temp.put("gsName", gsName);
3472 - temp.put("fgsName", "小计"); 3470 + temp.put("fgsName", "$$$$$${txt-3918}");
3473 temp.put("xlName", ""); 3471 temp.put("xlName", "");
3474 tempList.add(temp); 3472 tempList.add(temp);
3475 tempMap.put(gsName, temp); 3473 tempMap.put(gsName, temp);
@@ -3490,7 +3488,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3490,7 +3488,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3490 sdfSimple = new SimpleDateFormat("yyyyMMdd"); 3488 sdfSimple = new SimpleDateFormat("yyyyMMdd");
3491 List<Iterator<?>> listI = new ArrayList<Iterator<?>>(); 3489 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
3492 Map<String, Object> m = new HashMap<String, Object>(); 3490 Map<String, Object> m = new HashMap<String, Object>();
3493 - m.put("date", date + "至" + date2); 3491 + m.put("date", date + "-" + date2);
3494 ReportUtils ee = new ReportUtils(); 3492 ReportUtils ee = new ReportUtils();
3495 try { 3493 try {
3496 String dateTime = ""; 3494 String dateTime = "";
@@ -3503,7 +3501,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3503,7 +3501,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3503 listI.add(lMap.iterator()); 3501 listI.add(lMap.iterator());
3504 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 3502 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
3505 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls", 3503 ee.excelReplace(listI, new Object[]{m}, path + "mould/statisticsDaily_4.xls",
3506 - path + "export/" + dateTime + "-全部公司-统计日报.xls"); 3504 + path + "export/" + dateTime + "-$$$$$${txt-2416}-$$$$$${txt-2447}.xls");
3507 } catch (Exception e) { 3505 } catch (Exception e) {
3508 // TODO: handle exception 3506 // TODO: handle exception
3509 //e.printStackTrace(); 3507 //e.printStackTrace();
@@ -3616,7 +3614,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3616,7 +3614,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3616 Collections.sort(lMap, new AccountXlbm()); 3614 Collections.sort(lMap, new AccountXlbm());
3617 Map<String, Object> map = new HashMap<String, Object>(); 3615 Map<String, Object> map = new HashMap<String, Object>();
3618 map.put("xlBm", "hj"); 3616 map.put("xlBm", "hj");
3619 - map.put("xlName", "合计"); 3617 + map.put("xlName", "$$$$$${txt-3916}");
3620 map.put("fgsBm", ""); 3618 map.put("fgsBm", "");
3621 map.put("fgsName", ""); 3619 map.put("fgsName", "");
3622 map.put("gsBm", ""); 3620 map.put("gsBm", "");
@@ -3647,21 +3645,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3647,21 +3645,21 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3647 } else { 3645 } else {
3648 map.put("zt", 1); 3646 map.put("zt", 1);
3649 } 3647 }
3650 - map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));  
3651 - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));  
3652 - map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));  
3653 - map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));  
3654 - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));  
3655 - map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));  
3656 - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));  
3657 - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));  
3658 - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));  
3659 - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));  
3660 - map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));  
3661 - double ssgl_pc = culateService.culateCJLC(list, "配车");  
3662 - double ssgl_by = culateService.culateCJLC(list, "保养");  
3663 - double ssgl_cj = culateService.culateCJLC(list, "抽减");  
3664 - double ssgl_qt = culateService.culateCJLC(list, "其他"); 3648 + map.put("ssgl_lz", culateService.culateCJLC(list, "$$$$$${txt-3961}"));
  3649 + map.put("ssgl_dm", culateService.culateCJLC(list, "$$$$$${txt-3963}"));
  3650 + map.put("ssgl_gz", culateService.culateCJLC(list, "$$$$$${txt-3840}"));
  3651 + map.put("ssgl_jf", culateService.culateCJLC(list, "$$$$$${txt-3838}"));
  3652 + map.put("ssgl_zs", culateService.culateCJLC(list, "$$$$$${txt-3837}"));
  3653 + map.put("ssgl_qr", culateService.culateCJLC(list, "$$$$$${txt-3957}"));
  3654 + map.put("ssgl_qc", culateService.culateCJLC(list, "$$$$$${txt-3958}"));
  3655 + map.put("ssgl_kx", culateService.culateCJLC(list, "$$$$$${txt-3962}"));
  3656 + map.put("ssgl_qh", culateService.culateCJLC(list, "$$$$$${txt-3960}"));
  3657 + map.put("ssgl_yw", culateService.culateCJLC(list, "$$$$$${txt-3956}"));
  3658 + map.put("ssgl_ljpm", culateService.culateCJLC(list, "$$$$$${txt-2765}"));
  3659 + double ssgl_pc = culateService.culateCJLC(list, "$$$$$${txt-4026}");
  3660 + double ssgl_by = culateService.culateCJLC(list, "$$$$$${txt-4102}");
  3661 + double ssgl_cj = culateService.culateCJLC(list, "$$$$$${txt-3876}");
  3662 + double ssgl_qt = culateService.culateCJLC(list, "$$$$$${txt-4197}");
3665 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt))); 3663 map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
3666 3664
3667 map.put("ssbc", culateService.culateLbbc(list)); 3665 map.put("ssbc", culateService.culateLbbc(list));
@@ -3734,34 +3732,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -3734,34 +3732,34 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3734 sjgl += childTaskPlan.getMileage(); 3732 sjgl += childTaskPlan.getMileage();
3735 } else { 3733 } else {
3736 ssgl += childTaskPlan.getMileage(); 3734 ssgl += childTaskPlan.getMileage();
3737 - if (childTaskPlan.getDestroyReason().equals("路阻")) { 3735 + if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3961}")) {
3738 ssgl_lz += childTaskPlan.getMileage(); 3736 ssgl_lz += childTaskPlan.getMileage();
3739 - } else if (childTaskPlan.getDestroyReason().equals("吊慢")) { 3737 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3963}")) {
3740 ssgl_dm += childTaskPlan.getMileage(); 3738 ssgl_dm += childTaskPlan.getMileage();
3741 - } else if (childTaskPlan.getDestroyReason().equals("故障")) { 3739 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3840}")) {
3742 ssgl_gz += childTaskPlan.getMileage(); 3740 ssgl_gz += childTaskPlan.getMileage();
3743 - } else if (childTaskPlan.getDestroyReason().equals("纠纷")) { 3741 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3838}")) {
3744 ssgl_jf += childTaskPlan.getMileage(); 3742 ssgl_jf += childTaskPlan.getMileage();
3745 - } else if (childTaskPlan.getDestroyReason().equals("肇事")) { 3743 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3837}")) {
3746 ssgl_zs += childTaskPlan.getMileage(); 3744 ssgl_zs += childTaskPlan.getMileage();
3747 - } else if (childTaskPlan.getDestroyReason().equals("缺人")) { 3745 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3957}")) {
3748 ssgl_qr += childTaskPlan.getMileage(); 3746 ssgl_qr += childTaskPlan.getMileage();
3749 - } else if (childTaskPlan.getDestroyReason().equals("缺车")) { 3747 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3958}")) {
3750 ssgl_qc += childTaskPlan.getMileage(); 3748 ssgl_qc += childTaskPlan.getMileage();
3751 - } else if (childTaskPlan.getDestroyReason().equals("客稀")) { 3749 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3962}")) {
3752 ssgl_kx += childTaskPlan.getMileage(); 3750 ssgl_kx += childTaskPlan.getMileage();
3753 - } else if (childTaskPlan.getDestroyReason().equals("气候")) { 3751 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3960}")) {
3754 ssgl_qh += childTaskPlan.getMileage(); 3752 ssgl_qh += childTaskPlan.getMileage();
3755 - } else if (childTaskPlan.getDestroyReason().equals("援外")) { 3753 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-3956}")) {
3756 ssgl_yw += childTaskPlan.getMileage(); 3754 ssgl_yw += childTaskPlan.getMileage();
3757 - } else if (childTaskPlan.getDestroyReason().equals("路救抛锚")) { 3755 + } else if (childTaskPlan.getDestroyReason().equals("$$$$$${txt-2765}")) {
3758 ssgl_ljpm += childTaskPlan.getMileage(); 3756 ssgl_ljpm += childTaskPlan.getMileage();
3759 } else { 3757 } else {
3760 ssgl_other += childTaskPlan.getMileage(); 3758 ssgl_other += childTaskPlan.getMileage();
3761 } 3759 }
3762 } 3760 }
3763 //临加公里 3761 //临加公里
3764 - if (childTaskPlan.getType1().equals("临加")) { 3762 + if (childTaskPlan.getType1().equals("$$$$$${txt-3964}")) {
3765 ljgl += childTaskPlan.getMileage(); 3763 ljgl += childTaskPlan.getMileage();
3766 } 3764 }
3767 } 3765 }
@@ -4414,7 +4412,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4414,7 +4412,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4414 4412
4415 if (cpc.getClZbh() != null) { 4413 if (cpc.getClZbh() != null) {
4416 if (!carExist(sch.getGsBm(), cpc.getClZbh())) { 4414 if (!carExist(sch.getGsBm(), cpc.getClZbh())) {
4417 - rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！"); 4415 + rs.put("msg", "i18n('$$$$$${txt-4337}', [cpc.getClZbh()])");
4418 rs.put("status", ResponseCode.ERROR); 4416 rs.put("status", ResponseCode.ERROR);
4419 return rs; 4417 return rs;
4420 } else if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(cpc.getClZbh()))) { 4418 } else if (!sch.getGsBm().equals(BasicData.nbbm2CompanyCodeMap.get(cpc.getClZbh()))) {
@@ -4429,7 +4427,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4429,7 +4427,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4429 jGh = cpc.getJsy().split("/")[0]; 4427 jGh = cpc.getJsy().split("/")[0];
4430 }catch (Exception e){ 4428 }catch (Exception e){
4431 logger.error("", e); 4429 logger.error("", e);
4432 - rs.put("msg", "驾驶员参数异常！!"); 4430 + rs.put("msg", "$$$$$${txt-4358}");
4433 rs.put("status", ResponseCode.ERROR); 4431 rs.put("status", ResponseCode.ERROR);
4434 return rs; 4432 return rs;
4435 } 4433 }
@@ -4681,7 +4679,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4681,7 +4679,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4681 rs.put("msg", "车辆 " + sch.getClZbh() + " 不存在！"); 4679 rs.put("msg", "车辆 " + sch.getClZbh() + " 不存在！");
4682 return rs; 4680 return rs;
4683 } else { 4681 } else {
4684 - aflog.log("换车", oldSch.getClZbh(), sch.getClZbh()); 4682 + aflog.log("$$$$$${txt-4116}", oldSch.getClZbh(), sch.getClZbh());
4685 oldSch.setClZbh(sch.getClZbh()); 4683 oldSch.setClZbh(sch.getClZbh());
4686 } 4684 }
4687 } 4685 }
@@ -4713,14 +4711,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -4713,14 +4711,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
4713 boolean dest2 = sch.getStatus() == -1; 4711 boolean dest2 = sch.getStatus() == -1;
4714 if (!dest1 && dest2) { 4712 if (!dest1 && dest2) {
4715 oldSch.destroy(); 4713 oldSch.destroy();
4716 - aflog.log("烂班"); 4714 + aflog.log("$$$$$${txt-3847}");
4717 } else if (dest1 && !dest2) { 4715 } else if (dest1 && !dest2) {
4718 //撤销烂班 4716 //撤销烂班
4719 oldSch.setJhlc(oldSch.getJhlcOrig()); 4717 oldSch.setJhlc(oldSch.getJhlcOrig());
4720 oldSch.setStatus(0); 4718 oldSch.setStatus(0);
4721 oldSch.calcStatus(); 4719 oldSch.calcStatus();
4722 oldSch.setAdjustExps(null); 4720 oldSch.setAdjustExps(null);
4723 - aflog.log("撤销烂班"); 4721 + aflog.log("$$$$$${txt-3027}");
4724 } 4722 }
4725 4723
4726 oldSch.setAdjustExps(sch.getAdjustExps()); 4724 oldSch.setAdjustExps(sch.getAdjustExps());
@@ -5042,7 +5040,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5042,7 +5040,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5042 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 5040 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
5043 list.add(listMap.iterator()); 5041 list.add(listMap.iterator());
5044 ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_qingpu.xls", 5042 ee.excelReplace(list, new Object[]{scheduleRealInfos.get(0), map}, path + "mould/waybill_qingpu.xls",
5045 - path + "export/" + date + "-" + clZbh + "-行车路单.xls"); 5043 + path + "export/" + date + "-" + clZbh + "-$$$$$${txt-2459}.xls");
5046 5044
5047 return scheduleRealInfos; 5045 return scheduleRealInfos;
5048 } 5046 }
@@ -5241,7 +5239,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5241,7 +5239,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5241 map.put("hn", hq); 5239 map.put("hn", hq);
5242 map.put("jql", jql); 5240 map.put("jql", jql);
5243 5241
5244 - map.put("rylx", "加注类别:"+rylx); 5242 + map.put("rylx", "$$$$$${txt-2768}:"+rylx);
5245 map.put("jzl", jzl); 5243 map.put("jzl", jzl);
5246 map.put("yh", yh); 5244 map.put("yh", yh);
5247 map.put("ccyl", ccyl); 5245 map.put("ccyl", ccyl);
@@ -5513,7 +5511,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5513,7 +5511,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5513 int b = Integer.parseInt(fcsjs[0]) * 60 + Integer.parseInt(fcsjs[1]); 5511 int b = Integer.parseInt(fcsjs[0]) * 60 + Integer.parseInt(fcsjs[1]);
5514 map.put("cz" + bcs, b - a); 5512 map.put("cz" + bcs, b - a);
5515 } else { 5513 } else {
5516 - map.put("cz" + bcs, "无"); 5514 + map.put("cz" + bcs, "$$$$$${txt-4226}");
5517 } 5515 }
5518 map.put("lp", scheduleRealInfo.getLpName()); 5516 map.put("lp", scheduleRealInfo.getLpName());
5519 map.put("dd" + bcs, scheduleRealInfo.getZdsjActual()); 5517 map.put("dd" + bcs, scheduleRealInfo.getZdsjActual());
@@ -5556,7 +5554,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5556,7 +5554,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5556 int b = Integer.parseInt(fcsjs[0]) * 60 + Integer.parseInt(fcsjs[1]); 5554 int b = Integer.parseInt(fcsjs[0]) * 60 + Integer.parseInt(fcsjs[1]);
5557 map.put("cz" + bcs, b - a); 5555 map.put("cz" + bcs, b - a);
5558 } else { 5556 } else {
5559 - map.put("cz" + bcs, "无"); 5557 + map.put("cz" + bcs, "$$$$$${txt-4226}");
5560 } 5558 }
5561 5559
5562 5560
@@ -5831,7 +5829,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5831,7 +5829,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5831 sourcePath =path + "mould/scheduleDaily_df.xls"; 5829 sourcePath =path + "mould/scheduleDaily_df.xls";
5832 } 5830 }
5833 ee.excelReplace(listI, new Object[]{nMap}, sourcePath, 5831 ee.excelReplace(listI, new Object[]{nMap}, sourcePath,
5834 - path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + lineName + "调度日报.xls"); 5832 + path + "export/" + sdfSimple.format(sdfMonth.parse(date)) + lineName + "$$$$$${txt-2449}.xls");
5835 } catch (Exception e) { 5833 } catch (Exception e) {
5836 // TODO: handle exception 5834 // TODO: handle exception
5837 e.printStackTrace(); 5835 e.printStackTrace();
@@ -5946,7 +5944,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -5946,7 +5944,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
5946 s.setFcsjActual(""); 5944 s.setFcsjActual("");
5947 s.setZdsjActual(""); 5945 s.setZdsjActual("");
5948 s.setJhlc(0.0); 5946 s.setJhlc(0.0);
5949 - remarks += "(烂班)"; 5947 + remarks += "($$$$$${txt-3847})";
5950 s.setRemarks(remarks); 5948 s.setRemarks(remarks);
5951 } 5949 }
5952 5950
@@ -6034,7 +6032,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6034,7 +6032,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6034 } 6032 }
6035 map.put("sheetName", jName + "-" + clZbh + "-" + lpName); 6033 map.put("sheetName", jName + "-" + clZbh + "-" + lpName);
6036 ee.excelReplace(list, new Object[]{map}, path + "mould/" + xls, 6034 ee.excelReplace(list, new Object[]{map}, path + "mould/" + xls,
6037 - path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); 6035 + path + "export/" + date + "-" + jName + "-" + clZbh + "-" + lpName + "-$$$$$${txt-2459}.xls");
6038 } 6036 }
6039 6037
6040 @Override 6038 @Override
@@ -6050,7 +6048,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6050,7 +6048,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6050 File file = null; 6048 File file = null;
6051 try { 6049 try {
6052 while (true) { 6050 while (true) {
6053 - String fileUrl = path + "行车路单" + sdfSimple.format(sdfMonth.parse(date)); 6051 + String fileUrl = path + "$$$$$${txt-2459}" + sdfSimple.format(sdfMonth.parse(date));
6054 // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹 6052 // file = new File(fileUrl + (num == 0 ? "/" : "(" + num + ")/")); //新建文件夹
6055 file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件 6053 file = new File(fileUrl + (num == 0 ? ".xls" : "(" + num + ").xls")); //新建excel文件
6056 if (file.exists()) { //判断是否已存在重名 6054 if (file.exists()) { //判断是否已存在重名
@@ -6075,7 +6073,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6075,7 +6073,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6075 } 6073 }
6076 } 6074 }
6077 this.exportWaybill_pl(newList, date, jName, clZbh, lpName); 6075 this.exportWaybill_pl(newList, date, jName, clZbh, lpName);
6078 - File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-行车路单.xls"); 6076 + File temp = new File(path + date + "-" + jName + "-" + clZbh + "-" + lpName + "-$$$$$${txt-2459}.xls");
6079 String fileName = file.getName(); 6077 String fileName = file.getName();
6080 files.add(temp); 6078 files.add(temp);
6081 } 6079 }
@@ -6432,7 +6430,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6432,7 +6430,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6432 zrwgl = Arith.add(zrwgl, mr.getZrwgl()); 6430 zrwgl = Arith.add(zrwgl, mr.getZrwgl());
6433 } 6431 }
6434 Map<String, Object> resMap = new HashMap<String, Object>(); 6432 Map<String, Object> resMap = new HashMap<String, Object>();
6435 - resMap.put("xlName", "合计"); 6433 + resMap.put("xlName", "$$$$$${txt-3916}");
6436 resMap.put("sjyygl", sjyygl); 6434 resMap.put("sjyygl", sjyygl);
6437 resMap.put("sjksgl", sjksgl); 6435 resMap.put("sjksgl", sjksgl);
6438 resMap.put("zgl", zgl); 6436 resMap.put("zgl", zgl);
@@ -6526,7 +6524,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6526,7 +6524,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6526 zrwbc = zrwbc + sReport.getZrwbc(); 6524 zrwbc = zrwbc + sReport.getZrwbc();
6527 } 6525 }
6528 Map<String, Object> resMap = new HashMap<String, Object>(); 6526 Map<String, Object> resMap = new HashMap<String, Object>();
6529 - resMap.put("xlName", "合计"); 6527 + resMap.put("xlName", "$$$$$${txt-3916}");
6530 resMap.put("sjyybc", sjyybc); 6528 resMap.put("sjyybc", sjyybc);
6531 resMap.put("sjksbc", sjksbc); 6529 resMap.put("sjksbc", sjksbc);
6532 resMap.put("zbc", zbc); 6530 resMap.put("zbc", zbc);
@@ -6766,7 +6764,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf @@ -6766,7 +6764,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
6766 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/"; 6764 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
6767 ee.excelReplace(listI, new Object[]{m}, path + "mould/repairReport.xls", 6765 ee.excelReplace(listI, new Object[]{m}, path + "mould/repairReport.xls",
6768 path + "export/" + sdfSimple.format(sdfMonth.parse(date)) 6766 path + "export/" + sdfSimple.format(sdfMonth.parse(date))
6769 - + "-" + lineName + "-维修上报记录.xls"); 6767 + + "-" + lineName + "-$$$$$${txt-1344}.xls");
6770 } catch (Exception e) { 6768 } catch (Exception e) {
6771 // TODO: handle exception 6769 // TODO: handle exception
6772 e.printStackTrace(); 6770 e.printStackTrace();