表“车载上报停靠站”建表分区，代码重写

zlz
1 parent d256804a
Showing 6 changed files with 152 additions and 136 deletions
src/main/java/com/bsth/controller/traffic/VehicleInoutStopController.java
src/main/java/com/bsth/entity/traffic/VehicleInoutStop.java
src/main/java/com/bsth/service/traffic/VehicleInoutStopService.java
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
src/main/resources/static/pages/trafficManage/js/lineStationUploadRecord.js
src/main/resources/static/pages/trafficManage/lineStationUploadRecord.html
@@ -2,8 +2,17 @@ package com.bsth.controller.traffic;
 import com.bsth.controller.BaseController;
 import com.bsth.entity.traffic.VehicleInoutStop;
+import com.bsth.service.traffic.VehicleInoutStopService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
 /**
  *
  * @author BSTH
@@ -12,4 +21,26 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("vehicle_stop")
 public class VehicleInoutStopController extends BaseController<VehicleInoutStop,Integer> {
+
+    @Autowired
+    VehicleInoutStopService vehicleInoutStopService;
+
+    /**
+     * 给定条件查车载上报停靠站
+     * @param map
+     * @param page
+     * @param size
+     * @return
+     */
+    @RequestMapping(value = "getVehicleInoutStopByParam")
+    public Page<Map<String, Object>> getVehicleInoutStopByParam(@RequestParam Map<String, Object> map,
+                        @RequestParam(defaultValue = "0") int page,
+                        @RequestParam(defaultValue = "10") int size) {
+        map.put("page",page);
+        map.put("size",size);
+        long total = vehicleInoutStopService.getVehicleInoutStopCountByParam(map);
+        Page<Map<String, Object>> result = new PageImpl<>(vehicleInoutStopService.getVehicleInoutStopByParam(map),
+                new PageRequest(page, size, null),total);
+        return result;
+    }
 }
 package com.bsth.entity.traffic;
-import com.bsth.entity.Cars;
-import com.bsth.entity.Line;
-
 import javax.persistence.*;
 import java.util.Date;
