电对同人车不同路牌处理

廖磊
1 parent 644c5f63
Showing 2 changed files with 53 additions and 24 deletions
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/resources/application-dev.properties
@@ -2,6 +2,33 @@ package com.bsth.service.oil.impl;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
@@ -9,34 +36,24 @@ import com.bsth.data.BasicData;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.oil.Cdl;
+import com.bsth.entity.oil.Cyl;
 import com.bsth.entity.oil.Dlb;
 import com.bsth.entity.oil.Jdl;
+import com.bsth.entity.oil.Ylb;
 import com.bsth.entity.oil.Ylxxb;
+import com.bsth.entity.search.CustomerSpecs;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.oil.CdlRepository;
+import com.bsth.repository.oil.CylRepository;
 import com.bsth.repository.oil.DlbRepository;
 import com.bsth.repository.oil.JdlRepository;
+import com.bsth.repository.oil.YlbRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.DlbService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.Arith;
 import com.bsth.util.BatchSaveUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.stereotype.Service;
-
-import javax.transaction.Transactional;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.DecimalFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
 @Service
 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -410,7 +427,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			// TODO Auto-generated method stub
 			// 当天YLB信息
 			List<Dlb> dlList = this.listOrderBy(rq,gsbm,fgsbm,line,nbbm,"nbbm");
-//					repository.obtainYl(rq,gsbm,fgsbm,line,nbbm,"nbbm");
 			// 当天YLXXB信息
 			List<Ylxxb> ylxxList = ylxxbRepository.obtainYlxx(rq, 0,gsbm);
 			// 从排班表中计算出行驶的总里程
@@ -467,8 +483,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 			Map<String, Object> newMap_=new HashMap<String,Object>();
 			List<Dlb> addList = new ArrayList<Dlb>();
 			List<Dlb> updateList = new ArrayList<Dlb>();
-			String ins="";
-			Map<String, Object> ylMap=new HashMap<String, Object>();
+			Map<String, Object> cMap=new HashMap<String, Object>();
 			List<Map<String, Object>> listpb_=listpb;
 			Collections.sort(listpb,new NbbmJcsxMap());
 			for (int x = 0; x < listpb_.size(); x++) {
@@ -514,9 +529,24 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									if (t1.getNbbm().equals(map.get("clZbh").toString())
 											&& t1.getJsy().equals(map.get("jGh").toString())
 											&& t1.getXlbm().equals(map.get("xlBm").toString())) {
-										t = t1;
-										type = "update";
+										if(t1.getLp()==null){
+											//同人同车同线路不同路牌的过滤  （考虑到历史数据）
+											if (cMap.get(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString())==null) {
+												t = t1;
+												type = "update";
+												cMap.put(map.get("clZbh").toString()+map.get("jGh").toString()+map.get("xlBm").toString(),
+														map.get("clZbh").toString());
+											}
+										}else{
+											if(t1.getLp().equals(map.get("lpName").toString())){
+												t = t1;
+												type = "update";
+											}
+											
+										}
 									}
+									
+									
 								}
 								Double lc= Double.parseDouble(map.get("totalKilometers").toString());
 								if(map.get("seqNumber").toString().equals("1")){
@@ -576,7 +606,7 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 								t.setFgsdm(map.get("bCompany") == null ? "" : map.get("bCompany").toString());
 								t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 								t.setRq(sdf.parse(rq));
-								
+								t.setLp(map.get("lpName").toString());
 								 if(!(t.getSsgsdm().equals("") || t.getFgsdm().equals(""))){
 									 if(type.equals("add")){
 										 t.setCreatetime(date);
@@ -586,7 +616,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 									     updateList.add(t); 
 									  }
 								 }
-//								repository.save(t);
 								newMap.put("status", ResponseCode.SUCCESS);
 							}
 						}
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://localhost:3306/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://localhost:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root
+spring.datasource.password=
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root