update...

潘钊
1 parent 39fe1af8
Showing 5 changed files with 42 additions and 16 deletions
src/main/java/com/bsth/data/led_http/LedHttpPushHandler.java
src/main/java/com/bsth/data/real_park/CarParkRealHandler.java
src/main/java/com/bsth/service/berth/impl/BerthServiceImpl.java
src/main/resources/static/pages/basic_data/bus/list.html
src/main/resources/static/pages/basic_data/person_card/list.html
@@ -4,7 +4,6 @@ import com.bsth.data.real_park.CarParkRealHandler;
 import com.bsth.data.utils.HttpClientUtils_tms;
 import com.bsth.entity.ac.CarInOutEntity;
 import com.bsth.entity.berth.RegionBerth;
-import com.bsth.entity.real.RealCarPark;
 import com.bsth.service.berth.BerthService;
 import com.bsth.util.ConfigUtil;
 import org.slf4j.Logger;
@@ -66,8 +65,8 @@ public class LedHttpPushHandler {
         dataUrlLinked.add(url);
     }
  
-    public static void busIn(RealCarPark rcp) {
-        String params = "?cph=" + rcp.getNbbm() + "&park=" + rcp.getBerthName();
+    public static void busIn(String cph, String berthName) {
+        String params = "?cph=" + cph + "&park=" + berthName;
         String url = baseUrl + "jcPlan" + params;
  
         dataUrlLinked.add(url);
@@ -120,6 +120,12 @@ public class CarParkRealHandler {
         if (StringUtils.isEmpty(nbbm))
             return;
  
+        Bus bus = BusDataBuffer.findOne(nbbm);
+        if(!bus.isSfdc()){
+            LedHttpPushHandler.busIn(bus.getCarPlate(), "柴油泊位区");//柴油车
+            return;
+        }
+
         RealCarPark rcp = new RealCarPark();
  
         RegionBerth b;
@@ -138,16 +144,12 @@ public class CarParkRealHandler {
             return;
         }
  
+        rcp.setPlateNo(bus.getCarPlate());
         rcp.setBerthName(b.getName());
         rcp.setNbbm(nbbm);
         rcp.setInTime(System.currentTimeMillis());
         rcp.setType(0);
  
-        //车牌号
-        Bus bus = BusDataBuffer.findOne(nbbm);
-        if(null != bus)
-            rcp.setPlateNo(bus.getCarPlate());
-
         //车辆已经在场内
         if(!busRcps.containsKey(nbbm) || StringUtils.isNotEmpty(busRcps.get(nbbm).getBerthName())){
             //电量信息
@@ -160,7 +162,7 @@ public class CarParkRealHandler {
         }
  
         //push led
-        LedHttpPushHandler.busIn(rcp);
+        LedHttpPushHandler.busIn(rcp.getPlateNo(), rcp.getBerthName());
     }
  
     /**
@@ -87,12 +87,15 @@ public class BerthServiceImpl extends BaseServiceImpl&lt;RegionBerth, Integer&gt; impl
         RegionBerth b = null;
  
         try {
-            b = nextChargeBerth();
+            /*b = nextChargeBerth();
             if (null != b)
                 return b;
  
             //最快充电完成枪的空余泊位
-            b = maxElecBerth();
+            b = maxElecBerth();*/
+
+            //获取按顺序排列的下一个泊位
+            b = nextByOrder();
         } catch (Exception e) {
             logger.error("", e);
         }
@@ -180,6 +183,28 @@ public class BerthServiceImpl extends BaseServiceImpl&lt;RegionBerth, Integer&gt; impl
         return near;
     }
  
+    private RegionBerth nextByOrder(){
+        //跳过固定泊位
+        List<RegionBerth> templist = new ArrayList<>();
+        for(RegionBerth b : berthList){
+            if(!lockBerthMap.inverse().containsKey(b.getName()))
+                templist.add(b);
+        }
+
+        Collections.sort(templist, new Comparator<RegionBerth>() {
+            @Override
+            public int compare(RegionBerth b1, RegionBerth b2) {
+                return Integer.parseInt(b1.getOrderNo()) - Integer.parseInt(b2.getOrderNo());
+            }
+        });
+
+        for(RegionBerth b : templist){
+            if(StringUtils.isEmpty(b.getNbbm()))
+                return b;
+        }
+        return null;
+    }
+
     private RegionBerth nearBerthByCp(List<RegionBerth> list) {
         Collections.sort(list, new Comparator<RegionBerth>() {
             @Override
@@ -29,7 +29,7 @@
                 </div>
                 <div class="ct_field">
                     <label>卡号：
-                        <input class="uk-input" name="idRFID" placeholder="卡ID号">
+                        <input class="uk-input" name="idRfid" placeholder="卡ID号">
                     </label>
                 </div>
                 <div class="ct_field">
@@ -45,7 +45,7 @@
                     <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
                 </div>
                 <div class="ct_field" style="vertical-align: bottom;">
-                    <a class="uk-button uk-button-text" id="import_person_excel">导入车辆&车卡信息</a>
+                    <a class="uk-button uk-button-text" id="import_person_excel">导入</a>
                 </div>
             </form>
         </div>
@@ -59,7 +59,7 @@
                     <th>车辆自编号</th>
                     <th>ID卡号</th>
                     <th>卡标签号</th>
-                    <th>备注</th>
+                    <th>是否电车</th>
                     <th>操作</th>
                 </tr>
                 </thead>
@@ -84,7 +84,7 @@
             <td>{{b.nbbm}}</td>
             <td>{{b.idRfid}}</td>
             <td>{{b.tagRfid}}</td>
-            <td>{{b.remark}}</td>
+            <td>{{b.sfdc?"电车":"油车"}}</td>
             <td><a class="edit_icon" data-nbbm="{{b.nbbm}}" uk-icon="icon: file-edit"></a></td>
         </tr>
         {{/each}}
@@ -61,7 +61,7 @@
                     <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
                 </div>
                 <div class="ct_field" style="vertical-align: bottom;">
-                    <a class="uk-button uk-button-text" id="import_person_excel">导入卡信息</a>
+                    <a class="uk-button uk-button-text" id="import_person_excel">导入</a>
                 </div>
             </form>
         </div>