电量

廖磊
1 parent a2c50bdd
Showing 5 changed files with 96 additions and 46 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/repository/oil/DlbRepository.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/resources/static/pages/electricity/list/list.html
@@ -180,4 +180,5 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 		return resList;
 	}
+	
 }
@@ -22,8 +22,9 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	@Modifying
 	@Query(value="SELECT a.*  FROM bsth_c_dlb a   where to_days(?1)-to_days(a.rq)=1"
 			+ " and jcsx=(select max(b.jcsx)  from  bsth_c_dlb b where a.nbbm=b.nbbm and "
-			+ " to_days(?1)-to_days(b.rq)=1 )",nativeQuery=true)
-	List<Dlb> obtainYlbefore(String rq);
+			+ " to_days(?1)-to_days(b.rq)=1 )  and ssgsdm like %?2%  and fgsdm like %?3% and "
+			+ " xlbm like %?4% and nbbm like %?5%",nativeQuery=true)
+	List<Dlb> obtainYlbefore(String rq,String gsdm,String fgsdm,String xlbm,String nbbm);
 	/**
 	 * 当天DLB信息
 	 * @param rq
@@ -31,8 +32,10 @@ public interface DlbRepository extends BaseRepository&lt;Dlb, Integer&gt;{
 	 */
 	@Transactional
 	@Modifying
