Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang # Conflicts: # src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
廖磊
2 parents a457f9b5 2e25f1c9
Showing 14 changed files with 184 additions and 73 deletions
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/LineConfigData.java
src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/TimedEnableStationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/ScheduleComparator.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/oil/impl/YlxxbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
 package com.bsth.controller.realcontrol;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.service.realcontrol.RealMapService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -74,4 +77,9 @@ public class RealMapController {
     public Map<String, Object> multiSectionRoute(@RequestParam String codeIdx){
         return realMapService.multiSectionRoute(codeIdx);
     }
+
+    @RequestMapping(value = "/lockAndFlxedTimeEnabled", method = RequestMethod.POST)
+    public void lockAndFlxedTimeEnabled(TimedEnableStationRoute tes){
+        GeoCacheData.tesMap.put(tes.getLineCode(), tes);
+    }
 }
@@ -102,7 +102,7 @@ public class anomalyCheckController {
     }
     @RequestMapping(value = "/findSchByLpName")
-    public List<ScheduleRealInfo> findSchByLpName(String lpName){
+    public List<ScheduleRealInfo> findSchByLpName(@RequestParam String lpName){
         return dayOfSchedule.getLpScheduleMap().get(lpName);
     }
 }
@@ -77,7 +77,7 @@ public class LineConfigData implements CommandLineRunner {
     public long applyIn(ScheduleRealInfo sch, Long timestamp){
         LineConfig config = lineConfMap.get(sch.getXlBm());
         int diff = sch.getXlDir().equals("0")?config.getUpInDiff():config.getDownInDiff();
-        return timestamp - (diff * 1000);
+        return timestamp + (diff * 1000);
     }
     @Component
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata.arrival;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.TimedEnableStationRoute;
 import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
 import com.google.common.collect.ArrayListMultimap;
@@ -53,6 +54,10 @@ public class GeoCacheData {
     //线路限速信息
     private static Map<String, Double> speedLimitMap;
+    //需要定时刷新的站点路由
+    public static Map<String, TimedEnableStationRoute> tesMap = new HashMap<>();
+    //TimedEnableStationRoute
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -282,6 +287,28 @@ public class GeoCacheData {
                 connectStationRoute(tempMap.get(key));
             }
+            //定时启用的站点走向
+            if(tesMap.size() > 0){
+                List<String> rems = new ArrayList<>();
+                long t = System.currentTimeMillis();
+                for(TimedEnableStationRoute tes : tesMap.values()){
+                    if(tes.getEnableTime() > t){
+                        logger.info("锁住站点路由，"  + tes.getLineCode());
+                        tempMap.replaceValues(tes.getLineCode() + "_0", stationCacheMap.get(tes.getLineCode() + "_0"));
+                        tempMap.replaceValues(tes.getLineCode() + "_1", stationCacheMap.get(tes.getLineCode() + "_1"));
+                    }
+                    else
+                        rems.add(tes.getLineCode());
+                }
+
+                //remove
+                if(rems.size() > 0){
+                    for(String lineCode : rems){
+                        logger.info("启用路由，"  + lineCode);
+                        tesMap.remove(lineCode);
+                    }
+                }
+            }
             stationCacheMap = tempMap;
             routeCodeMap = codeMap;
         }
+package com.bsth.data.gpsdata.arrival.entity;
+
+/**
+ * 定时启用站点路由
+ * Created by panzhao on 2017/8/28.
+ */
+public class TimedEnableStationRoute {
+
+    private String lineCode;
+
+    private Long enableTime;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public Long getEnableTime() {
+        return enableTime;
+    }
+
+    public void setEnableTime(Long enableTime) {
+        this.enableTime = enableTime;
+    }
+}
@@ -65,8 +65,8 @@ public class AbnormalStateHandle extends SignalHandle{
      * @return
      */
     public boolean outOfBounds(GpsEntity gps){
-        //场内的车不处理
-        if(gps.getInstation() == 2){
+        //只处理电子围栏外的车
+        if(gps.getInstation() != 0){
             return false;
         }
@@ -239,9 +239,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         long t2 = gps.getTimestamp();
         long c = sch.getDfsjT();
-        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+        /*if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }*/
+        int threshold = 1000 * 60 * 5;
+        if(Math.abs(t2 - c) < threshold && c - t1 > threshold){
             return true;
         }
+        //if(Math.abs(t2 - c) < 1000 * 60 * 5 && c - t1 > 1000 * 60 * 5)
         return false;
     }
@@ -255,7 +260,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         if (config != null && config.getOutConfig() == 2) {
             //出站既出场
             ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-            if (schPrev != null && schPrev.getBcType().equals("out")
+            if (schPrev != null && schPrev.getBcType().equals("out") && (schPrev.getBcsj()==0 || schPrev.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(schPrev.getQdzCode()))) {
                 schPrev.setFcsjActualAll(sch.getFcsjActualTime());
@@ -447,7 +452,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -60,7 +60,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String nbbm : keys) {
             Collections.sort(listMap.get(nbbm), comp);
             threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-088"))
+            /*if(nbbm.equals("W09-164"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
             /*if(lineId.equals("60028"))
                 new RecoveryThread(listMap.get(lineId), count).run();*/
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=207";// + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=241";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -153,7 +153,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 boolean task;
                 for (GpsEntity gps : list) {
                     try {
-                        /*if(gps.getTimestamp() >= 1500942270000L){
+                        /*if(gps.getTimestamp() >= 1503960000000L){
                             System.out.println("debugger...");
                         }*/
                         //是否有任务
@@ -278,12 +278,14 @@ public class DayOfSchedule {
         List<String> lprms = new ArrayList<>();
         Set<String> lps = lpScheduleMap.keySet();
         for (String lp : lps) {
-            if (lp.indexOf(lineCode + "_") != -1)
+            if (lp.startsWith(lineCode + "_"))
                 lprms.add(lp);
         }
-        for (String lp : lprms)
+        for (String lp : lprms){
+            logger.info("清理路牌映射 " + lp);
             lpScheduleMap.removeAll(lp);
+        }
         logger.info(lineCode + "排班清理 " + count);
     }
@@ -571,7 +573,7 @@ public class DayOfSchedule {
                 continue;
             //出站既出场，忽略出场班次
-            if (outConfig == 2 && temp.getBcType().equals("out")
+            if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
                     && (!limitPark || park.equals(temp.getQdzCode())))
                 continue;
@@ -117,8 +117,7 @@ public class SchAttrCalculator {
 		for(int i = 1; i < len; i ++){
 			curr = list.get(i);
-			if(prve.getZdzName().equals(curr.getQdzName())
-					|| prve.getZdzCode().equals(curr.getQdzCode())){
+			if(isJoin(prve, curr)){
 				curr.setQdzArrDatejh(prve.getZdsj());
 				if(StringUtils.isNotEmpty(prve.getZdsjActual()))
 					curr.setQdzArrDatesj(prve.getZdsjActual());
@@ -126,6 +125,13 @@ public class SchAttrCalculator {
 			prve = curr;
 		}
 	}
+
+	private boolean isJoin(ScheduleRealInfo prve, ScheduleRealInfo curr) {
+		return prve.getZdzName().equals(curr.getQdzName())//名称相等
+				|| prve.getZdzCode().equals(curr.getQdzCode())//编码相等
+				|| prve.getZdzName().startsWith(curr.getQdzName())//起始包括
+				|| curr.getQdzName().startsWith(prve.getZdzName());//起始包括
+	}
 	/**
 	 * 
@@ -3,6 +3,8 @@ package com.bsth.data.schedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 /**
  * 
@@ -20,20 +22,38 @@ public class ScheduleComparator {
 			return s1.getFcno() - s2.getFcno();
 		}
 	}*/
+
+	static Map<String, Integer> bcTypeOrderMap = new HashMap<>();
+
+	static{
+		bcTypeOrderMap.put("out", 0);
+		bcTypeOrderMap.put("normal", 1);
+		bcTypeOrderMap.put("region", 2);
+		bcTypeOrderMap.put("major", 3);
+		bcTypeOrderMap.put("venting", 4);
+		bcTypeOrderMap.put("ldks", 5);
+		bcTypeOrderMap.put("in", 6);
+	}
 	public static class FCSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getFcsjT() - s2.getFcsjT());
+			int diff = (int) (s1.getFcsjT() - s2.getFcsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
+	private static int typeOrder(String bcType){
+		return bcTypeOrderMap.get(bcType)!=null?bcTypeOrderMap.get(bcType):0;
+	}
+
 	public static class DFSJ  implements Comparator<ScheduleRealInfo>{
 		@Override
 		public int compare(ScheduleRealInfo s1, ScheduleRealInfo s2) {
-			return (int) (s1.getDfsjT() - s2.getDfsjT());
+			int diff = (int) (s1.getDfsjT() - s2.getDfsjT());
+			return diff!=0?diff:typeOrder(s1.getBcType()) - typeOrder(s2.getBcType());
 		}
 	}
 }
@@ -217,6 +217,14 @@ public class ScheduleRealInfo {
 	/** 是否需要补充GPS信号 （网关提交至运管处动态数据用） 1: 能发车， 2：能到达  3: 补发过*/
 	private int siginCompate;
+	/**
+	 * 漂移状态
+	 * 1: 发车漂移
+	 * 2：到站漂移
+	 * 3：中途漂移
+	 */
+	private int driftStatus = 0;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -933,4 +941,12 @@ public class ScheduleRealInfo {
 	public void setSiginCompate(int siginCompate) {
 		this.siginCompate = siginCompate;
 	}
+
+	public int getDriftStatus() {
+		return driftStatus;
+	}
+
+	public void setDriftStatus(int driftStatus) {
+		this.driftStatus = driftStatus;
+	}
 }
@@ -50,25 +50,25 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 	JdbcTemplate jdbcTemplate;
 	@Override
 	public PageObject<Ylxxb> Pagequery(Map<String, Object> map) {
-		
+
 		String rq=map.get("yyrq").toString();
 		String gsdm=map.get("gsdm_like").toString();
 		String fgsdm=map.get("fgsdm_like").toString();
-		
-	String sql="	select * from ("
-			+ "select *,CONCAT(nbbm,jsy)  as nj "
-			+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
-			+ " and gsdm ='"+gsdm+"' and jylx ='0') x where x.nj not in ("
-			+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
-			+ " where rq='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
-			+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
-			+ " where rq='"+rq+"'"
-			+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
-					+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
-					+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx ='1')";
-		
-		
+
+		String sql="	select * from ("
+				+ "select *,CONCAT(nbbm,jsy)  as nj "
+				+ " from bsth_c_ylxxb where yyrq='"+rq+"' "
+				+ " and gsdm ='"+gsdm+"' and jylx ='0') x where x.nj not in ("
+				+ " select CONCAT(nbbm,jsy)  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"')"
+				+ " and x.nbbm in (select nbbm  from bsth_c_ylb "
+				+ " where rq='"+rq+"'"
+				+ " and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"') "
+				+ " and x.nbbm not in (select nbbm from bsth_c_ylxxb"
+				+ " where yyrq='"+rq+"' and gsdm ='"+gsdm+"' AND jylx ='1')";
+
+
 		/*String sql= "select v.*,u.jsy as ldgh  from "
 				+ " ( select *  from   bsth_c_ylxxb x  where  "
 				+ " DATE_FORMAT(x.yyrq,'%Y-%m-%d')='"+rq+"'  and x.gsdm='"+gsdm+"'"
@@ -83,43 +83,43 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 				+ " where DATE_FORMAT(rq,'%Y-%m-%d')='"+rq+"'"
 				+ " and ssgsdm='"+gsdm+"'  and fgsdm='"+fgsdm+"' )  u "
 				+ " on  v.nbbm=u.nbbm ";*/
-		
+
 		//根具条件查询指定日期Ylxxb的数据
 //		List<Ylxxb> iterator=repository.checkYlxx(rq,gsdm);
 		/*if(map.get("gsdm_in")!=null){
 			map.put("ssgsdm_in", map.get("gsdm_in"));
 			map.remove("gsdm_in");
-			
+
 		}else{
 			map.put("ssgsdm_like", map.get("gsdm_like"));
 			map.remove("gsdm_like");
 		}*/
-		
+
 		//根具条件查询指定日期Ylb的数据
 //		List<Ylb> ylbIterator=ylbRepository.checkYl(rq,gsdm,fgsdm);
-		List<Ylxxb> list=jdbcTemplate.query(sql,  
-		        new RowMapper<Ylxxb>(){  
-            @Override  
-            public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {  
-            	Ylxxb s  = new Ylxxb(); 
-            	s.setId(rs.getInt("id"));
-            	s.setYyrq(rs.getDate("yyrq"));
-            	s.setNbbm(rs.getString("nbbm"));
-            	s.setGsdm(rs.getString("gsdm"));
-            	s.setFgsdm(rs.getString("fgsdm"));
-            	s.setJsy(rs.getString("jsy"));
-            	s.setJzl(rs.getDouble("jzl"));
-            	s.setStationid(rs.getString("stationid"));
-            	s.setNylx(rs.getInt("nylx"));
-            	s.setJyggh(rs.getString("jyggh"));
-            	s.setYj(rs.getDouble("yj"));
+		List<Ylxxb> list=jdbcTemplate.query(sql,
+				new RowMapper<Ylxxb>(){
+					@Override
+					public Ylxxb  mapRow(ResultSet rs, int rowNum) throws SQLException {
+						Ylxxb s  = new Ylxxb();
+						s.setId(rs.getInt("id"));
+						s.setYyrq(rs.getDate("yyrq"));
+						s.setNbbm(rs.getString("nbbm"));
+						s.setGsdm(rs.getString("gsdm"));
+						s.setFgsdm(rs.getString("fgsdm"));
+						s.setJsy(rs.getString("jsy"));
+						s.setJzl(rs.getDouble("jzl"));
+						s.setStationid(rs.getString("stationid"));
+						s.setNylx(rs.getInt("nylx"));
+						s.setJyggh(rs.getString("jyggh"));
+						s.setYj(rs.getDouble("yj"));
 //            	s.setLdgh(rs.getString("ldgh"));
-            	s.setBz(rs.getString("bz"));
-                return s;  
-            }  
-		});  
-		
-		
+						s.setBz(rs.getString("bz"));
+						return s;
+					}
+				});
+
+
 		List<Ylb> listylb=ylbRepository.obtainYl(rq, gsdm, fgsdm, "", "", "nbbm");
 		for (int i = 0; i < list.size(); i++) {
 			String ldgh="";
@@ -129,11 +129,11 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					if(ldgh.equals(""))
 						ldgh +=ylb.getJsy();
 					else
-					    ldgh += ","+ylb.getJsy();
+						ldgh += ","+ylb.getJsy();
 				}
 			}
 			list.get(i).setLdgh(ldgh);
-			
+
 		}
 		//正式使用用下面代码
 //		for (int i = 0; i < iterator.size(); i++) {
@@ -154,16 +154,16 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 //				list.add(y1);
 //			}
 //		}
-		
-		
-		
+
+
+
 		PageHelper pageHelper = new PageHelper(list.size(), map);
 		pageHelper.getMap();
 		PageObject<Ylxxb> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
 	}
-	@Transactional  
+	@Transactional
 	@Override
 	public Map<String, Object> checkJsy(Map<String, Object> map) throws Exception{
 		Map<String, Object> newMap=new HashMap<String,Object>();
@@ -188,7 +188,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 					repository.save(ylxxb);
 				}
 			}
-		newMap.put("status", ResponseCode.SUCCESS);
+			newMap.put("status", ResponseCode.SUCCESS);
 		}catch(Exception e){
 			newMap.put("status", ResponseCode.ERROR);
 			logger.error("save erro.", e);
@@ -235,6 +235,7 @@ public class YlxxbServiceImpl extends BaseServiceImpl&lt;Ylxxb,Integer&gt; implements 
 		return list;
 	}
+
 	@Transactional  
 	@Override
 	public Map<String, Object> checkNbbm(Map<String, Object> map) throws Exception{
@@ -4077,8 +4077,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long zdsjActual_=Long.parseLong(zdsjActual_s[0])*60+Long.parseLong(zdsjActual_s[1]);
             	 if((zdsj_-zdsjActual_)>0){
             		 zdsjk =String.valueOf(zdsj_-zdsjActual_);
-            	 }
-            	 if(((zdsj_-zdsjActual_)<0)){
+            	 }else{
             		 zdsjm =String.valueOf(zdsjActual_-zdsj_);
             	 }
              }
@@ -4105,8 +4104,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             	 Long fcsjActural_=Long.parseLong(fcsjActural_s[0])*60+Long.parseLong(fcsjActural_s[1]);
             	 if((zdsj_-fcsjActural_)>0){
             		 fcsjk =String.valueOf(zdsj_-fcsjActural_);
-            	 }
-            	 if((zdsj_-fcsjActural_)<0){
+            	 }else{
             		 fcsjm =String.valueOf(fcsjActural_-zdsj_);
             	 }
              }
@@ -4671,8 +4669,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         mr.setSjyygl(rs.getDouble("sjyygl"));
                         mr.setSjksgl(rs.getDouble("sjksgl"));
                         mr.setZgl(rs.getDouble("zyygl"));
-                        mr.setZddfgl(rs.getDouble("sddfgl"));
-                        mr.setSddfgl(rs.getDouble("zddfgl"));
+                        mr.setZddfgl(rs.getDouble("zddfgl"));
+                        mr.setSddfgl(rs.getDouble("sddfgl"));
                         mr.setWqwxhgl(rs.getDouble("wqwxhgl"));
                         mr.setBfwxhgl(rs.getDouble("bfwxhgl"));
                         mr.setPygl(rs.getDouble("pygl"));
@@ -4765,8 +4763,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				sReport.setSjyybc(rs.getInt("sjyybc"));
 				sReport.setSjksbc(rs.getInt("sjksbc"));
 				sReport.setZbc(rs.getInt("zyybc"));
-				sReport.setZddfbc(rs.getInt("sddfbc"));
-				sReport.setSddfbc(rs.getInt("zddfbc"));
+				sReport.setZddfbc(rs.getInt("zddfbc"));
+				sReport.setSddfbc(rs.getInt("sddfbc"));
 				sReport.setWqwxhbc(rs.getInt("wqwxhbc"));
 				sReport.setBfwxhbc(rs.getInt("bfwxhbc"));
 				sReport.setPybc(rs.getInt("pybc"));