update...

潘钊
1 parent 0e404f00
Showing 4 changed files with 60 additions and 19 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/data/in_out/RealInoutHandler.java
src/main/java/com/bsth/data/in_out/buffer/ElectricDataBuffer.java
src/main/java/com/bsth/data/led_http/LedHttpPushHandler.java
@@ -43,7 +43,7 @@ public class StartCommand implements CommandLineRunner{
 			invocationSecurityMetadataSourceService.loadResourceDefine();
  
 			//同步屏 LED 推送服务
-			//ledHttpPushHandler.start();
+			ledHttpPushHandler.start();
  
 			//signal、牌照识别、查询一体机数据消费队列
 			SignalAndAttConsumeQueue.start();
@@ -3,6 +3,7 @@ package com.bsth.data.in_out;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.basic.bus.BusDataBuffer;
 import com.bsth.data.in_out.buffer.BerthDataBuffer;
+import com.bsth.data.led_http.LedHttpPushHandler;
 import com.bsth.data.schedule.dto.ScheduleInOut;
 import com.bsth.data.schedule.real.ScheduleDataBuffer;
 import com.bsth.entity.Bus;
@@ -79,6 +80,8 @@ public class RealInoutHandler {
     private void busOut(CarInOutEntity cio) {
         car2berthMap.remove(cio.getNbbm());
  
+        //led
+        LedHttpPushHandler.busOut(cio);
         //通知客户端
         sendUtils.sendCarOut(cio.getNbbm(), cio.getT());
     }
@@ -95,14 +98,15 @@ public class RealInoutHandler {
         Bus bus = BusDataBuffer.findOne(nbbm);
         //非电车，停柴油泊位区
         if(!bus.isSfdc()){
-            //LedHttpPushHandler.busIn(bus.getCarPlate(), "柴油泊位区");
+            LedHttpPushHandler.busIn(bus.getCarPlate(), "柴油泊位区");
             return;
         }
  
         //是否有固定泊位
         String lockBName = BerthDataBuffer.getLockBerthName(nbbm);
-        if(StringUtils.isNotEmpty(lockBName))
+        if(StringUtils.isNotEmpty(lockBName)){
             car2berthMap.put(nbbm, lockBName);
+        }
         else{
             //停空闲泊位
             List<RegionBerth> berthList = BerthDataBuffer.allNoLock();
@@ -124,6 +128,9 @@ public class RealInoutHandler {
                 logger.info("没有空余泊位了");
         }
  
+        if(car2berthMap.containsKey(nbbm))
+            LedHttpPushHandler.busIn(bus.getCarPlate(), car2berthMap.get(nbbm));
+
         //通知客户端
         sendUtils.sendCarIn(nbbm, car2berthMap.get(nbbm), cio.getT());
     }
@@ -239,4 +246,8 @@ public class RealInoutHandler {
     public boolean containsBerth(String berthName) {
         return car2berthMap.inverse().containsKey(berthName);
     }
+
+    public int size() {
+        return car2berthMap.size();
+    }
 }
@@ -41,4 +41,16 @@ public class ElectricDataBuffer {
         }
         return rs;
     }
+
+    public static Double getSoc(String nbbm){
+        try{
+            if(!nbbm2ElecMap.containsKey(nbbm))
+                return -1d;
+
+            return Double.parseDouble(nbbm2ElecMap.get(nbbm).getSoc());
+        }catch (Exception e){
+            return -1d;
+        }
+    }
+
 }
 package com.bsth.data.led_http;
  
+import com.bsth.data.in_out.RealInoutHandler;
+import com.bsth.data.in_out.buffer.BerthDataBuffer;
+import com.bsth.data.in_out.buffer.ElectricDataBuffer;
+import com.bsth.entity.ac.CarInOutEntity;
+import com.bsth.entity.berth.RegionBerth;
+import com.bsth.service.berth.BerthService;
+import com.bsth.util.ConfigUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Created by panzhao on 2017/9/26.
  */
 @Component
-public class LedHttpPushHandler {/*
+public class LedHttpPushHandler {
  
     @Autowired
     BerthService berthService;
  
-    @Autowired
-    CarParkRealHandler carParkRealHandler;
-
     private static String baseUrl;
     //private static String outUrl;
  
+    @Autowired
+    RealInoutHandler realInoutHandler;
+
     //上次发送停放信息时间戳
     private static long send_tfxx_time=System.currentTimeMillis();
  
@@ -60,26 +75,29 @@ public class LedHttpPushHandler {/*
         dataUrlLinked.add(url);
     }
  
-    *//**
+    /**
      * 场内停放信息
-     * @return
-     *//*
+     */
     public void sendTfxx(){
         int can=0;//可停车数
         int yet=0;//已停车数
         int now=0;//正充电数
  
-        List<RegionBerth> list = berthService.all();
+        List<RegionBerth> list = BerthDataBuffer.all();
         can = list.size();
  
-        for(RegionBerth b : list){
-            if(null != b.getNbbm()){
-                yet++;
+        yet = realInoutHandler.size();
  
-                if(carParkRealHandler.soc(b.getNbbm()) > 0)
-                    now++;
-            }
+        Map<String, String> map = realInoutHandler.getCar2berthMap();
+        Set<String> ks = map.keySet();
+
+        Double soc;
+        for(String k : ks){
+            soc = ElectricDataBuffer.getSoc(k);
+            if(soc >= 0 && soc<100)
+                now++;
         }
+
         String url = baseUrl + "/tcPlan?can="+can+"&yet="+yet+"&now="+now;
         dataUrlLinked.add(url);
     }
@@ -107,7 +125,7 @@ public class LedHttpPushHandler {/*
                     if (null != url) {
                         sleepFlag = false;
                         logger.info("push led :" + url);
-                        HttpClientUtils_tms.get(url);
+                        //HttpClientUtils_tms.get(url);
                     } else {
                         Thread.sleep(500);
                         if (!sleepFlag) {
@@ -130,5 +148,5 @@ public class LedHttpPushHandler {/*
  
             log.warn("Led ConsumeQueue is break...");
         }
-    }*/
+    }
 }