到离站设备号关联车辆自编号错误问题修复

娄高锋
1 parent 3eda500c
Showing 3 changed files with 109 additions and 12 deletions
src/main/java/com/bsth/repository/CarDeviceRepository.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/report/inoutstation.html
@@ -35,7 +35,7 @@ public interface CarDeviceRepository extends BaseRepository&lt;CarDevice, Long&gt; {
 				+"select * from(select c.inside_code, c.car_plate, d.old_device_no device_no, d.qyrq, 'off' state "
 				+"from bsth_c_cars c left join bsth_c_car_device d on c.inside_code = d.cl_zbh "
 				+"where qyrq is not null)b "
-				+")c order by device_no, qyrq, state ",nativeQuery=true)
+				+")c order by device_no, qyrq, state desc ",nativeQuery=true)
 	List<Object[]> selectCarHistoryDeviceNo();
  
 }
@@ -225,17 +225,21 @@ public class ReportServiceImpl implements ReportService{
 			String ts = rs.getString("ts");
 			Date gpsDate = new Date(Long.valueOf(ts).longValue());
 			if(deviceNoMap.containsKey(deviceNo)){
-				for(Map<String, Object> m : deviceNoMap.get(deviceNo)){
+				List<Map<String, Object>> deviceNoList = deviceNoMap.get(deviceNo);
+				for(int i = 0; i < deviceNoList.size(); i++){
+					Map<String, Object> m = deviceNoList.get(i);
 					Date qyrq = (Date)m.get("qyrq");
 					String state = m.get("state").toString();
-					if("off".equals(state) && qyrq.getTime() > gpsDate.getTime()){ // 启用时间前的旧设备号，旧设备号里符合时间的最后一个
+					if("on".equals(state) && qyrq.getTime() <= gpsDate.getTime()){ // 大于启用时间
+						arr.setNbbm(m.get("nbbm").toString());
+						arr.setPzh(m.get("pzh").toString());
+					}
+					if("off".equals(state) && qyrq.getTime() <= gpsDate.getTime()){ // 大于等于停用时间
+						arr.setNbbm(null);
+						arr.setPzh(null);
+					} else if(i == 0 && "off".equals(state) && qyrq.getTime() > gpsDate.getTime()){ // 小于停用时间(仅限第一条，说明第一次被替换)
 						arr.setNbbm(m.get("nbbm").toString());
 						arr.setPzh(m.get("pzh").toString());
-					} else if("on".equals(state) && qyrq.getTime() <= gpsDate.getTime()){ // 启用时间后的新设备号，新设备号符合时间的第一个
-						if(StringUtils.isEmpty(arr.getNbbm())){
-							arr.setNbbm(m.get("nbbm").toString());
-							arr.setPzh(m.get("pzh").toString());
-						}
 					}
 				}
 			}
@@ -4571,18 +4575,17 @@ public class ReportServiceImpl implements ReportService{
  
 	public Map<String,Object> calcDetailMonthlyE(Map<String, Object> map){
  
-//		List<List<String>> list = calcWaybillService.calcDetailMonthly(map);
-		List<List<String>> list = calcWaybillService.calcDetailMonthlyNew(map);
-
 		Map<String, Object> resultMap = new HashMap<String, Object>();
 		try {
+			List<List<String>> list = calcWaybillService.calcDetailMonthlyNew(map);
+			
 			String name = map.get("name").toString();
 			String type = map.get("statisticalObj").toString();
 			if(list.size()>0){
 				ReportUtils ee = new ReportUtils();
 				ee.createFlie(list,name,type);
 			}
-
+			
 			resultMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
 			resultMap.put("status", ResponseCode.ERROR);
@@ -416,6 +416,7 @@
 					    $("#dlzmx").html("到离站详细                "+xlmc+"   "+clmc+"   "+rqmc+"   "+bcmc);
 	                    $("#fcsj_xx").val(fcsj);
  					    $("#ddsj_xx").val(ddsj);
+ 					   updateNbbmByDeviceId(result);
 						var ludan_ll_1 = template('ludan_ll_1',{list:result});
 							// 把渲染好的模版html文本追加到表格中
 						$('#forms1 .ludan_ll_1').html(ludan_ll_1);
@@ -451,6 +452,7 @@
 					}
 				    $("#dlzmx").html("到离站详细                "+xlmc+"   "+rqmc+"   "+sxmc+"   "+zdmc);
 				$get('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
+					updateNbbmByDeviceId(result);
 					var ludan_ll_1 = template('ludan_ll_1',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 					$('#forms1 .ludan_ll_1').html(ludan_ll_1);
@@ -458,6 +460,98 @@
 			}
 		})
  
+		var carsMap = new Map();
+		var carsMapDeriveId = new Map();
+		$get('/cars/all',{},function(result){
+			if(result){
+				$.each(result, function(i, obj) {
+					var nbbm = obj.insideCode;
+					var deviceId = obj.equipmentCode;
+					deviceId = deviceId.replace(/BF-/g, "");
+					var p = new Array();
+					p["deviceId"] = deviceId;
+					p["nbbm"] = obj.insideCode;
+					p["pzh"] = obj.carPlate;
+					carsMap.set(nbbm, p);
+					carsMapDeriveId.set(deviceId, p);
+				});
+			}
+		});
+		
+		var cdMap = new Map();
+		$get('/cde_sc/all',{},function(result){
+			if(result.data){
+				$.each(result.data, function(i, obj) {
+					var data = [];
+					if(obj.newDeviceNo || obj.oldDeviceNo){
+						var newDeviceNo = obj.newDeviceNo;
+						var oldDeviceNo = obj.oldDeviceNo;
+						newDeviceNo = newDeviceNo.replace(/BF-/g, "");
+						oldDeviceNo = oldDeviceNo.replace(/BF-/g, "");
+						var p = new Array();
+						p["newDeviceNo"] = newDeviceNo;
+						p["oldDeviceNo"] = oldDeviceNo;
+						p["qyrq"] = obj.qyrq;
+						p["nbbm"] = obj.clZbh;
+						if(!(cdMap.has(newDeviceNo))){
+							cdMap.set(newDeviceNo, []);
+						}
+						if(!(cdMap.has(oldDeviceNo))){
+							cdMap.set(oldDeviceNo, []);
+						}
+						if(newDeviceNo == oldDeviceNo){
+							cdMap.get(newDeviceNo).push(p);
+						} else {
+							cdMap.get(newDeviceNo).push(p);
+							cdMap.get(oldDeviceNo).push(p);
+						}
+					}
+				});
+			}
+			console.log("cdMap", cdMap);
+		});
+		
+		function updateNbbmByDeviceId(list){
+			$.each(list, function(i, obj) {
+				var nbbm = "";
+				if(obj.deviceId && obj.ts){
+					var ts = obj.ts;
+					var deviceId = obj.deviceId;
+					deviceId = deviceId.replace(/BF-/g, "");
+					if(cdMap.has(deviceId)){
+						$.each(cdMap.get(deviceId), function(j, cd) {
+							if(cd.newDeviceNo && cd.qyrq && cd.nbbm){
+								if(deviceId == cd.newDeviceNo){
+									if(ts >= cd.qyrq){
+										nbbm = cd.nbbm;
+									}
+								}
+								if(deviceId == cd.oldDeviceNo){
+									if(ts >= cd.qyrq){
+										nbbm = "";
+									} else if(j == 0){ // 历史替换记录里第一条可能只有被替换的记录
+										nbbm = cd.nbbm;
+									}
+								}
+							}
+						});
+					}
+				}
+				if(nbbm != ""){
+					obj.nbbm = nbbm;
+					if(carsMap.has(nbbm)){
+						obj.pzh = carsMap.get(nbbm).pzh;
+					}
+				} else {
+					if(carsMapDeriveId.has(obj.deviceId)){
+						var m = carsMapDeriveId.get(obj.deviceId);
+						obj.nbbm = m.nbbm;
+						obj.pzh = m.pzh;
+					}
+				}
+			});
+		}
+		
 		$(".sreach-zd").on("change",initZd);
 		$("#date1,#date2").on("blur",initZd);
 		var status=false;