电量表添加

廖磊
1 parent 829cc488
Showing 1 changed file with 19 additions and 9 deletions
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
@@ -48,6 +48,7 @@ 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;
 @Service
 public class DlbServiceImpl extends BaseServiceImpl<Dlb,Integer> implements DlbService{
@@ -245,8 +246,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
-		List<Ylb> addList=new ArrayList<Ylb>();
-		List<Ylb> updateList=new ArrayList<Ylb>();
+		List<Dlb> addList=new ArrayList<Dlb>();
+		List<Dlb> updateList=new ArrayList<Dlb>();
 		for(int x=0;x<listpb.size();x++){
 			String type="add";
 			boolean sfdc=false;
@@ -332,12 +333,11 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 					t.setJhsj(map.get("fcsj")==null?"":map.get("fcsj").toString());
 					t.setRq(sdf.parse(rq));
 					t.setCreatetime(new Date());
-					/*if(type.equals("add")){
+					if(type.equals("add")){
 						addList.add(t);
 					}else{
 						updateList.add(t);
-					}*/
-					repository.save(t);
+					}
 					newMap.put("status", ResponseCode.SUCCESS);
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
@@ -346,20 +346,30 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 				}
 			}
 		}
-	/*	try {
+		try {
 			if(addList.size()>0){
-				new BatchSaveUtils<Ylb>().saveList(addList, Ylb.class);
+				try{
+				new BatchSaveUtils<Dlb>().saveList(addList, Dlb.class);
+				} catch (Exception e) {
+					// TODO: handle exception
+					if(e.getMessage().indexOf("PK_DLB_UK")>0){
+						newMap.put("fage", "存在相同数据,数据已经过滤");
+						logger.info("获取:存在相同数据,数据已经过滤");
+					}
+				}
 			}
 			if(updateList.size()>0){
-				
+				for (int i = 0; i < updateList.size(); i++) {
+					repository.save(updateList.get(i));
+				}
 			}
 			newMap.put("status", ResponseCode.SUCCESS);
 		}
 		catch (Exception e) {
 			// TODO: handle exception
 			newMap.put("status", ResponseCode.ERROR);
-		}*/
+		}
 		return newMap;
 	}