update...

潘钊
1 parent b1a880e3
Showing 9 changed files with 333 additions and 275 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/controller/berth/BerthController.java
src/main/java/com/bsth/data/real_park/BerthDataBuffer.java
src/main/java/com/bsth/data/real_park/CarParkRealHandler.java
src/main/java/com/bsth/entity/berth/RegionBerth.java
src/main/java/com/bsth/repository/berth/BerthRepository.java
src/main/java/com/bsth/service/berth/BerthService.java
src/main/java/com/bsth/service/berth/impl/BerthServiceImpl.java
src/main/java/com/bsth/util/ConvertUtil.java
@@ -2,11 +2,11 @@ package com.bsth;
 import com.bsth.data.msg_queue.SignalAndAttConsumeQueue;
-import com.bsth.data.real_park.BerthDataBuffer;
 import com.bsth.data.real_park.CarParkRealHandler;
 import com.bsth.data.real_park.thread.RealParkDataPersistenceThread;
 import com.bsth.data.signal.thread.SignalPstThread;
 import com.bsth.security.SecurityMetadataSourceService;
+import com.bsth.service.berth.impl.BerthServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
@@ -28,13 +28,14 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
     SignalPstThread signalPstThread;
 	@Autowired
-	BerthDataBuffer.BerthCacheRefreshThread berthCacheRefreshThread;
-	@Autowired
 	RealParkDataPersistenceThread realParkDataPersistenceThread;
 	@Autowired
 	CarParkRealHandler carParkRealHandler;
