Merge branch 'pudong' into jiading

王通
2 parents dc8782d2 7319efb4
Showing 9 changed files with 230 additions and 31 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/jdtest/impl/JdtestServiceImpl.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/java/com/bsth/util/ReportUtils.java
src/main/resources/static/pages/forms/mould/jd_daily.xls
src/main/resources/static/pages/forms/statement/jd_daily.html
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
@@ -27,6 +27,11 @@ public class RealMapController {
         return realMapService.stationSpatialData(idx);
     }
+    @RequestMapping(value = "/stationVersionSpatialData")
+    public Map<String, Object> stationVersionSpatialData(@RequestParam String idx) {
+        return realMapService.stationVersionSpatialData(idx);
+    }
+
     /**
      * 停车场
      *
@@ -828,8 +828,10 @@ public class DayOfSchedule {
         Collections.sort(list, schFCSJComparator);
         ScheduleRealInfo sch = null;
         for (ScheduleRealInfo temp : list) {
-            if (temp.getFcsjActual() == null)
-                sch = temp;
+            if (temp.getFcsjActual() == null) {
+            	sch = temp;
+            	break;
+            }
         }
         return sch;
@@ -105,6 +105,7 @@ public class JdtestServiceImpl implements JdtestService {
 	@Override
 	public List<Map<String, Object>> daily(Map<String, Object> map) {
+		List<Map<String, Object>> listAll=new ArrayList<>();
 		String xlbm="";
 		if(map.get("line")!=null){
 			xlbm=map.get("line").toString().trim();
@@ -173,7 +174,6 @@ public class JdtestServiceImpl implements JdtestService {
 			lists=scheduleRealInfoRepository.scheduleByDateAndLineByGs_(gsbm, fgsbm, map.get("date").toString());
 		}else{
 			lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, map.get("date").toString());
-
 		}
 		double jzyl_z=0.0;
 		double czyl_z=0.0;
@@ -185,6 +185,19 @@ public class JdtestServiceImpl implements JdtestService {
 		double sjzlc_z=0.0;
 		double kszlc_z=0.0;
 		double zlc_z=0.0;
+		double zlc_z2=0.0;
+		
+		double jzyl_line=0.0;
+		double czyl_line=0.0;
+		double jzl_line=0.0;
+		double yh_line=0.0;
+		int jhbc_line=0;
+		double jhlc_line=0.0;
+		int sjbc_line=0;
+		double sjzlc_line=0.0;
+		double kszlc_line=0.0;
+		double zlc_line=0.0;
+		double zlc_line2=0.0;
 		for(int i=0;i<list.size();i++){
 			sList =new ArrayList<ScheduleRealInfo>();
 			jList =new ArrayList<ScheduleRealInfo>();
@@ -194,7 +207,6 @@ public class JdtestServiceImpl implements JdtestService {
 			double jzl=0.0;
 			double yh=0.0;
 			String rylx="";
-			
 			if(mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString())!=null){
 				Ylb t=mapYlb.get(m.get("xlBm").toString()+m.get("jGh").toString()+m.get("clZbh").toString()+m.get("lp").toString());
 				jzyl=t.getJzyl();
@@ -254,14 +266,133 @@ public class JdtestServiceImpl implements JdtestService {
 			double kszlc=Arith.add(ksgl, jccgl);
 			kszlc_z=Arith.add(kszlc, kszlc_z);
 			double zlc=Arith.add(sjzlc, kszlc);
+			double zlc2=Math.round(Math.round(zlc));
 			zlc_z=Arith.add(zlc, zlc_z);
+			zlc_z2=Arith.add(zlc2,zlc_z2);
 			m.put("jhbc", jhbc);
 			m.put("jhlc", jhlc);
 			m.put("sjbc", sjbc);
 			m.put("sjzlc",sjzlc);
 			m.put("kszlc", kszlc);
 			m.put("zlc", zlc);
-			
+			m.put("zlc2", zlc2);
+			listAll.add(m);
+			//线路小计
+			if (i < list.size() - 1) {
+				 if ((list.get(i+1).get("xlBm").toString()).equals(list.get(i).get("xlBm").toString())) {
+					  jzyl_line=Arith.add(jzyl_line, jzyl);
+					  czyl_line=Arith.add(czyl_line, czyl);
+					  jzl_line=Arith.add(jzl_line, jzl);
+					  yh_line=Arith.add(yh_line, yh);
+					  jhbc_line=jhbc_line+jhbc;
+					  jhlc_line=Arith.add(jhlc_line,jhlc);
+					  sjbc_line=sjbc_line+sjbc;
+					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+					  kszlc_line=Arith.add(kszlc_line,kszlc);
+					  zlc_line=Arith.add(zlc_line, zlc);
+					  zlc_line2=Arith.add(zlc_line2, zlc2);
+	             } else {
+	            	  jzyl_line=Arith.add(jzyl_line, jzyl);
+					  czyl_line=Arith.add(czyl_line, czyl);
+					  jzl_line=Arith.add(jzl_line, jzl);
+					  yh_line=Arith.add(yh_line, yh);
+					  jhbc_line=jhbc_line+jhbc;
+					  jhlc_line=Arith.add(jhlc_line,jhlc);
+					  sjbc_line=sjbc_line+sjbc;
+					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+					  kszlc_line=Arith.add(kszlc_line,kszlc);
+					  zlc_line=Arith.add(zlc_line, zlc);
+					  zlc_line2=Arith.add(zlc_line2, zlc2);
+					  
+					  Map<String, Object> mmm=new HashMap<>();
+					  mmm.put("xlName", "小计");
+					  mmm.put("lp", "");
+					  mmm.put("jGh", "");
+					  mmm.put("clZbh", "");
+					  mmm.put("jName", "");
+					  mmm.put("jhbc", jhbc_line);
+					  mmm.put("jhlc", jhlc_line);
+					  mmm.put("sjbc", sjbc_line);
+					  mmm.put("sjzlc", sjzlc_line);
+					  mmm.put("kszlc",kszlc_line);
+					  mmm.put("zlc", zlc_line);
+					  mmm.put("zlc2", zlc_line2);
+					  mmm.put("jzyl",jzyl_line);
+					  mmm.put("czyl",czyl_line);
+					  mmm.put("jzl", jzl_line);
+					  mmm.put("yh", yh_line);
+					  mmm.put("rylx", "");
+					  mmm.put("dh","");
+					  listAll.add(mmm);
+					  jzyl_line=0.0;
+					  czyl_line=0.0;
+					  jzl_line=0.0;
+					  yh_line=0.0;
+					  jhbc_line=0;
+					  jhlc_line=0.0;
+					  sjbc_line=0;
+					  sjzlc_line=0.0;
+					  kszlc_line=0.0;
+					  zlc_line=0.0;
+					  zlc_line2=0.0;
+	             }
+			} else {
+                if ((list.get(i).get("xlBm").toString()).equals(list.get(i - 1).get("xlBm").toString())) {
+					  jzyl_line=Arith.add(jzyl_line, jzyl);
+					  czyl_line=Arith.add(czyl_line, czyl);
+					  jzl_line=Arith.add(jzl_line, jzl);
+					  yh_line=Arith.add(yh_line, yh);
+					  jhbc_line=jhbc_line+jhbc;
+					  jhlc_line=Arith.add(jhlc_line,jhlc);
+					  sjbc_line=sjbc_line+sjbc;
+					  sjzlc_line=Arith.add(sjzlc_line, sjzlc);
+					  kszlc_line=Arith.add(kszlc_line,kszlc);
+					  zlc_line=Arith.add(zlc_line, zlc);
+					  zlc_line2=Arith.add(zlc_line2, zlc2);
+					  Map<String, Object> mmm=new HashMap<>();
+					  mmm.put("xlName", "小计");
+					  mmm.put("lp", "");
+					  mmm.put("jGh", "");
+					  mmm.put("clZbh", "");
+					  mmm.put("jName", "");
+					  mmm.put("jhbc", jhbc_line);
+					  mmm.put("jhlc", jhlc_line);
+					  mmm.put("sjbc", sjbc_line);
+					  mmm.put("sjzlc", sjzlc_line);
+					  mmm.put("kszlc",kszlc_line);
+					  mmm.put("zlc", zlc_line);
+					  mmm.put("zlc2", zlc_line2);
+					  mmm.put("jzyl",jzyl_line);
+					  mmm.put("czyl",czyl_line);
+					  mmm.put("jzl", jzl_line);
+					  mmm.put("yh", yh_line);
+					  mmm.put("rylx", "");
+					  mmm.put("dh","");
+					  listAll.add(mmm);
+                } else {
+					 
+					 Map<String, Object> mmm=new HashMap<>();
+					  mmm.put("xlName", "小计");
+					  mmm.put("lp", "");
+					  mmm.put("jGh", "");
+					  mmm.put("clZbh", "");
+					  mmm.put("jName", "");
+					  mmm.put("jhbc", jhbc);
+					  mmm.put("jhlc", jhlc);
+					  mmm.put("sjbc", sjbc);
+					  mmm.put("sjzlc", sjzlc);
+					  mmm.put("kszlc",kszlc);
+					  mmm.put("zlc", zlc);
+					  mmm.put("zlc2", zlc2);
+					  mmm.put("jzyl",jzyl);
+					  mmm.put("czyl",czyl);
+					  mmm.put("jzl", jzl);
+					  mmm.put("yh", yh);
+					  mmm.put("rylx", "");
+					  mmm.put("dh","");
+					  listAll.add(mmm);
+                }
+			}
 		}
 		Map<String, Object> mmp=new HashMap<>();
 		mmp.put("xlName", "合计");
@@ -275,13 +406,14 @@ public class JdtestServiceImpl implements JdtestService {
 		mmp.put("sjzlc", sjzlc_z);
 		mmp.put("kszlc",kszlc_z);
 		mmp.put("zlc", zlc_z);
+		mmp.put("zlc2", zlc_z2);
 		mmp.put("jzyl",jzyl_z);
 		mmp.put("czyl",czyl_z);
 		mmp.put("jzl", jzl_z);
 		mmp.put("yh", yh_z);
 		mmp.put("rylx", "");
 		mmp.put("dh","");
-		list.add(mmp);
-		return list;
+		listAll.add(mmp);
+		return listAll;
 	}
 }
@@ -8,6 +8,8 @@ import java.util.Map;
 public interface RealMapService {
     Map<String, Object> stationSpatialData(String idx);
+    Map<String, Object> stationVersionSpatialData(String idx);
+
     Map<String,Object> carParkSpatialData();
     Map<String, Object> findRouteByLine(String idx);
@@ -57,6 +57,33 @@ public class RealMapServiceImpl implements RealMapService {
     }
     @Override
+    public Map<String, Object> stationVersionSpatialData(String idx) {
+        Map<String, Object> rs = new HashMap();
+        try {
+            //拼接in语句
+            List<String> idArray = Splitter.on(",").splitToList(idx);
+            StringBuffer inStr = new StringBuffer();
+            for (String code : idArray) {
+                inStr.append(",'");
+                inStr.append(code);
+                inStr.append("'");
+            }
+            String inStrs = " (" + inStr.toString().substring(1) + ")";
+            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";
+
+            List<StationSpatialData> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(StationSpatialData.class));
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "查询站点空间数据出现异常！");
+        }
+
+        return rs;
+    }
+
+    @Override
     public Map<String, Object> carParkSpatialData() {
         Map<String, Object> rs = new HashMap();
@@ -142,7 +169,7 @@ public class RealMapServiceImpl implements RealMapService {
         }
         inCond.deleteCharAt(inCond.length() - 1).append(")");
-        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";
+        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";
         List<SectionRouteCoords> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SectionRouteCoords.class));
         //排序
@@ -324,6 +324,7 @@ public class ReportUtils {
 		int listIndex = 0;
 		// 取得模板行
 		HSSFRow orgRow = sheet.getRow(index);
+		HSSFCellStyle style= wb.createCellStyle();
 		try {
 			while (iterator.hasNext()) {
 				// 取得iterator的对象
@@ -340,7 +341,7 @@ public class ReportUtils {
 				// 创建新行
 				newRow = sheet.createRow(index + k++);
 				// 把新行的内容换成和模板行一样
-				copyRow(wb, orgRow, newRow, true, wb.createCellStyle());
+				copyRow(wb, orgRow, newRow, true,style);
 				tmpCellNum = newRow.getLastCellNum();
 				for (int l = 0; l < tmpCellNum; l++) {
 					cell = newRow.getCell(l);
@@ -14,6 +14,11 @@
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	   
+	  
+	  #forms   > thead > tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
 </style>
 <div class="page-head">
@@ -55,32 +60,33 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="17">调度班次日报</th>
+								<th colspan="18">调度班次日报</th>
 							</tr>
 							<tr>
-								<td>线路</td>
+								<td><label>线路</label></td>
 								<td colspan="8"><span id="form_line">&nbsp;</span></td>
-								<td>时间</td>
-								<td colspan="7"><span id="form_date">&nbsp;</span></td>
+								<td><label >时间</label></td>
+								<td colspan="8"><span id="form_date">&nbsp;</span></td>
 							</tr>
 							<tr>
-								<td>线路</td>
-								<td>路牌</td>
-								<td>车辆</td>
-								<td>工号</td>
-								<td>姓名</td>
-								<td>计划班次</td>
-								<td>计划营运里程</td>
-								<td>实际班次</td>
-								<td>实际营运里程</td>
-								<td>空驶里程</td>
-								<td>总里程</td>
-								<td>出场存油</td>
-								<td>进场存油</td>
-								<td>加注量</td>
-								<td>油耗</td>
-								<td>加注类别</td>
-								<td>电耗</td>
+								<td><label >线路</label></td>
+								<td><label >路牌</label></td>
+								<td><label >车辆</label></td>
+								<td><label >工号</label></td>
+								<td><label >姓名</label></td>
+								<td><label >计划班次</label></td>
+								<td><label >计划营运里程</label></td>
+								<td><label >实际班次</label></td>
+								<td><label >实际营运里程</label></td>
+								<td><label >空驶里程</label></td>
+								<td><label >总里程</label></td>
+								<td><label >总里程(四舍五入)</label></td>
+								<td><label >出场存油</label></td>
+								<td><label >进场存油</label></td>
+								<td><label >加注量</label></td>
+								<td><label >油耗</label></td>
+								<td><label >加注类别</label></td>
+								<td><label >电耗</label></td>
 							</tr>
 						</thead>
 						<tbody id="tbody">
@@ -253,6 +259,7 @@
 			<td>{{obj.sjzlc}}</td>
 			<td>{{obj.kszlc}}</td>
 			<td>{{obj.zlc}}</td>
+			<td>{{obj.zlc2}}</td>
 			<td>{{obj.czyl}}</td>
 			<td>{{obj.jzyl}}</td>
 			<td>{{obj.jzl}}</td>
@@ -22,7 +22,7 @@ var gb_map_spatial_data = (function () {
     var init = function () {
         //加载站点路由数据
-        gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
+        gb_common.$get('/realMap/stationVersionSpatialData', {idx: line_idx}, function (rs) {
             var list = rs.list;
             $.each(list, function () {
                 this.lat = this.gLaty;
@@ -296,7 +296,30 @@ var gb_map_spatial_data = (function () {
         }
         return treeData;
     };
+    var get_st_route_tree_data_version = function () {
+        var treeData = [];
+        for (var lineCode in lineVersionStationArr) {
+            name = gb_data_basic.codeToLine[lineCode].name;
+            treeData.push({
+                'text': name,
+                'open': true,
+                'children': [
+                    {
+                        'text': '上行',
+                        'children': grabs(lineVersionStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
+                    },
+                    {
+                        'text': '下行',
+                        'children': grabs(lineVersionStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
+                    }
+                ]
+            })
+        }
+        return treeData;
+    };
     var get_st_carpark_tree_data = function () {
         var treeData = [];