@@ -27,11 +24,9 @@ public class VehicleInoutStop {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private Integer id;
-	@ManyToOne
-	private Line line;
+	private int line;
-	@ManyToOne
-	private Cars cars;
+	private int cars;
 	// 站点序号
 	private Integer stop;
@@ -46,7 +41,7 @@ public class VehicleInoutStop {
 	private Integer inOutStop;
 	// 上报时间
-	private long reportDate;
+	private Date reportDate;
 	public Integer getId() {
 		return id;
@@ -56,19 +51,19 @@ public class VehicleInoutStop {
 		this.id = id;
 	}
-	public Line getLine() {
+	public int getLine() {
 		return line;
 	}
-	public void setLine(Line line) {
+	public void setLine(int line) {
 		this.line = line;
 	}
-	public Cars getCars() {
+	public int getCars() {
 		return cars;
 	}
-	public void setCars(Cars cars) {
+	public void setCars(int cars) {
 		this.cars = cars;
 	}
@@ -104,7 +99,11 @@ public class VehicleInoutStop {
 		this.inOutStop = inOutStop;
 	}
-	public long getReportDate() { return reportDate; }
+	public Date getReportDate() {
+		return reportDate;
+	}
-	public void setReportDate(long reportDate) { this.reportDate = reportDate; }
+	public void setReportDate(Date reportDate) {
+		this.reportDate = reportDate;
+	}
 }
@@ -3,10 +3,26 @@ package com.bsth.service.traffic;
 import com.bsth.entity.traffic.VehicleInoutStop;
 import com.bsth.service.BaseService;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 时刻模板上传日志
  */
 public interface VehicleInoutStopService extends BaseService<VehicleInoutStop,Integer> {
+    /**
+     * 给定条件查车载上报停靠站
+     * @param map
+     * @return
+     */
+    List<Map<String, Object>> getVehicleInoutStopByParam(Map<String,Object> map);
+
+    /**
+     * 给定条件查车载上报停靠站的记录数
+     * @param map
+     * @return
+     */
+    long getVehicleInoutStopCountByParam(Map<String,Object> map);
 }
@@ -3,10 +3,14 @@ package com.bsth.service.traffic.impl;
 import com.bsth.entity.traffic.VehicleInoutStop;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.traffic.VehicleInoutStopService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.bsth.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
 /**
  *
  * @ClassName: TrafficManageServiceImpl(运管处接口service业务层实现类)
@@ -26,6 +30,70 @@ import org.springframework.stereotype.Service;
 @Service
 public class VehicleInoutStopServiceImpl extends BaseServiceImpl<VehicleInoutStop,Integer> implements VehicleInoutStopService {
-	Logger logger = LoggerFactory.getLogger(this.getClass());
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+	/**
+	 * 拼装sql
+	 * @param map
+	 * @param flag
+	 * @return
+	 */
+	private String packageParam(Map<String,Object> map,String flag){
+		StringBuffer sql = new StringBuffer(" where 1 = 1 ");
+		String lineId = map.get("lineId")+"";
+		String insideCode = map.get("insideCode")+"";
+		String carPlate = map.get("carPlate")+"";
+		String reportDate_start = map.get("reportDate_start")+"";
+		String reportDate_end = map.get("reportDate_end")+"";
+		int page = Integer.valueOf(map.get("page")+"");
+		int size = Integer.valueOf(map.get("size")+"");
+		String order = " order by report_date asc"+ " LIMIT "+page*size+","+size;
+		int dayNum = DateUtils.calcDaynumberInYear(reportDate_start.substring(0,8)) -1;
+		if(!lineId.equals("")){
+			sql.append(" and l.id = ").append(lineId);
+		}
+		if(!insideCode.equals("")){
+			sql.append(" and c.inside_code = ").append("'").append(insideCode.toUpperCase()).append("'");
+		}
+		if(!carPlate.equals("")){
+			sql.append(" and c.car_plate = ").append("'").append("沪").append(carPlate.substring(0,1)).append("-")
+					.append(carPlate.substring(1)).append("'");
+		}
+		sql.append(" and FROM_UNIXTIME(REPORT_DATE/1000,'%Y%m%d%H') between '").append(reportDate_start).
+				append("' and '").append(reportDate_end).append("'").append(" and r.day_year = ").append(dayNum);
+		if(flag.equals("count")){
+			return sql.toString();
+		}else{
+			return sql + order;
+		}
+	}
+
+	/**
+	 * 给定条件查车载上报停靠站
+	 * @param map
+	 * @return
+	 */
+	public List<Map<String, Object>> getVehicleInoutStopByParam(Map<String,Object> map){
+		String sql = "SELECT c.branche_company,c.company,l.name,l.shanghai_linecode,inside_code,equipment_code,car_plate," +
+				"if( r.service_state= 0,'营运','停运') as service_state ," +
+				"if( r.up_down= 0,'上行','下行') as up_down ," +
+				"if( r.in_out_stop= 0,'站内','站外') as in_out_stop , " +
+				"r.stop,r.report_date FROM bsth_c_shreal r LEFT JOIN bsth_c_cars c on r.cars = c.id " +
+				"LEFT JOIN bsth_c_line l on r.line = l.id" + packageParam(map,"") ;
+		List<Map<String, Object>> result = jdbcTemplate.queryForList(sql);
+		return result;
+	}
+	/**
+	 * 给定条件查车载上报停靠站的记录数
+	 * @param map
+	 * @return
+	 */
+	public long getVehicleInoutStopCountByParam(Map<String,Object> map){
+		String sql = "SELECT count(1) COUNT FROM bsth_c_shreal r LEFT JOIN bsth_c_cars c on r.cars = c.id " +
+				"LEFT JOIN bsth_c_line l on r.line = l.id" + packageParam(map,"count");
+		long result = Long.valueOf(jdbcTemplate.queryForMap(sql).get("COUNT")+"");
+		return result;
+	}
 }
@@ -114,30 +114,12 @@
         $.each(inputs, function(i, element) {
             params[$(element).attr("name")] = $(element).val();
         });
-
-        var startDate = params['startDate'];
-        var endDate = params['endDate'];
+        var startDate = params['startDate'] == "" ? "0" : params['startDate'];
+        var endDate = params['endDate'] == "" ? "23" : params['endDate'];
         var reportDate = params['reportDate'];
-        if($("#carPlate").val() != ''){
-            params['cars.carPlate_eq'] = changeCarPlate($("#carPlate").val());
-        }
-        if($("#insideCode").val() != ''){
-            params['cars.insideCode_eq'] = $("#insideCode").val().toUpperCase();
-        }
-        // 默认开始时间
-        params['reportDate_ge'] = str2datetime(reportDate+" 00:00:00");
-        // 默认结束时间
-        params['reportDate_le'] = str2datetime(reportDate+" 23:59:59");
-
-        // 指定的开始时间
-        if(startDate != ''){
-            params['reportDate_gt'] = str2datetime(reportDate+" "+ (startDate > 9 ? startDate : "0"+startDate + ":00:00"));
-        }
-        // 指定的结束时间
-        if(endDate != ''){
-            params['reportDate_lt'] = str2datetime(reportDate+" "+ (endDate > 9 ? endDate : "0"+endDate + ":59:59"));
-        }
-        $get('/vehicle_stop', params, function(data) {
+        params['reportDate_start'] = reportDate.replace(/-/g,'') + (startDate > 9 ? startDate : "0"+startDate);
+        params['reportDate_end'] = reportDate.replace(/-/g,'') + (endDate > 9 ? endDate : "0"+endDate);
+        $get('/vehicle_stop/getVehicleInoutStopByParam', params, function(data) {
             var content = data.content;
             _dateFormat(content);
             var bodyHtm = template('lineStationUploadRecord_list_temp', {
@@ -183,7 +165,7 @@
     function _dateFormat(list) {
         var fs = 'YYYY-MM-DD HH:mm:ss';
         $.each(list, function(i, obj) {
-            obj.reportDate = moment(obj.reportDate).format(fs);
+            obj['report_date'] = moment(obj['report_date']).format(fs);
         });
     }
@@ -191,10 +173,4 @@
     function str2datetime(stringTime){
         return Date.parse(new Date(stringTime));
     }
-
-    // 时间字符串转成时间戳
-    function changeCarPlate(carPlate){
-        var tmp = "沪" + carPlate.substr(0, 1) + "-" + carPlate.substr(1, carPlate.length);
-        return tmp.toUpperCase();;
-    }
 })();
 \ No newline at end of file
@@ -20,15 +20,15 @@
 			</div>
 			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
 				<span class="item-label" style="width: 80px;">线路名称:</span>
-				<select class="form-control" name="line.id_eq" id="line" style="width: 150px;"></select>
+				<select class="form-control" name="lineId" id="line" style="width: 150px;"></select>
 			</div>
 			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
 				<span class="item-label" style="width: 80px;">内部编码:</span>
-				<input type="text" name="cars.insideCode_eq" id="insideCode" style="width: 120px;" maxlength="40"/>
+				<input type="text" name="insideCode" id="insideCode" style="width: 120px;" maxlength="40"/>
 			</div>
 			<div class="inLine_block" style="display: inline-block;margin-left: 15px;">
 				<span class="item-label" style="width: 80px;">车牌号:</span>
-				<input type="text" name="cars.carPlate_eq" id="carPlate" style="width: 120px;"  maxlength="40"/>
+				<input type="text" name="carPlate" id="carPlate" style="width: 120px;"  maxlength="40"/>
 				<span style="color: red;width: 80px;">(沪D-12345 '沪'和'-'去掉)</span>
 			</div>
 			<div class="form-group" style="display: inline-block;margin-left: 15px;">
@@ -76,114 +76,40 @@
 		{{i+1}}
 	</td>
 	<td>
-		{{if obj.line.company == '55'}}
-		上南公司
-		{{else if obj.line.company == '22'}}
-		金高公司
-		{{else if obj.line.company == '05'}}
-		杨高公司
-		{{else if obj.line.company == '26'}}
-		南汇公司
-		{{else if obj.line.company == '77'}}
-		闵行公司
-		{{/if}}
+		{{obj['branche_company']}}
 	</td>
 	<td>
-		{{if obj.line.company == '55'}}
-
-		{{if obj.line.brancheCompany == '1'}}
-		上南二分公司
-		{{else if obj.line.brancheCompany == '2'}}
-		上南三分公司
-		{{else if obj.line.brancheCompany == '3'}}
-		上南六分公司
-		{{else if obj.line.brancheCompany == '4'}}
-		上南一分公司
-		{{/if}}
-
-		{{else if obj.line.company == '22'}}
-
-		{{if obj.line.brancheCompany == '1'}}
-		四分公司
-		{{else if obj.line.brancheCompany == '2'}}
-		二分公司
-		{{else if obj.line.brancheCompany == '3'}}
-		三分公司
-		{{else if obj.line.brancheCompany == '5'}}
-		一分公司
-		{{/if}}
-
-		{{else if obj.line.company == '05'}}
-
-		{{if obj.line.brancheCompany == '1'}}
-		川沙分公司
-		{{else if obj.line.brancheCompany == '2'}}
-		金桥分公司
-		{{else if obj.line.brancheCompany == '3'}}
-		芦潮港分公司
-		{{else if obj.line.brancheCompany == '5'}}
-		杨高分公司
-		{{else if obj.line.brancheCompany == '6'}}
-		周浦分公司
-		{{/if}}
-
-		{{else if obj.line.company == '26'}}
-
-		{{if obj.line.brancheCompany == '1'}}
-		南汇一分
-		{{else if obj.line.brancheCompany == '2'}}
-		南汇二分
-		{{else if obj.line.brancheCompany == '3'}}
-		南汇三分
-		{{else if obj.line.brancheCompany == '4'}}
-		南汇维修公司
-		{{else if obj.line.brancheCompany == '5'}}
-		南汇公司
-		{{/if}}
-
-		{{/if}}
+		{{obj['company']}}
 	</td>
 	<td>
-		{{obj.line.name}}
+		{{obj['name']}}
 	</td>
 	<td>
-		{{obj.line.shanghaiLinecode}}
+		{{obj['shanghai_linecode']}}
 	</td>
 	<td>
-		{{obj.cars.insideCode}}
+		{{obj['inside_code']}}
 	</td>
 	<td>
-		{{obj.cars.equipmentCode}}
+		{{obj['equipment_code']}}
 	</td>
 	<td>
-		{{obj.cars.carPlate}}
+		{{obj['car_plate']}}
 	</td>
 	<td>
-		{{obj.stop}}
+		{{obj['stop']}}
 	</td>
 	<td>
-		{{if obj.serviceState == 0}}
-		营运
-		{{else if obj.serviceState == 1}}
-		停运
-		{{/if}}
+		{{obj['service_state']}}
 	</td>
 	<td>
-		{{if obj.upDown == 0}}
-		上行
-		{{else if obj.upDown == 1}}
-		下行
-		{{/if}}
+		{{obj['up_down']}}
 	</td>
 	<td>
-		{{if obj.inOutStop == 0}}
-		站内
-		{{else if obj.inOutStop == 1}}
-		站外
-		{{/if}}
+		{{obj['in_out_stop']}}
 	</td>
 	<td>
-		{{obj.reportDate}}
+		{{obj['report_date']}}
 	</td>
 </tr>
 {{/each}}