Merge branch 'minhang' into pudong

潘钊
2 parents 4eb71a74 3ebf183b
Showing 22 changed files with 312 additions and 262 deletions
src/main/java/com/bsth/controller/CarParkController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/data/car_out_info/CarOutInfoHandler.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/client/ClientApp.java
src/main/java/com/bsth/data/gpsdata/client/DataMonitor.java
src/main/java/com/bsth/data/gpsdata/client/GpsBeforeBuffer.java
src/main/java/com/bsth/data/gpsdata/client/pd/codec/MessageDecoder.java
src/main/java/com/bsth/data/gpsdata/client/pd/common/ConvertUtil.java
src/main/java/com/bsth/data/gpsdata/client/pd/handler/PdClientHandler.java
src/main/java/com/bsth/data/gpsdata/client/pf/codec/MessageDecoder.java
src/main/java/com/bsth/data/gpsdata/client/pf/handler/PfClientHandler.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/entity/CarPark.java
src/main/java/com/bsth/repository/CarParkRepository.java
src/main/java/com/bsth/service/CarParkService.java
src/main/java/com/bsth/service/impl/CarParkServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/shiftloop/ScheduleRule_input.java
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("carpark")
 public class CarParkController extends BaseController<CarPark, Integer> {
-	
 	@Autowired
 	CarParkService service;
@@ -26,16 +25,10 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
 	 */
 	@RequestMapping(value="getCarParkCode" , method = RequestMethod.GET)
 	public Map<String, Object> getStationCode() {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
-		resultMap.put("carParkCode", "FFFF" + GetUIDAndCode.getCarParkId());
-		
+		resultMap.put("carParkCode", "FFFFFF" + GetUIDAndCode.getCarParkId());
 		return resultMap;
-		
 	}
-	
-	
 	/**
 	 * 新增停车场信息
 	 * 
@@ -53,21 +46,14 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
 	 */
 	@RequestMapping(value="carParkSave" , method = RequestMethod.POST)
 	public Map<String, Object> stationSave(@RequestParam Map<String, Object> map) {
-		
 		map.put("createBy", "");
-		
 		map.put("updateBy", "");
-		
 		return service.carParkSave(map);
-		
 	}
-	
 	@RequestMapping(value = "findCarParkInfoFormId",method = RequestMethod.GET)
 	public List<Map<String, Object>> findCarParkInfoFormId(@RequestParam Map<String, Object> map) {
-		
 		return service.findCarParkInfoFormId(map);
 	}
-	
 	/**
 	 * 修改停车场信息
 	 * 
@@ -85,11 +71,12 @@ public class CarParkController extends BaseController&lt;CarPark, Integer&gt; {
 	 */
 	@RequestMapping(value="carParkUpdate" , method = RequestMethod.POST)
 	public Map<String, Object> carParkUpdate(@RequestParam Map<String, Object> map) {
-		
 		map.put("updateBy", "");
-		
 		return service.carParkUpdate(map);
-		
 	}
+	@RequestMapping(value="isHaveParkCode",method=RequestMethod.GET)
+	public boolean isHaveParkCode(@RequestParam Map<String,Object> map) {
+		return service.selectTccInfoByCode(map);
+	}
 }
@@ -51,9 +51,26 @@ public class anomalyCheckController {
         }
     }
-    @RequestMapping(value = "/gpsClientReconn", method = RequestMethod.POST)
+    @Autowired
+    ClientApp clientApp;
+
+    @RequestMapping(value = "/gpsClientDestroy", method = RequestMethod.POST)
     public void gpsClientReconn(){
-        ClientApp.pdreconn();
-        ClientApp.pfreconn();
+        clientApp.destroy();
+    }
+
+    @RequestMapping(value = "/gpsClientInit", method = RequestMethod.POST)
+    public void gpsClientInit(){
+        clientApp.init();
+    }
+
+    @RequestMapping(value = "/pdClose", method = RequestMethod.POST)
+    public void pdClose(){
+        ClientApp.pdClose();
+    }
+
+    @RequestMapping(value = "/pfClose", method = RequestMethod.POST)
+    public void pfClose(){
+        ClientApp.pfClose();
     }
 }