+	@Autowired
+	BerthServiceImpl.BerthCacheRefreshThread berthCacheRefreshThread;
+
 	@Override
 	public void run(String... arg0){
@@ -49,8 +50,8 @@ public class StartCommand implements CommandLineRunner{
 			//进出场数据入库线程
 			sexec.scheduleWithFixedDelay(signalPstThread, 30, 10, TimeUnit.SECONDS);
-			//泊位缓存刷新
-			sexec.scheduleWithFixedDelay(berthCacheRefreshThread, 0, 60 * 2, TimeUnit.SECONDS);
+			//泊位数据刷新
+			sexec.scheduleWithFixedDelay(berthCacheRefreshThread, 0, 60 * 15, TimeUnit.SECONDS);
 			//从数据库恢复场内实时停放数据
 			carParkRealHandler.recovery();
@@ -17,14 +17,4 @@ public class BerthController extends BaseController&lt;RegionBerth, Integer&gt; {
     @Autowired
     BerthService berthService;
-/*    @RequestMapping(value = "real_change", method = RequestMethod.POST)
-    public Map<String, Object> realChange(@RequestParam String s,@RequestParam String d){
-        return null;//berthService.realChange(s, d);
-    }*/
-
-    @RequestMapping("max_order_no")
-    public String maxOrderNo() {
-        String rs = berthService.maxOrderNo();
-        return rs==null?"0":rs;
-    }
 }
-package com.bsth.data.real_park;
-
-import com.bsth.entity.berth.RegionBerth;
-import com.bsth.repository.berth.BerthRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 预设泊位数据缓存
- * Created by panzhao on 2017/9/14.
- */
-public class BerthDataBuffer {
-
-    private static List<RegionBerth> allList;
-
-    static Logger logger = LoggerFactory.getLogger(BerthDataBuffer.class);
-
-    private static void update(RegionBerth b){
-        RegionBerth cacheB = getById(b.getId());
-        if(null == cacheB)
-            allList.add(cacheB);
-        else{
-            //cacheB.setNbbm(b.getNbbm());
-            cacheB.setOrderNo(b.getOrderNo());
-            cacheB.setName(b.getName());
-            cacheB.setRegion(b.getRegion());
-            cacheB.setUpdateDate(b.getUpdateDate());
-            cacheB.setRemark(b.getRemark());
-        }
-    }
-
-    private static RegionBerth getById(Integer id) {
-        for(RegionBerth b : allList){
-            if(id.equals(b.getId()))
-                return b;
-        }
-        return null;
-    }
-/*
-    public static RegionBerth get(String nbbm) {
-        for(RegionBerth b : allList){
-            if(nbbm.equals(b.getNbbm()))
-                return b;
-        }
-        return null;
-    }*/
-
-    /**
-     * 泊位缓存刷新线程
-     */
-    @Component
-    public static class BerthCacheRefreshThread extends Thread {
-
-        @Autowired
-        BerthRepository berthRepository;
-
-        @Override
-        public void run() {
-            /*try{
-                List<RegionBerth> list = (List<RegionBerth>) berthRepository.findAll();
-                Map<String, RegionBerth> nbbm2BerthMapCopy = new HashMap<>();
-                for (RegionBerth b : list) {
-                    if (StringUtils.isNotEmpty(b.getName())) {
-                        //nbbm2BerthMapCopy.put(b.getNbbm(), b);
-                    }
-                }
-
-                list = new ArrayList(nbbm2BerthMapCopy.values());
-
-                if (null == allList)
-                    allList = list;
-                else {
-                    //增量更新
-                    for (RegionBerth b : list) {
-                        update(b);
-                    }
-                }
-
-                //排序
-                Collections.sort(allList, new Comparator<RegionBerth>() {
-                    @Override
-                    public int compare(RegionBerth o1, RegionBerth o2) {
-                        return Integer.parseInt(o1.getOrderNo()) - Integer.parseInt(o2.getOrderNo());
-                    }
-                });
-            }catch (Exception e){
-                logger.error("泊位数据刷新失败！！", e);
-            }*/
-        }
-    }
-}
@@ -5,8 +5,10 @@ import com.bsth.data.basic.bus.BusDataBuffer;
 import com.bsth.data.electric.CarElectricBuffer;
 import com.bsth.entity.Bus;
 import com.bsth.entity.ac.CarInOutEntity;
+import com.bsth.entity.berth.RegionBerth;
 import com.bsth.entity.electric.BusElectric;
 import com.bsth.entity.real.RealCarPark;
+import com.bsth.service.berth.BerthService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,6 +28,9 @@ import java.util.concurrent.ConcurrentMap;
 @Component
 public class CarParkRealHandler {
+    @Autowired
+    BerthService berthService;
+
     /**
      * 公交车
      * K: 自编号
@@ -57,6 +62,22 @@ public class CarParkRealHandler {
         }
     }
+    /**
+     * 最大电量的泊位名称
+     * @return
+
+    public String getMaxElecBerth(){
+        String name = null;
+        double maxSoc=0.0;
+        Collection<RealCarPark> vs = allBus();
+
+        for(RealCarPark rcp : vs){
+            if(Double.parseDouble(rcp.getSoc()) > maxSoc)
+                name = rcp.getBerthName();
+        }
+        return name;
+    }*/
+
     public static Collection<RealCarPark> allBus() {
         return busRcps.values();
     }
@@ -100,9 +121,10 @@ public class CarParkRealHandler {
         RealCarPark rcp = new RealCarPark();
         //泊位信息
-        /*RegionBerth b = BerthDataBuffer.get(nbbm);
-        if (null != b)
-            rcp.setBerthName(b.getName());*/
+        RegionBerth b = berthService.next();
+        //泊位设置车辆
+        b.setNbbm(nbbm);
+        rcp.setBerthName(b.getName());
         rcp.setNbbm(nbbm);
         rcp.setInTime(System.currentTimeMillis());
@@ -169,6 +191,11 @@ public class CarParkRealHandler {
         return null;
     }
+    public Double soc(String nbbm){
+        RealCarPark rcp = busRcps.get(nbbm);
+        return rcp!=null?Double.parseDouble(rcp.getSoc()):null;
+    }
+
     @Autowired
     JdbcTemplate jdbcTemplate;
@@ -11,7 +11,7 @@ import java.util.Date;
  */
 @Entity
 @Table(name = "bsth_p_berth")
-public class RegionBerth {
+public class RegionBerth implements Cloneable{
     @Id
     @GeneratedValue
@@ -60,13 +60,6 @@ public class RegionBerth {
     private int chargePile;
     /**
-     * 是否是充电桩的第一个泊位
-     *
-     * 默认 1 个桩  2个 泊位
-     */
-    private boolean first;
-
-    /**
      * 状态
      * 0: 可用
      * -1: 禁用
@@ -85,6 +78,27 @@ public class RegionBerth {
     @Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     private Date updateDate;
+    /**
+     * 停放车辆
+     */
+    @Transient
+    private String nbbm;
+
+    @Override
+    public int hashCode() {
+        return this.toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return this.toString().equals(obj.toString());
+    }
+
+    @Override
+    public String toString() {
+        return ("berth_" + this.getName());
+    }
+
     public Integer getId() {
         return id;
     }
@@ -181,14 +195,6 @@ public class RegionBerth {
         this.type = type;
     }
-    public boolean isFirst() {
-        return first;
-    }
-
-    public void setFirst(boolean first) {
-        this.first = first;
-    }
-
     public int getChargePile() {
         return chargePile;
     }
@@ -196,4 +202,12 @@ public class RegionBerth {
     public void setChargePile(int chargePile) {
         this.chargePile = chargePile;
     }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
 }
@@ -2,7 +2,6 @@ package com.bsth.repository.berth;
 import com.bsth.entity.berth.RegionBerth;
 import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 /**
@@ -11,6 +10,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface BerthRepository extends BaseRepository<RegionBerth, Integer>{
-    @Query("select max(b.orderNo) from RegionBerth b")
-    String maxOrderNo();
+/*    @Query("select max(b.orderNo) from RegionBerth b")
+    String maxOrderNo();*/
 }
@@ -7,7 +7,8 @@ import com.bsth.service.BaseService;
  * Created by panzhao on 2017/8/22.
  */
 public interface BerthService extends BaseService<RegionBerth, Integer>{
-    String maxOrderNo();
+    RegionBerth next();
+    //String maxOrderNo();
     //void berthInOut(Bus bus);
 package com.bsth.service.berth.impl;
+import com.bsth.data.real_park.CarParkRealHandler;
 import com.bsth.entity.berth.RegionBerth;
 import com.bsth.repository.berth.BerthRepository;
 import com.bsth.service.berth.BerthService;
 import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.util.ConvertUtil;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
-import java.util.List;
+import java.util.*;
 /**
  * Created by panzhao on 2017/8/22.
@@ -17,77 +21,145 @@ import java.util.List;
 @Service
 public class BerthServiceImpl extends BaseServiceImpl<RegionBerth, Integer> implements BerthService {
+    //泊位集合
+    private static List<RegionBerth> berthList;
+
     @Autowired
-    BerthRepository berthRepository;
+    CarParkRealHandler carParkRealHandler;
-    private static List<RegionBerth> allList;
-    /** 待入库的
-    private static LinkedList<RegionBerth> psts = new LinkedList<>();
+    /**
+     * 充电枪状态
+     * -404 空闲
+     * 其他：当前充电车辆电量
      */
+    private static Map<String, Double> chargeMap;
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Override
-    public String maxOrderNo() {
-        return berthRepository.maxOrderNo();
+
+    static {
+        berthList = new ArrayList<>();
+        chargeMap = new HashMap<>();
     }
-/*
+
+    /**
+     * 获取下一个可用泊位
+     *
+     * @return
+     */
     @Override
-    public void berthInOut(Bus bus) {
+    public RegionBerth next() {
+        RegionBerth b = null;
+
+        try {
+            b = nextChargeBerth();
+            if (null != b)
+                return b;
+
+            //最快充电完成枪的空余泊位
+            b = maxElecBerth();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+        return b;
+    }
+
+    private RegionBerth maxElecBerth() {
+        RegionBerth near = null;
+        //按充电桩分组
+        try {
+            ArrayListMultimap<String, RegionBerth> multimap = new ConvertUtil<RegionBerth>()
+                    .groupMultiList(berthList, "", RegionBerth.class.getDeclaredField("chargePile"));
+
+            Set<String> cps = multimap.keySet();
+            int status;
+            double maxSoc = 0.0;
+            List<RegionBerth> list;
+            for (String cp : cps) {
+                list = multimap.get(cp);
+                //充电枪状态
+                status = calcCpStatus(list);
+                if (status == 1) {
+                    double soc = calcCpMaxSoc(list);
+                    RegionBerth tempBerth = nearBerthByCp(list);
+
+                    if (soc > maxSoc) {
+                        maxSoc = soc;
+                        near = tempBerth;
+                    }
+                }
+            }
+        } catch (NoSuchFieldException e) {
+            logger.error("", e);
+        }
+        return near;
+    }
-        String nbbm = bus.getNbbm();
-        RegionBerth b = get(nbbm);
-        if(null != b){
-            b.setNbbmReal(nbbm);
-            //通知客户端
+    private RegionBerth nearBerthByCp(List<RegionBerth> list) {
+        Collections.sort(list, new Comparator<RegionBerth>() {
+            @Override
+            public int compare(RegionBerth b1, RegionBerth b2) {
+                return b1.getOrderNo().compareTo(b2.getOrderNo());
+            }
+        });
+        for (RegionBerth b : list) {
+            if (null == b.getNbbm())
+                return b;
+        }
+        return null;
+    }
-            //入库
-            psts.add(b);
+    private double calcCpMaxSoc(List<RegionBerth> list) {
+        Double maxSoc = 0.0, soc;
+        for (RegionBerth b : list) {
+            soc = carParkRealHandler.soc(b.getNbbm());
+            if (null != soc && soc > maxSoc)
+                maxSoc = soc;
         }
-    }*/
+        return maxSoc;
+    }
     /**
-     * 车辆泊位交换
-     * @param s
-     * @param d
+     * 充电桩状态
+     * 0：枪空闲（2个泊位都空闲）
+     * 1：有车充电且有空余泊位
+     * 2：无空余泊位
+     *
+     * @param regionBerths
      * @return
+     */
+    private int calcCpStatus(List<RegionBerth> list) {
+        int count = 0;
+        for (RegionBerth b : list) {
+            if (null != b.getNbbm())
+                count++;
+        }
-    @Override
-    public Map<String, Object> realChange(String s, String d) {
+        if (count == 0)
+            return 0;
-        Map<String, Object> rs = new HashMap<>();
-        try{
-            RegionBerth berthS = getByName(s);
-            RegionBerth berthD = getByName(d);
+        if (count >= list.size())
+            return 2;
+        return 1;
+    }
-            String sNbbm = berthS.getNbbmReal();
-            berthS.setNbbmReal(berthD.getNbbmReal());
-            berthD.setNbbmReal(sNbbm);
+    /**
+     * 获取下一个可充电的泊位
+     *
+     * @return
+     */
+    private RegionBerth nextChargeBerth() {
+        for (RegionBerth b : berthList) {
+            if (null == b.getNbbm()
+                    && (!chargeMap.containsKey(b.getChargePile()) || chargeMap.get(b.getChargePile()) == -404))
+                return b;
-            rs.put("status", ResponseCode.SUCCESS);
-            rs.put("list", allList);
-        }catch (Exception e){
-            logger.error("", e);
-            rs.put("status", ResponseCode.ERROR);
         }
-
-        return rs;
-    }*/
-
-    /*@Override
-    public Iterable<RegionBerth> list(Map<String, Object> map) {
-        return allList;
+        return null;
     }
-*/
-/*    @Override
-    public void putElec(BusElectric be){
-        RegionBerth rb = get(be.getNbbm());
-        if(null != rb)
-            rb.setBe(be);
-    }*/
-
-/*    *//**
-     * 泊位缓存刷新线程
-     *//*
+
+    /**
+     * 定时将泊位数据load 到内存
+     */
     @Component
     public static class BerthCacheRefreshThread extends Thread {
@@ -97,104 +169,24 @@ public class BerthServiceImpl extends BaseServiceImpl&lt;RegionBerth, Integer&gt; impl
         @Override
         public void run() {
             List<RegionBerth> list = (List<RegionBerth>) berthRepository.findAll();
-            Map<String, RegionBerth> nbbm2BerthMapCopy = new HashMap<>();
-            for (RegionBerth b : list) {
-                if (StringUtils.isNotEmpty(b.getName())) {
-                    nbbm2BerthMapCopy.put(b.getNbbm(), b);
-                }
-            }
-            list = new ArrayList(nbbm2BerthMapCopy.values());
+            List<RegionBerth> listCopy = new ArrayList<>();
+            Collections.copy(listCopy, berthList);
-            if(null == allList)
-                allList = list;
-            else{
-                //增量更新
-                for(RegionBerth b : list){
-                    update(b);
-                }
+            for (RegionBerth b : list) {
+                if (!listCopy.contains(b))
+                    listCopy.add(b);
             }
             //排序
-            Collections.sort(allList, new Comparator<RegionBerth>() {
+            Collections.sort(listCopy, new Comparator<RegionBerth>() {
                 @Override
-                public int compare(RegionBerth o1, RegionBerth o2) {
-                    return Integer.parseInt(o1.getOrderNo()) - Integer.parseInt(o2.getOrderNo());
+                public int compare(RegionBerth b1, RegionBerth b2) {
+                    return b1.getOrderNo().compareTo(b2.getOrderNo());
                 }
             });
-        }
-    }*/
-
-    /**
-     * 泊位实时停放信息持久化线程
-
-    @Component
-    public static class BerthCachePersistenceThread extends Thread {
-
-        @Autowired
-        JdbcTemplate jdbcTemplate;
-
-        Logger logger = LoggerFactory.getLogger(this.getClass());
-
-        @Override
-        public void run() {
-            RegionBerth b;
-            for(int i = 0; i < 10; i++){
-                b = psts.poll();
-                if(null == b)
-                    break;
-                updateDb(b);
-            }
-        }
-
-        private void updateDb(RegionBerth b){
-            try{
-                String sql = "update bsth_p_berth set nbbm_real=?, charging = ? where id=?";
-                jdbcTemplate.update(sql, b.getNbbmReal(), b.getCharging() , b.getId());
-            }catch (Exception e){
-                logger.error("", e);
-            }
-        }
-    }
-     */
-/*
-    private static RegionBerth get(String nbbm) {
-        for(RegionBerth b : allList){
-            if(nbbm.equals(b.getNbbm()))
-                return b;
+            berthList = listCopy;
         }
-        return null;
     }
-*/
-
-/*    private static RegionBerth getById(Integer id) {
-        for(RegionBerth b : allList){
-            if(id.equals(b.getId()))
-                return b;
-        }
-        return null;
-    }
-
-    private static RegionBerth getByName(String name) {
-        for(RegionBerth b : allList){
-            if(name.equals(b.getName()))
-                return b;
-        }
-        return null;
-    }*/
-
-/*    private static void update(RegionBerth b){
-        RegionBerth cacheB = getById(b.getId());
-        if(null == cacheB)
-            allList.add(cacheB);
-        else{
-            cacheB.setNbbm(b.getNbbm());
-            cacheB.setOrderNo(b.getOrderNo());
-            cacheB.setName(b.getName());
-            cacheB.setRegion(b.getRegion());
-            cacheB.setUpdateDate(b.getUpdateDate());
-            cacheB.setRemark(b.getRemark());
-        }
-    }*/
 }
+package com.bsth.util;
+
+import com.google.common.collect.ArrayListMultimap;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * 数据转换
+ * Created by panzhao on 2017/3/13.
+ */
+public class ConvertUtil<T> {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+    private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyyMMdd");
+
+    /**
+     * 根据指定字段 将 list 分组
+     *
+     * @param list
+     * @param separator 字段使用分隔符连接 组成key
+     * @param fields
+     * @return
+     */
+    public ArrayListMultimap<String, T> groupMultiList(List<T> list, String separator, Field... fields) {
+        ArrayListMultimap<String, T> multimap = ArrayListMultimap.create();
+
+        String key;
+        //Object field;
+        try {
+            for (T t : list) {
+
+                key = "";
+                for (Field f : fields) {
+                    f.setAccessible(true);
+                    if(null == f.get(t))
+                        continue;
+                    //日期类型格式化为 YYYY-MM-DD
+                    if (f.getType().equals(Date.class))
+                        key += (separator + fmtyyyyMMdd.print(((Date) f.get(t)).getTime()));
+                    else
+                        key += (separator + f.get(t).toString());
+                }
+                if(key.length() > 1)
+                    key = key.substring(1);
+
+                multimap.put(key, t);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return multimap;
+    }
+
+    /**
+     * 根据指定字段 将 list 分组
+     *
+     * @param list
+     * @param separator 字段使用分隔符连接 组成key
+     * @param fields
+     * @return
+     */
+    public Map<String, T> groupList(List<T> list, String separator, Field... fields) {
+        Map<String, T> map = new HashMap<>();
+
+        String key;
+        //Object field;
+        try {
+            for (T t : list) {
+
+                key = "";
+                for (Field f : fields) {
+                    f.setAccessible(true);
+                    //日期类型格式化为 YYYY-MM-DD
+                    if (f.getType().equals(Date.class))
+                        key += (separator + fmtyyyyMMdd.print(((Date) f.get(t)).getTime()));
+                    else
+                        key += (separator + f.get(t).toString());
+                }
+                key = key.substring(1);
+
+                map.put(key, t);
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return map;
+    }
+
+    /**
+     * 计算并集
+     *
+     * @param all
+     * @param sub
+     * @return
+     */
+    public List<String> calcUnion(Collection<String> all, Collection<String> sub) {
+        List<String> rs = new ArrayList<>();
+
+        for (String str : all) {
+            if (sub.contains(str))
+                rs.add(str);
+        }
+        return rs;
+    }
+
+    /**
+     * 计算补集
+     *
+     * @param all
+     * @param sub
+     * @return
+     */
+    public List<String> calcComplement(Collection<String> all, Collection<String> sub) {
+        List<String> rs = new ArrayList<>();
+
+        for (String str : all) {
+            if (!sub.contains(str))
+                rs.add(str);
+        }
+        return rs;
+    }
+}