潘钊 / bsth_control · Commits

Commit 0df3b5204d0e52538719848d69cb7249d1c8ab25

Authored by 王通
2 parents dc8782d2 7319efb4
build: skipped

Merge branch 'pudong' into jiading

Inline Side-by-side
Showing 9 changed files with 230 additions and 31 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
  View file @0df3b52
... ... @@ -27,6 +27,11 @@ public class RealMapController {
27 27 return realMapService.stationSpatialData(idx);
28 28 }
29 29  
  30 + @RequestMapping(value = "/stationVersionSpatialData")
  31 + public Map<String, Object> stationVersionSpatialData(@RequestParam String idx) {
  32 + return realMapService.stationVersionSpatialData(idx);
  33 + }
  34 +
30 35 /**
31 36 * 停车场
32 37 *
... ...
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @0df3b52
... ... @@ -828,8 +828,10 @@ public class DayOfSchedule {
828 828 Collections.sort(list, schFCSJComparator);
829 829 ScheduleRealInfo sch = null;
830 830 for (ScheduleRealInfo temp : list) {
831   - if (temp.getFcsjActual() == null)
832   - sch = temp;
  831 + if (temp.getFcsjActual() == null) {
  832 + sch = temp;
  833 + break;
  834 + }
833 835 }
834 836  
835 837 return sch;
... ...
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
  View file @0df3b52
... ... @@ -105,6 +105,7 @@ public class JdtestServiceImpl implements JdtestService {
105 105  
106 106 @Override
107 107 public List<Map<String, Object>> daily(Map<String, Object> map) {
  108 + List<Map<String, Object>> listAll=new ArrayList<>();
108 109 String xlbm="";
109 110 if(map.get("line")!=null){
110 111 xlbm=map.get("line").toString().trim();
... ... @@ -173,7 +174,6 @@ public class JdtestServiceImpl implements JdtestService {
173 174 lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
174 175 }else{
175 176 lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
176   -
177 177 }
178 178 double jzyl_z=0.0;
179 179 double czyl_z=0.0;
... ... @@ -185,6 +185,19 @@ public class JdtestServiceImpl implements JdtestService {
185 185 double sjzlc_z=0.0;
186 186 double kszlc_z=0.0;
187 187 double zlc_z=0.0;
  188 + double zlc_z2=0.0;
  189 +
  190 + double jzyl_line=0.0;
  191 + double czyl_line=0.0;
  192 + double jzl_line=0.0;
  193 + double yh_line=0.0;
  194 + int jhbc_line=0;
  195 + double jhlc_line=0.0;
  196 + int sjbc_line=0;
  197 + double sjzlc_line=0.0;
  198 + double kszlc_line=0.0;
  199 + double zlc_line=0.0;
  200 + double zlc_line2=0.0;
188 201 for(int i=0;i<list.size();i++){
189 202 sList =new ArrayList<ScheduleRealInfo>();
190 203 jList =new ArrayList<ScheduleRealInfo>();
... ... @@ -194,7 +207,6 @@ public class JdtestServiceImpl implements JdtestService {
194 207 double jzl=0.0;
195 208 double yh=0.0;
196 209 String rylx="";
197   -
198 210 if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
199 211 Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
200 212 jzyl=t.getJzyl();
... ... @@ -254,14 +266,133 @@ public class JdtestServiceImpl implements JdtestService {
254 266 double kszlc=Arith.add(ksgl, jccgl);
255 267 kszlc_z=Arith.add(kszlc, kszlc_z);
256 268 double zlc=Arith.add(sjzlc, kszlc);
  269 + double zlc2=Math.round(Math.round(zlc));
257 270 zlc_z=Arith.add(zlc, zlc_z);
  271 + zlc_z2=Arith.add(zlc2,zlc_z2);
258 272 m.put("jhbc", jhbc);
259 273 m.put("jhlc", jhlc);
260 274 m.put("sjbc", sjbc);
261 275 m.put("sjzlc",sjzlc);
262 276 m.put("kszlc", kszlc);
263 277 m.put("zlc", zlc);
264   -
  278 + m.put("zlc2", zlc2);
  279 + listAll.add(m);
  280 + //线路小计
  281 + if (i < list.size() - 1) {
  282 + if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
  283 + jzyl_line=Arith.add(jzyl_line, jzyl);
  284 + czyl_line=Arith.add(czyl_line, czyl);
  285 + jzl_line=Arith.add(jzl_line, jzl);
  286 + yh_line=Arith.add(yh_line, yh);
  287 + jhbc_line=jhbc_line+jhbc;
  288 + jhlc_line=Arith.add(jhlc_line,jhlc);
  289 + sjbc_line=sjbc_line+sjbc;
  290 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  291 + kszlc_line=Arith.add(kszlc_line,kszlc);
  292 + zlc_line=Arith.add(zlc_line, zlc);
  293 + zlc_line2=Arith.add(zlc_line2, zlc2);
  294 + } else {
  295 + jzyl_line=Arith.add(jzyl_line, jzyl);
  296 + czyl_line=Arith.add(czyl_line, czyl);
  297 + jzl_line=Arith.add(jzl_line, jzl);
  298 + yh_line=Arith.add(yh_line, yh);
  299 + jhbc_line=jhbc_line+jhbc;
  300 + jhlc_line=Arith.add(jhlc_line,jhlc);
  301 + sjbc_line=sjbc_line+sjbc;
  302 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  303 + kszlc_line=Arith.add(kszlc_line,kszlc);
  304 + zlc_line=Arith.add(zlc_line, zlc);
  305 + zlc_line2=Arith.add(zlc_line2, zlc2);
  306 +
  307 + Map<String, Object> mmm=new HashMap<>();
  308 + mmm.put("xlName", "小计");
  309 + mmm.put("lp", "");
  310 + mmm.put("jGh", "");
  311 + mmm.put("clZbh", "");
  312 + mmm.put("jName", "");
  313 + mmm.put("jhbc", jhbc_line);
  314 + mmm.put("jhlc", jhlc_line);
  315 + mmm.put("sjbc", sjbc_line);
  316 + mmm.put("sjzlc", sjzlc_line);
  317 + mmm.put("kszlc",kszlc_line);
  318 + mmm.put("zlc", zlc_line);
  319 + mmm.put("zlc2", zlc_line2);
  320 + mmm.put("jzyl",jzyl_line);
  321 + mmm.put("czyl",czyl_line);
  322 + mmm.put("jzl", jzl_line);
  323 + mmm.put("yh", yh_line);
  324 + mmm.put("rylx", "");
  325 + mmm.put("dh","");
  326 + listAll.add(mmm);
  327 + jzyl_line=0.0;
  328 + czyl_line=0.0;
  329 + jzl_line=0.0;
  330 + yh_line=0.0;
  331 + jhbc_line=0;
  332 + jhlc_line=0.0;
  333 + sjbc_line=0;
  334 + sjzlc_line=0.0;
  335 + kszlc_line=0.0;
  336 + zlc_line=0.0;
  337 + zlc_line2=0.0;
  338 + }
  339 + } else {
  340 + if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
  341 + jzyl_line=Arith.add(jzyl_line, jzyl);
  342 + czyl_line=Arith.add(czyl_line, czyl);
  343 + jzl_line=Arith.add(jzl_line, jzl);
  344 + yh_line=Arith.add(yh_line, yh);
  345 + jhbc_line=jhbc_line+jhbc;
  346 + jhlc_line=Arith.add(jhlc_line,jhlc);
  347 + sjbc_line=sjbc_line+sjbc;
  348 + sjzlc_line=Arith.add(sjzlc_line, sjzlc);
  349 + kszlc_line=Arith.add(kszlc_line,kszlc);
  350 + zlc_line=Arith.add(zlc_line, zlc);
  351 + zlc_line2=Arith.add(zlc_line2, zlc2);
  352 + Map<String, Object> mmm=new HashMap<>();
  353 + mmm.put("xlName", "小计");
  354 + mmm.put("lp", "");
  355 + mmm.put("jGh", "");
  356 + mmm.put("clZbh", "");
  357 + mmm.put("jName", "");
  358 + mmm.put("jhbc", jhbc_line);
  359 + mmm.put("jhlc", jhlc_line);
  360 + mmm.put("sjbc", sjbc_line);
  361 + mmm.put("sjzlc", sjzlc_line);
  362 + mmm.put("kszlc",kszlc_line);
  363 + mmm.put("zlc", zlc_line);
  364 + mmm.put("zlc2", zlc_line2);
  365 + mmm.put("jzyl",jzyl_line);
  366 + mmm.put("czyl",czyl_line);
  367 + mmm.put("jzl", jzl_line);
  368 + mmm.put("yh", yh_line);
  369 + mmm.put("rylx", "");
  370 + mmm.put("dh","");
  371 + listAll.add(mmm);
  372 + } else {
  373 +
  374 + Map<String, Object> mmm=new HashMap<>();
  375 + mmm.put("xlName", "小计");
  376 + mmm.put("lp", "");
  377 + mmm.put("jGh", "");
  378 + mmm.put("clZbh", "");
  379 + mmm.put("jName", "");
  380 + mmm.put("jhbc", jhbc);
  381 + mmm.put("jhlc", jhlc);
  382 + mmm.put("sjbc", sjbc);
  383 + mmm.put("sjzlc", sjzlc);
  384 + mmm.put("kszlc",kszlc);
  385 + mmm.put("zlc", zlc);
  386 + mmm.put("zlc2", zlc2);
  387 + mmm.put("jzyl",jzyl);
  388 + mmm.put("czyl",czyl);
  389 + mmm.put("jzl", jzl);
  390 + mmm.put("yh", yh);
  391 + mmm.put("rylx", "");
  392 + mmm.put("dh","");
  393 + listAll.add(mmm);
  394 + }
  395 + }
265 396 }
266 397 Map<String, Object> mmp=new HashMap<>();
267 398 mmp.put("xlName", "合计");
... ... @@ -275,13 +406,14 @@ public class JdtestServiceImpl implements JdtestService {
275 406 mmp.put("sjzlc", sjzlc_z);
276 407 mmp.put("kszlc",kszlc_z);
277 408 mmp.put("zlc", zlc_z);
  409 + mmp.put("zlc2", zlc_z2);
278 410 mmp.put("jzyl",jzyl_z);
279 411 mmp.put("czyl",czyl_z);
280 412 mmp.put("jzl", jzl_z);
281 413 mmp.put("yh", yh_z);
282 414 mmp.put("rylx", "");
283 415 mmp.put("dh","");
284   - list.add(mmp);
285   - return list;
  416 + listAll.add(mmp);
  417 + return listAll;
286 418 }
287 419 }
... ...
src/main/java/com/bsth/service/realcontrol/RealMapService.java
  View file @0df3b52
... ... @@ -8,6 +8,8 @@ import java.util.Map;
8 8 public interface RealMapService {
9 9 Map<String, Object> stationSpatialData(String idx);
10 10  
  11 + Map<String, Object> stationVersionSpatialData(String idx);
  12 +
11 13 Map<String,Object> carParkSpatialData();
12 14  
13 15 Map<String, Object> findRouteByLine(String idx);
... ...
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
  View file @0df3b52
... ... @@ -57,6 +57,33 @@ public class RealMapServiceImpl implements RealMapService {
57 57 }
58 58  
59 59 @Override
  60 + public Map<String, Object> stationVersionSpatialData(String idx) {
  61 + Map<String, Object> rs = new HashMap();
  62 + try {
  63 + //拼接in语句
  64 + List<String> idArray = Splitter.on(",").splitToList(idx);
  65 + StringBuffer inStr = new StringBuffer();
  66 + for (String code : idArray) {
  67 + inStr.append(",'");
  68 + inStr.append(code);
  69 + inStr.append("'");
  70 + }
  71 + String inStrs = " (" + inStr.toString().substring(1) + ")";
  72 + String sql = "select r.LINE_CODE,r.STATION_NAME,r.STATION_CODE,r.STATION_MARK,r.DIRECTIONS,r.DISTANCES,r.TO_TIME, r.VERSIONS,s.G_LONX,s.G_LATY,s.RADIUS,s.SHAPES_TYPE,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID, r.STATION_ROUTE_CODE,r.versions from bsth_c_ls_stationroute r inner join bsth_c_station s on r.station=s.id where r.line_code in " + inStrs + " and r.destroy=0";
  73 +
  74 + List<StationSpatialData> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(StationSpatialData.class));
  75 + rs.put("status", ResponseCode.SUCCESS);
  76 + rs.put("list", list);
  77 + } catch (Exception e) {
  78 + logger.error("", e);
  79 + rs.put("status", ResponseCode.ERROR);
  80 + rs.put("msg", "查询站点空间数据出现异常！");
  81 + }
  82 +
  83 + return rs;
  84 + }
  85 +
  86 + @Override
60 87 public Map<String, Object> carParkSpatialData() {
61 88 Map<String, Object> rs = new HashMap();
62 89  
... ... @@ -142,7 +169,7 @@ public class RealMapServiceImpl implements RealMapService {
142 169 }
143 170 inCond.deleteCharAt(inCond.length() - 1).append(")");
144 171  
145   - String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
  172 + String sql = "SELECT r.ID,r.LINE_CODE,r.SECTION_CODE,r.SECTIONROUTE_CODE,r.DIRECTIONS,s.SECTION_NAME,ST_AsText(s.GSECTION_VECTOR) GSECTION_VECTOR,s.SECTION_DISTANCE,s.SECTION_TIME,r.versions FROM bsth_c_ls_sectionroute r INNER JOIN bsth_c_section s on r.section_code=s.section_code WHERE r.line_code in "+inCond.toString()+" and r.destroy=0 order by sectionroute_code";
146 173 List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
147 174  
148 175 //排序
... ...
src/main/java/com/bsth/util/ReportUtils.java
  View file @0df3b52
... ... @@ -324,6 +324,7 @@ public class ReportUtils {
324 324 int listIndex = 0;
325 325 // 取得模板行
326 326 HSSFRow orgRow = sheet.getRow(index);
  327 + HSSFCellStyle style= wb.createCellStyle();
327 328 try {
328 329 while (iterator.hasNext()) {
329 330 // 取得iterator的对象
... ... @@ -340,7 +341,7 @@ public class ReportUtils {
340 341 // 创建新行
341 342 newRow = sheet.createRow(index + k++);
342 343 // 把新行的内容换成和模板行一样
343   - copyRow(wb, orgRow, newRow, true, wb.createCellStyle());
  344 + copyRow(wb, orgRow, newRow, true,style);
344 345 tmpCellNum = newRow.getLastCellNum();
345 346 for (int l = 0; l < tmpCellNum; l++) {
346 347 cell = newRow.getCell(l);
... ...
src/main/resources/static/pages/forms/mould/jd_daily.xls
View file @0df3b52
No preview for this file type
src/main/resources/static/pages/forms/statement/jd_daily.html
  View file @0df3b52
... ... @@ -14,6 +14,11 @@
14 14  
15 15 .table > tbody + tbody {
16 16 border-top: 1px solid; }
  17 +
  18 +
  19 + #forms > thead > tr> td >label{
  20 + word-break: keep-all;white-space:nowrap;
  21 + }
17 22 </style>
18 23  
19 24 <div class="page-head">
... ... @@ -55,32 +60,33 @@
55 60 <table class="table table-bordered table-hover table-checkable" id="forms">
56 61 <thead>
57 62 <tr>
58   - <th colspan="17">调度班次日报</th>
  63 + <th colspan="18">调度班次日报</th>
59 64 </tr>
60 65 <tr>
61   - <td>线路</td>
  66 + <td><label>线路</label></td>
62 67 <td colspan="8"><span id="form_line">&nbsp;</span></td>
63   - <td>时间</td>
64   - <td colspan="7"><span id="form_date">&nbsp;</span></td>
  68 + <td><label >时间</label></td>
  69 + <td colspan="8"><span id="form_date">&nbsp;</span></td>
65 70 </tr>
66 71 <tr>
67   - <td>线路</td>
68   - <td>路牌</td>
69   - <td>车辆</td>
70   - <td>工号</td>
71   - <td>姓名</td>
72   - <td>计划班次</td>
73   - <td>计划营运里程</td>
74   - <td>实际班次</td>
75   - <td>实际营运里程</td>
76   - <td>空驶里程</td>
77   - <td>总里程</td>
78   - <td>出场存油</td>
79   - <td>进场存油</td>
80   - <td>加注量</td>
81   - <td>油耗</td>
82   - <td>加注类别</td>
83   - <td>电耗</td>
  72 + <td><label >线路</label></td>
  73 + <td><label >路牌</label></td>
  74 + <td><label >车辆</label></td>
  75 + <td><label >工号</label></td>
  76 + <td><label >姓名</label></td>
  77 + <td><label >计划班次</label></td>
  78 + <td><label >计划营运里程</label></td>
  79 + <td><label >实际班次</label></td>
  80 + <td><label >实际营运里程</label></td>
  81 + <td><label >空驶里程</label></td>
  82 + <td><label >总里程</label></td>
  83 + <td><label >总里程(四舍五入)</label></td>
  84 + <td><label >出场存油</label></td>
  85 + <td><label >进场存油</label></td>
  86 + <td><label >加注量</label></td>
  87 + <td><label >油耗</label></td>
  88 + <td><label >加注类别</label></td>
  89 + <td><label >电耗</label></td>
84 90 </tr>
85 91 </thead>
86 92 <tbody id="tbody">
... ... @@ -253,6 +259,7 @@
253 259 <td>{{obj.sjzlc}}</td>
254 260 <td>{{obj.kszlc}}</td>
255 261 <td>{{obj.zlc}}</td>
  262 + <td>{{obj.zlc2}}</td>
256 263 <td>{{obj.czyl}}</td>
257 264 <td>{{obj.jzyl}}</td>
258 265 <td>{{obj.jzl}}</td>
... ...
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
  View file @0df3b52
... ... @@ -22,7 +22,7 @@ var gb_map_spatial_data = (function () {
22 22  
23 23 var init = function () {
24 24 //加载站点路由数据
25   - gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
  25 + gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
26 26 var list = rs.list;
27 27 $.each(list, function () {
28 28 this.lat = this.gLaty;
... ... @@ -296,7 +296,30 @@ var gb_map_spatial_data = (function () {
296 296 }
297 297 return treeData;
298 298 };
  299 + var get_st_route_tree_data_version = function () {
  300 + var treeData = [];
299 301  
  302 + for (var lineCode in lineVersionStationArr) {
  303 + name = gb_data_basic.codeToLine[lineCode].name;
  304 + treeData.push({
  305 + 'text': name,
  306 + 'open': true,
  307 + 'children': [
  308 + {
  309 + 'text': '上行',
  310 + 'children': grabs(lineVersionStationArr[lineCode][0]),
  311 + 'id': lineCode + '_0_st'
  312 + },
  313 + {
  314 + 'text': '下行',
  315 + 'children': grabs(lineVersionStationArr[lineCode][1]),
  316 + 'id': lineCode + '_1_st'
  317 + }
  318 + ]
  319 + })
  320 + }
  321 + return treeData;
  322 + };
300 323 var get_st_carpark_tree_data = function () {
301 324 var treeData = [];
302 325  
... ...