update...

潘钊
1 parent eb6a93a8
Showing 8 changed files with 184 additions and 23 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/CXFConfig.java
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/server_rs/directive/DirectiveRestService.java
src/main/java/com/bsth/server_rs/schedule/real/SchRealInfoBuffer.java → src/main/java/com/bsth/server_rs/schedule/real/SchRealDataBuffer.java
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/java/com/bsth/server_rs/schedule/real/thread/ExecSchDataRefreshThread.java
src/main/java/com/bsth/server_rs/schedule/real/thread/SchInOutDataRefreshThread.java
@@ -11,7 +11,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(9);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(10);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -6,6 +6,7 @@ import com.bsth.server_rs.base_info.line.LineRestService;
 import com.bsth.server_rs.base_info.person.PersonRestService;
 import com.bsth.server_rs.base_info.section.LD_SectionRestService;
 import com.bsth.server_rs.base_info.station.StationRestService;
+import com.bsth.server_rs.directive.DirectiveRestService;
 import com.bsth.server_rs.exception.AesExceptionMapper;
 import com.bsth.server_rs.gps.GpsRestService;
 import com.bsth.server_rs.logs.RealLogRestService;
@@ -95,6 +96,8 @@ public class CXFConfig {
     RealLogRestService realLogRestService;
     @Autowired
     GpsRestService gpsRestService;
+    @Autowired
+    DirectiveRestService directiveRestService;
     @Bean
     public Server rsServer() {
@@ -110,7 +113,8 @@ public class CXFConfig {
                 stationRestService,
                 ldSectionRestService,
                 schedulePlanService,
-                realLogRestService));
+                realLogRestService,
+                directiveRestService));
         endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(), new AesExceptionMapper()));
         //endpoint.setFeatures(Arrays.asList(new Swagger2Feature()));
         endpoint.getInInterceptors().add(new AuthorizeInterceptor_IN());
 package com.bsth;
+import com.bsth.server_rs.schedule.real.thread.ExecSchDataRefreshThread;
 import com.bsth.server_rs.schedule.real.thread.SchInOutDataRefreshThread;
 import com.bsth.server_rs.thread.RfidCardInfoPersistenceThread;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,9 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SchInOutDataRefreshThread schInOutDataRefreshThread;