-	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?)=to_days(rq)",nativeQuery=true)
-	List<Dlb> obtainDl(String rq);
+	@Query(value="SELECT * FROM bsth_c_dlb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc",nativeQuery=true)
+	List<Dlb> obtainDl(String rq,String gsbm,String fgsdm,String xlbm,String nbbm,String px);
 	@Query(value="select s from Dlb s "
 			+ " where to_days(?1)=to_days(s.rq) "
@@ -26,7 +26,9 @@ import org.springframework.stereotype.Service;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
+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;
@@ -97,13 +99,13 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, Object> newMap=new HashMap<String,Object>();
 		//当天DLB信息
-		List<Dlb> dlList=repository.obtainDl(rq);
+		List<Dlb> dlList=repository.obtainDl(rq, gsbm, "", line, "", "nbbm");
 		//当天YLXXB信息
 		List<Ylxxb> ylxxList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
 		//当天加电信息表
 		List<Jdl> jdlList=jdlRepository.JdlList(rq);
 		//前一天所有车辆最后进场班次信息
-		List<Dlb> dlListBe=repository.obtainYlbefore(rq);
+		List<Dlb> dlListBe=repository.obtainYlbefore(rq, "", "", "", "");
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
@@ -258,25 +260,48 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 	@Override
 	public Map<String, Object> checkDl(Map<String, Object> map) {
 		Map<String, Object> newMap=new HashMap<String,Object>();
-		String xlbm=map.get("xlbm_eq").toString();
-		String gsbm="";
-		if(map.get("ssgsdm_like")!=null){
-			gsbm=map.get("ssgsdm_like").toString();
-		}
+//		String xlbm="";
+//		if(map.get("xlbm_like")!=null){
+//			xlbm=map.get("xlbm_like").toString();
+//		}
 		// TODO Auto-generated method stub
+		
+		List<Cars> carsList = carsRepository.findCars();
+		Map<String, String> carsMap = new HashMap<String, String>();
+		for (int i = 0; i < carsList.size(); i++) {
+			Cars c = carsList.get(i);
+			carsMap.put(c.getInsideCode(), c.getBrancheCompanyCode()==null?"":c.getBrancheCompanyCode());
+		}
+		
 		try{
 			//获取车辆存油信息
-//			List<Cyl> cylList=cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
+			
 			String rq=map.get("rq").toString();
-			List<Dlb> dlbList=repository.obtainDl(rq);
-			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,1,gsbm);
-			//当天加电信息表
-			List<Jdl> jdlList=jdlRepository.JdlList(rq);
+			String xlbm="";
+			if(map.get("xlbm_like")!=null){
+				xlbm= map.get("xlbm_like").toString().trim();
+			}
+			String gsbm="";
+			if(map.get("ssgsdm_like")!=null){
+				gsbm=map.get("ssgsdm_like").toString();
+			}
+			String fgsbm="";
+			if(map.get("fgsdm_like")!=null){
+				fgsbm=map.get("fgsdm_like").toString();
+			}
+			String nbbm="";
+			if(map.get("nbbm_eq")!=null){
+				nbbm=map.get("nbbm_eq").toString();
+			}
+			List<Dlb> ylListBe=repository.obtainYlbefore(rq, gsbm, "", xlbm, nbbm);
+//			List<Cdl> cylList=cdlRepository.obtainCdl(nbbm, gsbm);
+			List<Dlb> ylbList=repository.obtainDl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm");
+			List<Ylxxb> ylxxbList=ylxxbRepository.obtainYlxx(rq,0,gsbm);
 			for (int i = 0; i < ylxxbList.size(); i++) {
 				Boolean fage=true;
 				Ylxxb y1=ylxxbList.get(i);
-				for(int y=0;y<dlbList.size();y++){
-					Dlb y2=dlbList.get(y);
+				for(int y=0;y<ylbList.size();y++){
+					Dlb y2=ylbList.get(y);
 					if(y1.getNbbm().equals(y2.getNbbm())){
 						fage=false;
 						break;
@@ -290,37 +315,55 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJsy(y1.getJsy());
 					t.setCdl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					t.setXlbm(xlbm);
-					repository.save(t);
-				}
-			}
-			
-			for (int i = 0; i < jdlList.size(); i++) {
-				Boolean fage=true;
-				Jdl y1=jdlList.get(i);
-				for(int y=0;y<dlbList.size();y++){
-					Dlb y2=dlbList.get(y);
-					if(y1.getNbbm().equals(y2.getNbbm())){
-						fage=false;
-						break;
+					String fgsdm="";
+					if(null!=carsMap.get(y1.getNbbm())){
+						fgsdm=carsMap.get(y1.getNbbm());
+					}
+					t.setFgsdm(fgsdm);
+					t.setJcsx(1);
+					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
+					if(null !=line){
+						t.setXlbm(line.getLineCode());
+					}else{
+						t.setXlbm("");
+					}
+					t.setJcsx(1);
+					boolean status=true;
+					for (int j = 0; j < ylListBe.size(); j++) {
+						Dlb b=ylListBe.get(j);
+						if(b.getNbbm().equals(y1.getNbbm())){
+							t.setCzcd(b.getJzcd());
+							status=false;
+							break;
+						}
+					}
+					/*if(status){
+						for (int j = 0; j < cylList.size(); j++) {
+							Cyl c=cylList.get(j);
+							if(c.getNbbm().equals(y1.getNbbm())){
+								t.setCzyl(c.getCyl());
+								cyl=c;
+								status=false;
+								break;
+							}
+						}
+					}*/
+					if(status){
+						t.setCzcd(0.0);
+					}
+//					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
+					t.setJzcd(100.0);
+					t.setHd(0.0);
+					if(fgsdm.equals(fgsbm)){
+						repository.save(t);
 					}
-				}
-				
-				if(fage){
-					Dlb t=new Dlb();
-					t.setNbbm(y1.getNbbm());
-					t.setRq(y1.getRq());
-//					t.setJsy(y1.getJsy());
-					t.setCdl(y1.getJdl());
-					t.setSsgsdm(y1.getGsBm());
-					t.setXlbm(xlbm);
-					repository.save(t);
 				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
+			throw e;
 		}
 		return newMap;
@@ -701,7 +701,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 					t.setJsy(y1.getJsy());
 					t.setJzl(y1.getJzl());
 					t.setSsgsdm(y1.getGsdm());
-					String fgsdm=carsMap.get(y1.getNbbm());
+					String fgsdm="";
+					if(null !=carsMap.get(y1.getNbbm())){
+						fgsdm=carsMap.get(y1.getNbbm());
+					}
 					t.setFgsdm(fgsdm);
 					t.setJcsx(1);
 					Line line= BasicData.nbbm2LineMap.get(y1.getNbbm());
@@ -737,7 +740,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 //					double jzyl=Arith.add(t.getJzl(), t.getCzyl());
 					t.setJzyl(Arith.add(t.getJzl(), t.getCzyl()));
 					t.setYh(0.0);
-					if(fgsdm.equals("fgsbm")){
+					if(fgsdm.equals(fgsbm)){
 						repository.save(t);
 						if(null!=cyl){
 							cyl.setCyl(Arith.add(t.getJzl(), t.getCzyl()));
@@ -261,11 +261,11 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         //var id = 15;
         //$('.in_carpark_jzcd[data-id='+id+']', '#dl_oil_list')
-        $("#checkYl").on('click', function () {
+        $("#checkDl").on('click', function () {
             if ($("#rq").val() != "") {
                 var params=getParamsList();
                 var i = layer.load(2);
-                $get('/ylb/checkYl', params, function () {
+                $get('/dlb/checkDl', params, function () {
                 	layer.close(i);
                     jsDoQuery(params, true);
                 });