@@ -101,10 +101,10 @@ public class CarOutInfoHandler implements CommandLineRunner, CarOutInfo {
                 ps.setString(1, sch.getScheduleDateStr());
                 ps.setString(2, sch.getXlBm());
                 ps.setString(3, sch.getXlName());
-                ps.setString(4, sch.getLpName());
-                ps.setInt(5, sch.getFcno());
-                ps.setString(6, sch.getDfsj());
-                ps.setString(7, sch.getClZbh());
+                ps.setString(4, /*sch.getLpName()*/"0");
+                ps.setInt(5, sch.getFcno()==null?-1:sch.getFcno());
+                ps.setString(6, sch.getDfsj().replace(":", ""));
+                ps.setString(7, sch.getClZbh().replace("-", ""));
                 ps.setString(8, BasicData.nbbmCompanyPlateMap.get(sch.getClZbh()));
                 ps.setString(9, bcTypeMap.containsKey(sch.getBcType()) ? bcTypeMap.get(sch.getBcType()) : sch.getBcType());
                 ps.setString(10, sch.getZdzName());
@@ -4,6 +4,7 @@ import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.client.ClientApp;
+import com.bsth.data.gpsdata.client.GpsBeforeBuffer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
 import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -17,6 +18,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 /**
@@ -30,7 +32,7 @@ public class GpsRealData implements CommandLineRunner {
     static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
-    private static Map<String, GpsEntity> gpsMap;
+    private static ConcurrentHashMap<String, GpsEntity> gpsMap;
     //按线路分组设备号
     private static TreeMultimap<String, String> lineCode2Devices;
@@ -51,12 +53,14 @@ public class GpsRealData implements CommandLineRunner {
      * 构造函数
      */
     public GpsRealData() {
-        gpsMap = new HashMap<>();
+        gpsMap = new ConcurrentHashMap<>();
         lineCode2Devices = TreeMultimap.create();
     }
     @Autowired
     ClientApp clientApp;
+    @Autowired
+    GpsBeforeBuffer gpsBeforeBuffer;
     @Override
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,3");
@@ -67,6 +71,7 @@ public class GpsRealData implements CommandLineRunner {
         //gps 客户端
         //clientApp.init();
+        //gpsBeforeBuffer.init();
     }
@@ -11,6 +11,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
@@ -42,25 +44,26 @@ public class GpsRealAnalyse {
     @Autowired
     GpsRealData gpsRealData;
-    //50个线程
-    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(100);
     public void analyse(List<GpsEntity> list) {
         //如果正在恢复数据
         if (GpsDataRecovery.run)
             return;
+
+        long t = System.currentTimeMillis();
         logger.info("analyse gps size: " + list.size());
-        //按车辆分组gps
+        //按线路分组gps
         ArrayListMultimap multimap = ArrayListMultimap.create();
         for(GpsEntity gps : list){
-            multimap.put(gps.getNbbm(), gps);
+            multimap.put(gps.getLineId(), gps);
         }
         Set<String> ks = multimap.keySet();
         CountDownLatch count = new CountDownLatch(ks.size());
-        for(String nbbm : ks){
-            threadPool.execute(new SignalHandleThread(multimap.get(nbbm), count));
+        for(String lineCode : ks){
+            threadPool.execute(new SignalHandleThread(multimap.get(lineCode), count));
         }
         try {
@@ -70,11 +73,15 @@ public class GpsRealAnalyse {
             //加入实时gps对照
             for(GpsEntity gps: list)
                 gpsRealData.put(gps);
+
+            logger.info("time , " + (System.currentTimeMillis() - t));
         } catch (InterruptedException e) {
             logger.error("", e);
         }
     }
+    static GpsComp comp = new GpsComp();
+
     public class SignalHandleThread implements Runnable {
         List<GpsEntity> list;
@@ -89,6 +96,7 @@ public class GpsRealAnalyse {
         public void run() {
             try {
+                Collections.sort(list, comp);
                 for(GpsEntity gps : list){
                     //是否有任务
                     boolean task;
@@ -119,4 +127,12 @@ public class GpsRealAnalyse {
             }
         }
     }
+
+    public static class GpsComp implements Comparator<GpsEntity> {
+
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        }
+    }
 }
@@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.net.InetSocketAddress;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 /**
  * Created by panzhao on 2017/5/4.
@@ -43,17 +40,9 @@ public class ClientApp {
     GpsBeforeBuffer gpsBeforeBuffer;
     static Logger logger = LoggerFactory.getLogger(ClientApp.class);
+    private static ExecutorService exec;
-    private ScheduledExecutorService sexec = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-
-        @Override
-        public Thread newThread(Runnable r) {
-            // TODO Auto-generated method stub
-            Thread t = new Thread(r);
-            t.setName("SessionCheckExecutor");
-            return t;
-        }
-    });
+    private ScheduledExecutorService sexec;
     public static boolean dconnect(String device) {
         boolean flag = false;
@@ -85,12 +74,66 @@ public class ClientApp {
         return flag;
     }
+    public static void pdconnect(final String device) {
+        exec.submit(new Runnable() {
+
+            @Override
+            public void run() {
+                // TODO Auto-generated method stub
+                long now = System.currentTimeMillis();
+                boolean flag = false;
+                while (!flag) {
+                    flag = dconnect(device);
+                }
+                System.out.println("设备编号:" + device + "重连, cost time: " + (System.currentTimeMillis() - now));
+            }
+        });
+    }
+
+    public static void pfconnect(final String device) {
+        exec.submit(new Runnable() {
+
+            @Override
+            public void run() {
+                // TODO Auto-generated method stub
+                long now = System.currentTimeMillis();
+                boolean flag = false;
+                while (!flag) {
+                    flag = fconnect(device);
+                }
+                System.out.println("重连, cost time: " + (System.currentTimeMillis() - now));
+            }
+        });
+    }
+
     public static void pdreconn(){
-        dconnect(ConfigUtil.get("forward.device.name"));
+        pdconnect(ConfigUtil.get("forward.device.name"));
     }
     public static void pfreconn(){
-        fconnect(ConfigUtil.get("forward.device.name"));
+        pfconnect(ConfigUtil.get("forward.device.name"));
+    }
+
+    public void destroy(){
+        try {
+            logger.warn("socket client destroy!!!");
+            exec.shutdownNow();
+            sexec.shutdownNow();
+
+            pdDataConnector.dispose(true);
+            pfDataConnector.dispose(true);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+
+    public static void pdClose(){
+        pdSession.closeNow();
+    }
+
+    public static void pfClose(){
+        pfSession.closeNow();
     }
     public static boolean fconnect(String device) {
@@ -111,7 +154,17 @@ public class ClientApp {
     }
     public void init() {
-        //exec = Executors.newFixedThreadPool(4);
+        logger.warn("socket client init...");
+        exec = Executors.newFixedThreadPool(50);
+        sexec = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                // TODO Auto-generated method stub
+                Thread t = new Thread(r);
+                t.setName("SessionCheckExecutor");
+                return t;
+            }
+        });
         sexec.scheduleAtFixedRate(new SessionChecker(), 1, 1, TimeUnit.MINUTES);
         /*******************************浦东********************************/
         pdDataConnector = new NioSocketConnector();
@@ -133,7 +186,7 @@ public class ClientApp {
         pdDataConnector.setHandler(pdClient);
-        dconnect(ConfigUtil.get("forward.device.name"));
+        pdconnect(ConfigUtil.get("forward.device.name"));
         /*******************************浦东转发********************************/
         pfDataConnector = new NioSocketConnector();
@@ -153,10 +206,7 @@ public class ClientApp {
         config1.setIdleTime(IdleStatus.BOTH_IDLE, 60);
         pfDataConnector.setHandler(pfClient);
-        fconnect(ConfigUtil.get("forward.device.name"));
-
-
-        gpsBeforeBuffer.init();
+        pfconnect(ConfigUtil.get("forward.device.name"));
     }
@@ -182,6 +232,5 @@ public class ClientApp {
                 logger.error("SessionChecker异常", e);
             }
         }
-
     }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.client;
-
-/**
- * Created by panzhao on 2017/5/7.
- */
-public class DataMonitor {
-
-    public static long lastTimePd;
-
-    public static long lastTimePf;
-
-}
@@ -6,6 +6,8 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
 import com.bsth.data.gpsdata.client.pd.protocol.BasicInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -63,9 +65,10 @@ public class GpsBeforeBuffer {
     }
     public void init(){
-        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20 * 1000, 1100, TimeUnit.MILLISECONDS);
+        Application.mainServices.scheduleWithFixedDelay(gpsHandleThread, 20 * 1000, 1200, TimeUnit.MILLISECONDS);
     }
+    static int idleCount = 0;
     @Component
     public static class GpsHandleThread extends Thread{
@@ -74,18 +77,33 @@ public class GpsBeforeBuffer {
         @Autowired
         GpsRealAnalyse gpsRealAnalyse;
+        @Autowired
+        ClientApp clientApp;
+
+        Logger log = LoggerFactory.getLogger(this.getClass());
+
         @Override
         public void run() {
-            list = new ArrayList<>(100);
+            list = new ArrayList<>(200);
             GpsEntity gps;
-            for(int i = 0; i < 2000; i ++){
+            for(int i = 0; i < 4000; i ++){
                 gps = linkedList.poll();
                 if(gps == null)
                     break;
                 list.add(gps);
             }
+            if(list.size() == 0){
+                idleCount ++;
+                //连续40次没有数据，重建socket连接
+                if(idleCount == 40){
+                    log.info("idleCount == 40");
+                    idleCount = 0;
+                    clientApp.destroy();
+                    clientApp.init();
+                }
+            }
             gpsRealAnalyse.analyse(list);
         }
     }
 package com.bsth.data.gpsdata.client.pd.codec;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
 import com.bsth.data.gpsdata.client.pd.protocol.PdMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 public class MessageDecoder extends CumulativeProtocolDecoder {
+	Logger log = LoggerFactory.getLogger(MessageDecoder.class);
+
 	@Override
 	protected boolean doDecode(IoSession session, IoBuffer in,
 			ProtocolDecoderOutput out) throws Exception {
@@ -19,15 +24,18 @@ public class MessageDecoder extends CumulativeProtocolDecoder {
 			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
 			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
 				if (in.remaining() > len) {
-					byte[] bytes = new byte[len + 1];
-					in.get(bytes);
-					PdMessage msg = new PdMessage();
-					msg.read(bytes);
-					out.write(msg);
-					/*if ("true".equals(ConfigUtil.getProperty("protocolup", "true"))) {
-						UpProtocolDataService.getInstance().write(new byte[]{ head1, head2, lenh, lenl });
-						UpProtocolDataService.getInstance().write(bytes);
-					}*/
+					try {
+						byte[] bytes = new byte[len + 1];
+						in.get(bytes);
+						PdMessage msg = new PdMessage();
+						msg.read(bytes);
+						out.write(msg);
+
+						//日志纪录
+						log.info("pd client receive: " + ConvertUtil.bytesToHexString(bytes));
+					}catch (Exception e){
+						log.error("pd message decoder：", e);
+					}
 				} else {
 					in.reset();
 					return false;
@@ -126,4 +126,24 @@ public class ConvertUtil {
         return val;
 	}
+
+	/* Convert byte[] to hex string.这里我们可以将byte转换成int，然后利用Integer.toHexString(int)来转换成16进制字符串。
+        * @param src byte[] data
+* @return hex string
+*/
+	public static String bytesToHexString(byte[] src){
+		StringBuilder stringBuilder = new StringBuilder("");
+		if (src == null || src.length <= 0) {
+			return null;
+		}
+		for (int i = 0; i < src.length; i++) {
+			int v = src[i] & 0xFF;
+			String hv = Integer.toHexString(v);
+			if (hv.length() < 2) {
+				stringBuilder.append(0);
+			}
+			stringBuilder.append(hv);
+		}
+		return stringBuilder.toString();
+	}
 }
@@ -52,6 +52,7 @@ public class PdClientHandler extends IoHandlerAdapter{
 	@Override
     public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+        log.warn("pd sessionIdle");
 		session.closeNow();
     }
 package com.bsth.data.gpsdata.client.pf.codec;
+import com.bsth.data.gpsdata.client.pd.common.ConvertUtil;
 import com.bsth.data.gpsdata.client.pf.protocol.PfMessage;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 public class MessageDecoder extends CumulativeProtocolDecoder {
+	Logger log = LoggerFactory.getLogger(MessageDecoder.class);
+
 	@Override
 	protected boolean doDecode(IoSession session, IoBuffer in,
 			ProtocolDecoderOutput out) throws Exception {
@@ -19,11 +24,18 @@ public class MessageDecoder extends CumulativeProtocolDecoder {
 			int len = ((lenh & 0xff) << 8) + (lenl & 0xff);
 			if ((head1 & 0xff) == 0xfa && (head2 & 0xff) == 0xf5) {
 				if (in.remaining() > len) {
-					byte[] bytes = new byte[len + 1];
-					in.get(bytes);
-					PfMessage msg = new PfMessage();
-					msg.read(bytes);
-					out.write(msg);
+					try {
+						byte[] bytes = new byte[len + 1];
+						in.get(bytes);
+						PfMessage msg = new PfMessage();
+						msg.read(bytes);
+
+						//日志纪录
+						log.info("pf client receive: " + ConvertUtil.bytesToHexString(bytes));
+						out.write(msg);
+					}catch (Exception e){
+						log.error("pf message decoder：", e);
+					}
 				} else {
 					in.reset();
 					return false;
@@ -49,6 +49,7 @@ public class PfClientHandler extends IoHandlerAdapter{
 	@Override
     public void sessionIdle(IoSession session, IdleStatus status) throws Exception {
+		log.warn("pf sessionIdle");
 		session.closeNow();
     }
@@ -45,11 +45,11 @@ public class GpsDataRecovery implements ApplicationContextAware {
     public void recovery() {
         List<GpsEntity> list = loadData();
-        //按车辆分组数据
+        //按线路分组数据
         ArrayListMultimap<String, GpsEntity> listMap = ArrayListMultimap.create();
         for (GpsEntity gps : list) {
-            if (gps.getNbbm() != null)
-                listMap.put(gps.getNbbm(), gps);
+            if (gps.getLineId() != null)
+                listMap.put(gps.getLineId(), gps);
         }
@@ -57,9 +57,9 @@ public class GpsDataRecovery implements ApplicationContextAware {
         CountDownLatch count = new CountDownLatch(keys.size());
         GpsComp comp = new GpsComp();
-        for (String nbbm : keys) {
-            Collections.sort(listMap.get(nbbm), comp);
-            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
+        for (String lineId : keys) {
+            Collections.sort(listMap.get(lineId), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(lineId), count));
             /*if(nbbm.equals("W7C-001"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
         }
@@ -3,6 +3,9 @@ package com.bsth.entity;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import javax.persistence.*;
+
+import org.hibernate.annotations.Formula;
+
 import java.util.Date;
@@ -77,6 +80,10 @@ public class CarPark {
 	// 分公司
 	private String brancheCompany;
+	 /** 组合公司分公司编码 */
+    @Formula(" concat(company, '_', branche_company) ")
+    private String cgsbm;
+	
 	// 是否撤销
 	private Integer destroy;
@@ -99,6 +106,14 @@ public class CarPark {
 	// 修改日期
 	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
+	
+	public String getCgsbm() {
+		return cgsbm;
+	}
+
+	public void setCgsbm(String cgsbm) {
+		this.cgsbm = cgsbm;
+	}
 	public Integer getId() {
 		return id;
@@ -107,4 +107,7 @@ public interface CarParkRepository extends BaseRepository&lt;CarPark, Integer&gt;{
 	@Query(value = "select st_astext(g_park_point), shapes_type, g_center_point, radius,park_code,park_name  from bsth_c_car_park where park_code=?1", nativeQuery = true)
 	public Object[][] bufferAera(String parkCode);
+	
+	@Query(value ="SELECT p.park_name,p.park_code from bsth_c_car_park p where p.park_code = ?1", nativeQuery=true)
+	List<Object[]> selectTccInfoByCode(String  parkCode);
 }
@@ -28,5 +28,6 @@ public interface CarParkService extends BaseService&lt;CarPark, Integer&gt; {
 	 * 
 	 */
  	Map<String, Object> carParkUpdate(Map<String, Object> map);
-   
+    
+ 	boolean selectTccInfoByCode(Map<String, Object> map);
 }
@@ -26,55 +26,30 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 	@Override
 	public Map<String, Object> carParkSave(Map<String, Object> map) {
-		
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			// 停车场编码
 			String parkCode = map.get("parkCode").equals("") ? null : map.get("parkCode").toString();
-			
-			// 停车场id
-			// Integer id = Integer.parseInt(parkCode);
-			
 			// 停车场名称
 			String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
-			
 			// 地理位置(百度坐标集合)
 			String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
-			
-			// 地理位置(WGS坐标集合)
-			// String gParkPoint = map.get("gParkPoint").equals("") ? "" :map.get("gParkPoint").toString();
-			
 			// 多边形WGS坐标点集合
 			String gParkPoint ="";
-			
 			if(!bParkPoint.equals("")) {
-				
 				String bPloygonGridArray[] = bParkPoint.split(",");
-				
 				int bLen_ = bPloygonGridArray.length;
-				
 				for(int b = 0 ;b<bLen_;b++) {
-					
 					String tempArray[]= bPloygonGridArray[b].split(" ");
-					
 					Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-					
 					 if(b==0) {
-						
 						 gParkPoint = resultPoint.getLng() + " " + resultPoint.getLat();
-							
 					 }else {
-						
 						 gParkPoint = gParkPoint +  ',' + resultPoint.getLng() + " " + resultPoint.getLat();
-						 
 					 }
-					
 				}
 			}
-			
 			if(bParkPoint.equals(""))
 				bParkPoint = null;
 			else
@@ -84,169 +59,92 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 				gParkPoint = null;
 			else
 				gParkPoint = "POLYGON(("  + gParkPoint +"))";
-			
-			/*bParkPoint = "POLYGON(("  + bParkPoint +"))";
-			
-			gParkPoint = "POLYGON(("  + gParkPoint +"))";*/
-			
 			// 地理位置中心点(百度坐标)
 			String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
-			
-			// 地理位置中心点(WGS坐标)
-			// String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
-			
 			String bJwpointsArray[] =null;
-			
 			if(bCenterPoint!=null) {
-				
 				bJwpointsArray = bCenterPoint.split(" ");
-				
 			}
-			
 			String gCenterPoint = null;
-			
 			if(bJwpointsArray.length>0) {
-				
 				Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-				
 				gCenterPoint = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-				
 			}
-			
 			// 坐标类型
 			String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-			
 			// 图形类型
 			String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-			
 			// 半径
 			Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-			
 			// 面积
 			Double area = map.get("area").equals("") ? 0.0 : Double.parseDouble(map.get("area").toString());
-			
 			// 公司
 			String company = map.get("company").equals("") ? "" : map.get("company").toString();
-			
 			// 分公司
-			/*String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();*/
-			String brancheCompany="";
-			
+			String brancheCompany = map.get("brancheCompany").equals("") ? "" : map.get("brancheCompany").toString();
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-			
 			// 版本号
 			Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
-			
 			// 描述与说明
 			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-			
 			SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
-			
 			Date date = new Date();
-			
 			// 创建日期
 			String createDate = formatter.format(date);
-			
 			// 修改日期
 			String updateDate = formatter.format(date);
-			
 			// 创建人
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-			
 			// 修改人
 			Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
-			
-			
-			
-			
 			carParkRepository.carParkSave(area, company, parkCode, parkName, 
-					
 										  brancheCompany, createBy, createDate, descriptions, destroy, 
-										  
 										  updateBy, updateDate, versions, bCenterPoint, bParkPoint, 
-										  
 										  dbType, gCenterPoint, gParkPoint, radius, shapesType);
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		} catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		}
-		
 		return resultMap;
 	}
 	@Override
 	public List<Map<String, Object>> findCarParkInfoFormId(Map<String, Object> map) {
-		 
 		// 获取线路ID
 	    Integer id = map.get("id").equals("") ? 0 : Integer.parseInt(map.get("id").toString());
-		
 	    List<Object[]> objects = carParkRepository.findCarParkInfoFormId(id);
-	    
 	    List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();	 
-	    
 	    int len = objects.size();
-	    
 	    if(objects.size()>0) {
-	    	
 	    	for(int i = 0 ; i < len; i++) {
-	    		
 	    		Map<String, Object> tempM = new HashMap<String,Object>();
-	    		
 	    		tempM.put("carParkId", objects.get(i)[0]);
-	    		
 	    		tempM.put("carParkArea", objects.get(i)[1]);
-	    		
 	    		tempM.put("carParkCompany", objects.get(i)[2]);
-	    		
 	    		tempM.put("carParkCode", objects.get(i)[3]);
-	    		
 	    		tempM.put("carParkName", objects.get(i)[4]);
-	    		
 	    		tempM.put("carParkBrancheCompany", objects.get(i)[5]);
-	    		
 	    		tempM.put("carParkCreateBy", objects.get(i)[6]);
-	    		
 	    		tempM.put("carParkCreateDate", objects.get(i)[7]);
-	    		
 	    		tempM.put("carParkDescriptions", objects.get(i)[8]);
-	    		
 	    		tempM.put("carParkDestroy", objects.get(i)[9]);
-	    		
 	    		tempM.put("carParkUpdate", objects.get(i)[10]);
-	    		
 	    		tempM.put("carParkUpdateDate", objects.get(i)[11]);
-	    		
 	    		tempM.put("carParkVersions", objects.get(i)[12]);
-	    		
 	    		tempM.put("carParkBcenterPoint", objects.get(i)[13]);
-	    		
 	    		tempM.put("carParkBparkPoint", objects.get(i)[14]);
-	    		
 	    		tempM.put("carParkGcenterPoint", objects.get(i)[15]);
-	    		
 	    		tempM.put("carParkGparkPoint", objects.get(i)[16]);
-	    		
 	    		tempM.put("carParkDBtype", objects.get(i)[17]);
-	    		
 	    		tempM.put("carParkRadius", objects.get(i)[18]);
-	    		
 	    		tempM.put("carParkShapesType", objects.get(i)[19]);
-	    		
 	    		resultList.add(tempM);
 	    	}
-	    	
 	    }
-	    
 		return resultList;
 	}
-	
 	/**
 	 * 修改停车场信息
 	 * 
@@ -265,90 +163,54 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 	@Override
 	public Map<String, Object> carParkUpdate(Map<String, Object> map) {
 		Map<String, Object> resultMap = new HashMap<String, Object>();
-		
 		try {
-			
 			// id
 			Integer id = map.get("id").equals("") ? null : Integer.parseInt(map.get("id").toString());
-			
 			if(id!=null) {
-				
 				// 面积
 				Double area = map.get("area").equals("") ? null : Double.parseDouble(map.get("area").toString());
-				
 				// 中心点（百度坐标）
 				String bCenterPoint = map.get("bCenterPoint").equals("") ? "" : map.get("bCenterPoint").toString();
-				
 				// 图形坐标点集合（百度坐标）
 				String bParkPoint = map.get("bParkPoint").equals("") ? "" : map.get("bParkPoint").toString();
-				
 				// 分公司
-				/*String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();*/
-				String brancheCompany = "";
-						
+				String brancheCompany = map.get("brancheCompany").equals("")? "" :map.get("brancheCompany").toString();
+				//String brancheCompany = "";
 				// 公司
 				String company = map.get("company").equals("") ? "" : map.get("company").toString();
-				
 				// 坐标类型
 				String dbType = map.get("dbType").equals("") ? "" : map.get("dbType").toString();
-				
 				// 描述与说明
 				String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
-				
 				// 是否撤销
 				Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
-				
 				// 中心点（WGS坐标）
 				// String gCenterPoint = map.get("gCenterPoint").equals("") ? "" : map.get("gCenterPoint").toString();
-				
 				String bJwpointsArray[] =null;
-				
 				if(bCenterPoint!=null) {
-					
 					bJwpointsArray = bCenterPoint.split(" ");
-					
 				}
-				
 				String gCenterPoint =null;
-				
 				if(bJwpointsArray.length>0) {
-					
 					Location resultPoint = FromBDPointToWGSPoint(bJwpointsArray[0],bJwpointsArray[1]);
-					
 					gCenterPoint = String.valueOf(resultPoint.getLng()) + " " + String.valueOf(resultPoint.getLat());
-					
 				}
-				
 				// 图形坐标点集合（WGS坐标）
 				// String gParkPoint = map.get("gParkPoint").equals("") ? "" : map.get("gParkPoint").toString();
-				
 				// 多边形WGS坐标点集合
 				String gParkPoint ="";
-				
 				if(!bParkPoint.equals("")) {
-					
 					String bPloygonGridArray[] = bParkPoint.split(",");
-					
 					int bLen_ = bPloygonGridArray.length;
-					
 					for(int b = 0 ;b<bLen_;b++) {
-						
 						String tempArray[]= bPloygonGridArray[b].split(" ");
-						
 						Location resultPoint = FromBDPointToWGSPoint(tempArray[0],tempArray[1]);
-						
 						 if(b==0) {
-							
 							 gParkPoint = resultPoint.getLng() + " " + resultPoint.getLat();
-								
 						 }else {
-							
 							 gParkPoint = gParkPoint +  ',' + resultPoint.getLng() + " " + resultPoint.getLat();
-							 
 						 }
-						
 					}
-					
 				}
 				if(bParkPoint.equals(""))
 					bParkPoint = null;
@@ -362,69 +224,51 @@ public class CarParkServiceImpl extends BaseServiceImpl&lt;CarPark, Integer&gt; implem
 				/*bParkPoint = "POLYGON(("  + bParkPoint +"))";
 				gParkPoint = "POLYGON(("  + gParkPoint +"))";*/
-				
 				// 编码
 				String parkCode = map.get("parkCode").equals("") ? "" : map.get("parkCode").toString();
-				
 				// 名称
 				String parkName = map.get("parkName").equals("") ? "" : map.get("parkName").toString();
-				
 				// 半径
 				Integer radius = map.get("radius").equals("") ? null : Integer.parseInt(map.get("radius").toString());
-				
 				// 图形类型
 				String shapesType = map.get("shapesType").equals("") ? "" : map.get("shapesType").toString();
-				
 				// 版本
 				Integer versions = map.get("versions").equals("") ? null : Integer.parseInt(map.get("versions").toString());
-				
 				// 创建人
 				Integer createBy = map.get("createBy").equals("") ? null : Integer.parseInt(map.get("createBy").toString());
-				
 				// 创建日期
 				String createDate = map.get("createDate").equals("") ? "" : map.get("createDate").toString();
-				
 				Integer updateBy = map.get("updateBy").equals("") ? null : Integer.parseInt(map.get("updateBy").toString());
-				
 				SimpleDateFormat formatter = new SimpleDateFormat ("yyyy-MM-dd HH:mm:ss"); 
-				
 				Date date = new Date();
-				
 				// 修改日期
 				String updateDate = formatter.format(date);
-				
 				carParkRepository.carParkUpdate(area, company, parkCode, parkName, brancheCompany, createBy, createDate, descriptions, destroy, updateBy, updateDate, versions, bCenterPoint, gCenterPoint, bParkPoint, gParkPoint, dbType, radius, shapesType, id);
-				
 			}
-			
 			resultMap.put("status", ResponseCode.SUCCESS);
-			
 		 } catch (Exception e) {
-
 			resultMap.put("status", ResponseCode.ERROR);
-			
 			logger.error("save erro.", e);
-			
 		 }
-		
 		return resultMap;
 	}
-	
 	/** 百度坐标转WGS坐标 */
 	public Location FromBDPointToWGSPoint(String bLonx,String bLatx) {
-		
 		double lng = Double.parseDouble(bLonx);
-		
 		double lat = Double.parseDouble(bLatx);
-		
 		Location bdLoc = TransGPS.LocationMake(lng, lat);
-		
 		Location location = TransGPS.bd_decrypt(bdLoc);
-		
 		Location WGSPoint = TransGPS.transformFromGCJToWGS(location);
-		
 		return WGSPoint;
-		
 	}
-     
+
+	@Override
+	public boolean selectTccInfoByCode(Map<String, Object> map) {
+		List<Object[]> arrayObj = carParkRepository.selectTccInfoByCode(map.get("parkCode").equals("") ? "" : map.get("parkCode").toString());
+		boolean tag = true;
+		if(arrayObj.size()>0) {
+			tag= false;
+		}
+		return tag;
+	}
 }
@@ -112,6 +112,9 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
             public SchedulePlanRuleResult mapRow(ResultSet rs, int i) throws SQLException {
                 SchedulePlanRuleResult obj = new SchedulePlanRuleResult();
                 obj.setRuleId(rs.getString("rule_id"));
+                obj.setCcZbh(rs.getString("cc_zbh"));
+                obj.setGids(rs.getString("gids"));
+                obj.setEcids(rs.getString("ecids"));
                 obj.setScheduleDate(rs.getDate("schedule_date"));
                 obj.setGidindex(rs.getString("gidindex"));
                 obj.setEcindex(rs.getString("ecindex"));
 package com.bsth.service.schedule.rules.shiftloop;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.service.schedule.utils.Md5Util;
 import com.google.common.base.Splitter;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -17,6 +18,12 @@ public class ScheduleRule_input {
     /** 规则Id */
     private String ruleId;
+    /**
+     * 规则md5值（不使用id判定，使用md5判定）
+     * 使用，启用日期，路牌范围，人员范围 结合生成md5编码
+     */
+    private String ruleMd5;
+
     /** 规则启用日期 */
     private DateTime qyrq;
@@ -78,9 +85,20 @@ public class ScheduleRule_input {
             }
         }
+        /** 生成规则md5编码 */
+        ruleMd5 = Md5Util.getMd5(
+                String.valueOf(qyrq.getMillis()) + "_" +
+                        scheduleRule1Flat.getLpIds() + "_" +
+                        scheduleRule1Flat.getRyConfigIds()
+        );
+
+        System.out.println("rule的md5：" + ruleMd5 + " 车辆：" + scheduleRule1Flat.getCarConfigInfo().getCl().getInsideCode());
+
         this.self = scheduleRule1Flat;
     }
+
+
     public String getRuleId() {
         return ruleId;
     }
@@ -160,4 +178,12 @@ public class ScheduleRule_input {
     public void setSelf(ScheduleRule1Flat self) {
         this.self = self;
     }
+
+    public String getRuleMd5() {
+        return ruleMd5;
+    }
+
+    public void setRuleMd5(String ruleMd5) {
+        this.ruleMd5 = ruleMd5;
+    }
 }
+package com.bsth.service.schedule.utils;
+
+import java.security.MessageDigest;
+
+/**
+ * Md5工具。
+ */
+public class Md5Util {
+    private static MessageDigest md5 = null;
+    static {
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+        } catch (Exception exp) {
+            exp.printStackTrace();
+        }
+    }
+
+    /**
+     * 用于获取一个String的md5值。
+     * @param str
+     * @return
+     */
+    public static String getMd5(String str) {
+        byte[] bs = md5.digest(str.getBytes());
+        StringBuilder s = new StringBuilder();
+        for (byte x : bs) {
+            if ((x & 0xff) >>4 == 0) {
+                s.append("0").append(Integer.toHexString(x & 0xff));
+            } else {
+                s.append(Integer.toHexString(x & 0xff));
+            }
+        }
+        return s.toString();
+    }
+
+}
@@ -10,7 +10,7 @@ spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/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