+	@Autowired
+	ExecSchDataRefreshThread execSchDataRefreshThread;
+
 	@Override
 	public void run(String... arg0){
@@ -33,11 +37,11 @@ public class StartCommand implements CommandLineRunner{
 			ScheduledExecutorService sexec = Application.mainServices;
 			//定时将人车卡数据入库
 			sexec.scheduleWithFixedDelay(rfidCardInfoPersistenceThread, 120, 60 * 10, TimeUnit.SECONDS);
-			//OldWSClient.returnCCInfo();
-			//OldWSClient.getCurrentDayPlan();
 			//定时从调度系统刷新进出场数据
-			sexec.scheduleWithFixedDelay(schInOutDataRefreshThread, 40, 15, TimeUnit.SECONDS);
+			sexec.scheduleWithFixedDelay(schInOutDataRefreshThread, 40, 20, TimeUnit.SECONDS);
+			//定时从调度系统刷新车辆正在的执行班次
+			sexec.scheduleWithFixedDelay(execSchDataRefreshThread, 20, 60 * 2, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+package com.bsth.server_rs.directive;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.server_rs.schedule.real.SchRealDataBuffer;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/11/10.
+ */
+@Component
+@Path("/directive")
+@Produces({MediaType.APPLICATION_JSON})
+public class DirectiveRestService {
+
+    static String url;
+    static String secretKey;
+
+    @Autowired
+    SchRealDataBuffer schRealDataBuffer;
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static {
+        secretKey = ConfigUtil.get("http.control.secret.key");
+        url = ConfigUtil.get("http.control.service_data_url") + "/send60Phrase?secretKey=" + secretKey;
+    }
+
+    @POST
+    @Path("/send")
+    public int send(@RequestBody Map<String, Object> map){
+        try{
+            map.put("sender", map.get("接口"));
+            StringBuilder sb = HttpClientUtils.post(url , JSON.toJSONString(map));
+            return Integer.parseInt(sb.toString());
+        }catch (Exception e){
+            logger.error("", e);
+            return -500;
+        }
+    }
+
+    @GET
+    @Path("/reply/{msgIds}")
+    public List<Map> reply(@PathParam("msgIds") String msgIds){
+        try{
+            StringBuilder sb = HttpClientUtils.get(url + "&msgIds=" + msgIds);
+            return JSON.parseArray(sb.toString(), Map.class);
+        }catch (Exception e){
+            logger.error("", e);
+            return null;
+        }
+    }
+}
 package com.bsth.server_rs.schedule.real;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.entity.ScheduleRealInfo;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import java.util.List;
+import java.util.Map;
 /**
  * 实际排班缓存
  * Created by panzhao on 2017/9/27.
  */
 @Component
-public class SchRealInfoBuffer  {
+public class SchRealDataBuffer {
     /**
      * 进出场班次数据，定时从调度系统获取。 对各场站输出
      */
     private static ArrayListMultimap<String, ScheduleRealInfo> inOutMap;
-    public void putInOutData(List<ScheduleRealInfo> list){
+    /**
+     * 车辆 和 当前正在执行班次对照
+     */
+    private static Map<String, JSONObject> execMap;
+
+    public void putInOutData(List<ScheduleRealInfo> list) {
         ArrayListMultimap<String, ScheduleRealInfo> inOutMapCopy = ArrayListMultimap.create();
         String type;
-        for(ScheduleRealInfo sch : list){
+        for (ScheduleRealInfo sch : list) {
             type = sch.getBcType();
-            if(StringUtils.isEmpty(type))
+            if (StringUtils.isEmpty(type))
                 continue;
-            if(type.equals("in"))
+            if (type.equals("in"))
                 inOutMapCopy.put(sch.getZdzCode(), sch);
-            else if(type.equals("out"))
+            else if (type.equals("out"))
                 inOutMapCopy.put(sch.getQdzCode(), sch);
         }
         inOutMap = inOutMapCopy;
     }
-    public List<ScheduleRealInfo> findByParkCode(String parkCode){
+
+    public void setExecMap(Map<String, JSONObject> map) {
+        if (map.size() > 0)
+            execMap = map;
+    }
+
+    public List<ScheduleRealInfo> findByParkCode(String parkCode) {
         return inOutMap.get(parkCode);
     }
+
+ /*   public List<JSONObject> findExec(List<String> cars){
+        List<JSONObject> rs = new ArrayList<>(cars.size());
+
+        for(String nbbm : cars){
+            rs.add(execMap.get(nbbm));
+        }
+        return rs;
+    }*/
+
+    public JSONObject getExecPlan(String nbbm) {
+        return execMap.get(nbbm);
+    }
 }
 package com.bsth.server_rs.schedule.real;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.BasicData;
 import com.bsth.redis.ScheduleRedisService;
 import com.bsth.server_rs.base_info.line.Line;
@@ -33,7 +34,7 @@ public class ScheduleRealService {
     ScheduleRedisService redisService;
     @Autowired
-    SchRealInfoBuffer schRealInfoBuffer;
+    SchRealDataBuffer schRealDataBuffer;
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -56,23 +57,34 @@ public class ScheduleRealService {
     /**
      * 获取指定日期，指定公司的人员车辆配置情况（实际排班）
-     * @param code
+     * @param company
      * @param rq
      * @return
      */
     @GET
-    @Path("/ccConfig/{code}/{rq}")
-    public List<ScheduleCcInfoConfig> ccInfoConfig(@PathParam("code") String code, @PathParam("rq") String rq){
-        Set<String> lineArray = BasicData.lineDateMap.keySet();
+    @Path("/ccConfig/{company}/{rq}")
+    public List<ScheduleCcInfoConfig> ccInfoConfig(@PathParam("company") String company, @PathParam("rq") String rq){
+        List<Line> lines = LineBufferData.findByCompany(company);
         List<ScheduleCcInfoConfig> all = new ArrayList<>();
-        for (String lineCode : lineArray) {
-            all.addAll(ScheduleCcInfoConfig.getMultiInstance(redisService.read(rq, lineCode)));
+        for (Line line : lines) {
+            all.addAll(ScheduleCcInfoConfig.getMultiInstance(redisService.read(rq, line.getLineCode())));
         }
         return all;
     }
     /**
+     * 根据车辆自编号获取对应执行的班次信息
+     * @param nbbm
+     * @return
+     */
+    @GET
+    @Path("/exec/{nbbm}")
+    public JSONObject getExecPlan(@PathParam("nbbm") String nbbm){
+        return schRealDataBuffer.getExecPlan(nbbm);
+    }
+
+    /**
      * 获取当天指定停车场的进出场排班数据（潘钊场站VIP特供版 -高实时）
      *
      * @return
@@ -81,7 +93,7 @@ public class ScheduleRealService {
     @Path("/in_out/pz_vip/{code}")
     public List<ScheduleInOut> findInOut_real(@PathParam("code") String code) {
         logger.error("in_out -" + code);
-        return ScheduleInOut.getMultiInstance(schRealInfoBuffer.findByParkCode(code));
+        return ScheduleInOut.getMultiInstance(schRealDataBuffer.findByParkCode(code));
     }
     @GET
+package com.bsth.server_rs.schedule.real.thread;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.server_rs.schedule.real.SchRealDataBuffer;
+import com.bsth.util.ConfigUtil;
+import com.bsth.util.HttpClientUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 车辆当前执行班次数据刷新线程
+ * Created by panzhao on 2017/11/9.
+ */
+@Component
+public class ExecSchDataRefreshThread extends Thread{
+
+    static String url;
+    static String secretKey;
+
+    @Autowired
+    SchRealDataBuffer schRealDataBuffer;
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    static {
+        secretKey = ConfigUtil.get("http.control.secret.key");
+        url = ConfigUtil.get("http.control.service_data_url") + "/execSchList?secretKey=" + secretKey;
+    }
+
+    @Override
+    public void run() {
+        try {
+            StringBuilder sb = HttpClientUtils.get(url);
+            List<JSONObject> list = JSON.parseArray(sb.toString(), JSONObject.class);
+
+            Map<String, JSONObject> map = new HashMap<>();
+            for(JSONObject obj : list){
+                map.put(obj.getString("clZbh"), obj);
+            }
+
+            if(map.size() > 0)
+                schRealDataBuffer.setExecMap(map);
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -2,7 +2,7 @@ package com.bsth.server_rs.schedule.real.thread;
 import com.alibaba.fastjson.JSON;
 import com.bsth.entity.ScheduleRealInfo;
-import com.bsth.server_rs.schedule.real.SchRealInfoBuffer;
+import com.bsth.server_rs.schedule.real.SchRealDataBuffer;
 import com.bsth.util.ConfigUtil;
 import com.bsth.util.HttpClientUtils;
 import org.slf4j.Logger;
@@ -23,7 +23,7 @@ public class SchInOutDataRefreshThread extends Thread {
     static String secretKey;
     @Autowired
-    SchRealInfoBuffer schRealInfoBuffer;
+    SchRealDataBuffer schRealDataBuffer;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     static {
@@ -38,7 +38,7 @@ public class SchInOutDataRefreshThread extends Thread {
             List<ScheduleRealInfo> list = JSON.parseArray(sb.toString(), ScheduleRealInfo.class);
             if(null != list && list.size() > 0){
-                schRealInfoBuffer.putInOutData(list);
+                schRealDataBuffer.putInOutData(list);
                 logger.info("从调度系统刷新进出场班次： " + list.size());
             }
         } catch (Exception e) {