update...

潘钊
1 parent 151fe86f
Showing 6 changed files with 126 additions and 16 deletions
src/main/java/com/bsth/controller/real/CarParkRealController.java
src/main/java/com/bsth/data/real_park/CarParkRealHandler.java
src/main/java/com/bsth/data/schedule/real/InOutScheduleDataBuffer.java
src/main/java/com/bsth/service/schedule/impl/InOutScheduleServiceImpl.java
src/main/resources/static/assets/css/main.css
src/main/resources/static/pages/b_p_manager/b_p_main.html
@@ -27,4 +27,10 @@ public class CarParkRealController {
     public Map<String, Object> realChange(@RequestParam String s, @RequestParam String d){
         return CarParkRealHandler.realChange(s, d);
     }
+
+
+    @RequestMapping(value = "clear_berth", method = RequestMethod.POST)
+    public Map<String, Object> clear_berth(@RequestParam String b){
+        return CarParkRealHandler.clear_berth(b);
+    }
 }
@@ -188,6 +188,28 @@ public class CarParkRealHandler {
         return rs;
     }
+    /**
+     * 移除泊位上的车辆
+     * @param b
+     * @return
+     */
+    public static Map<String, Object> clear_berth(String b) {
+        Map<String, Object> rs = new HashMap();
+        try {
+            RealCarPark rcp1 = getByBerthName(b);
+
+            if(null != rcp1)
+                busRcps.remove(rcp1.getNbbm());
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", allBus());
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
     private static RealCarPark getByBerthName(String sName) {
         for (RealCarPark rcp : busRcps.values()) {
             if (sName.equals(rcp.getBerthName()))
@@ -47,6 +47,9 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
     @Autowired
     InoutSchFixedRefreshThread fixedRefreshThread;
+    private final static String TYPE_OUT = "out";
+    private final static String TYPE_IN = "in";
+
     static {
         allMaps = new ConcurrentHashMap<>();
         tccCode = ConfigUtil.get("tcc.code");
@@ -62,17 +65,21 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
     }
     public static List<ScheduleInOut> getOutsByUserId(String company, String jGh){
-        return filterOuts(pMultimap.get(company + "-" + jGh));
+        return filterByType(pMultimap.get(company + "-" + jGh), TYPE_OUT);
     }
     public static List<ScheduleInOut> getOutsByNbbm(String nbbm){
-        return filterOuts(cMultimap.get(nbbm));
+        return filterByType(cMultimap.get(nbbm), TYPE_OUT);
+    }
+
+    public static List<ScheduleInOut> getInsByNbbm(String nbbm){
+        return filterByType(cMultimap.get(nbbm), TYPE_IN);
     }
-    private static List<ScheduleInOut> filterOuts(List<ScheduleInOut> list){
+    private static List<ScheduleInOut> filterByType(List<ScheduleInOut> list, String type){
         List<ScheduleInOut> rs = new ArrayList<>();
         for(ScheduleInOut sio : list){
-            if(sio.getBcType().equals("out"))
+            if(sio.getBcType().equals(type))
                 rs.add(sio);
         }
@@ -80,6 +87,7 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         return rs;
     }
+
     public static List<ScheduleInOut> getByNbbm(String nbbm){
         return cMultimap.get(nbbm);
     }
@@ -116,9 +124,9 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         Collection<ScheduleInOut> vs = allMaps.values();
         for (ScheduleInOut sio : vs) {
             try{
-                if (sio.getBcType().equals("out"))
+                if (sio.getBcType().equals(TYPE_OUT))
                     outListCopy.add(sio);
-                else if (sio.getBcType().equals("in"))
+                else if (sio.getBcType().equals(TYPE_IN))
                     inListCopy.add(sio);
             }catch (Exception e){
@@ -211,6 +219,16 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         return getNearSch(getOutsByNbbm(nbbm), t);
     }
+    /**
+     * 车辆当前要执行的进场计划
+     * @param nbbm
+     * @param t
+     * @return
+     */
+    public static ScheduleInOut getCurrExecIn(String nbbm, Long t){
+        return getNearSch(getInsByNbbm(nbbm), t);
+    }
+
     private static ScheduleInOut getNearSch(List<ScheduleInOut> list, Long t){
         List<ScheduleInOut> execs = new ArrayList<>();
@@ -248,9 +266,9 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
                 for (ScheduleInOut sio : listCopy) {
                     //进场还是出场
                     if (sio.getQdzCode().equals(tccCode)) {
-                        sio.setBcType("out");
+                        sio.setBcType(TYPE_OUT);
                     } else if (sio.getZdzCode().equals(tccCode))
-                        sio.setBcType("in");
+                        sio.setBcType(TYPE_IN);
                     else
                         sio.setBcType("");
@@ -74,7 +74,13 @@ public class InOutScheduleServiceImpl implements InOutScheduleService {
     @Override
     public void busInOut(CarInOutEntity cio) {
         //车辆的出场计划
-        ScheduleInOut sio = InOutScheduleDataBuffer.getCurrExecOut(cio.getNbbm(), cio.getT());
+        ScheduleInOut sio = null;
+        if(cio.getType() == 2){
+            sio = InOutScheduleDataBuffer.getCurrExecIn(cio.getNbbm(), cio.getT());
+        }
+        else if(cio.getType() == 4){
+            sio = InOutScheduleDataBuffer.getCurrExecOut(cio.getNbbm(), cio.getT());
+        }
         //实时车辆进出场处理程序
@@ -690,6 +690,18 @@ table tr th, table tr td{
     background: #9f9f9f;
 }
+.berth_card_list>.berth_card>.car_blank.draging{
+    box-shadow: inset 0px 0px 15px 3px rgba(86, 84, 84, 0.59);
+}
+
+/*.berth_card_list>.berth_card>.car_blank.draging:before{
+    visibility: hidden !important;
+}*/
+
+/*.berth_card_list>.berth_card .draging .car_name{
+    color: #adadad;
+}*/
+
 .berth_card_list>.berth_card>.car_blank.no_elec:before{
     content: "无电量信息";
     width: 100%;
@@ -848,4 +860,24 @@ table tr th, table tr td{
 .trash_wrap.show.open{
     background-image: url(/assets/icon/trash_open.png);
     background-position: 20px 20px;
+}
+
+#b_p_manager_main_wrap .scroll_down{
+    position: absolute;
+    width: 100%;
+    height: 40px;
+    bottom: 0;
+    box-shadow: 0px -5px 15px rgba(116, 110, 110, 0.45);
+    background: rgba(253, 228, 151, 0.22);
+    display: none;
+}
+
+#b_p_manager_main_wrap .scroll_up{
+    position: absolute;
+    width: 100%;
+    height: 40px;
+    top: 0;
+    box-shadow: 0 5px 15px rgba(116, 110, 110, 0.45);
+    background: rgba(253, 228, 151, 0.22);
+    display: none;
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@
     <div class="drag_tip"></div>
     <div class="berth_card_list"></div>
+    <div class="scroll_up"></div>
+    <div class="scroll_down"></div>
     <script id="b_p_manager_main_list-temp" type="text/html">
         {{each list as b i}}
         <div class="berth_card">
@@ -138,7 +140,10 @@
             },false);
             trashWrap[0].addEventListener('drop', function () {
                 var s = $(drag_e).data('id');
-                alert(s + '丢垃圾桶');
+                gb_common.$post('/car_park_real/clear_berth', {b: s}, function (rs) {
+                    render_bus(rs.list);
+                });
+                drag_rest();
             },false);
@@ -147,6 +152,8 @@
             var handleDragStart = function (e) {
                 drag_e = this;
                 trashWrap.addClass('show');
+                $(this).addClass('draging');
+                $('.scroll_down,.scroll_up', wrap).show();
             };
             var handleDragEnd = function () {
@@ -183,14 +190,33 @@
                 gb_common.$post('/car_park_real/real_change', {s:s, d:d}, function (rs) {
                     render_bus(rs.list);
                 });
+                drag_rest();
+            };
-                /**
-                 * 泊位交换
-
-                gb_common.$post('/berth/real_change', {s:s, d:d}, function (rs) {
-                    render_cards(rs.list);
-                });*/
+            var drag_rest = function () {
+                $(drag_e).removeClass('draging');
+                drag_e = null;
+                $('.scroll_down,.scroll_up', wrap).hide();
             };
+            /**
+             * drag 时滚动条
+             */
+            var cardListWrap = $('.berth_card_list', wrap)[0];
+            $('.scroll_down', wrap)[0].addEventListener('dragover', function (e) {
+                e.preventDefault();
+                cardListWrap.scrollTop = cardListWrap.scrollTop + 10;
+                return true;
+            }, false);
+            $('.scroll_up', wrap)[0].addEventListener('dragover', function (e) {
+                e.preventDefault();
+                cardListWrap.scrollTop = cardListWrap.scrollTop - 10;
+                return true;
+            }, false);
+
+            /*$('.scroll_down', wrap)[0].addEventListener('dragleave', function () {
+                berthcardListWrap.scrollTop = berthcardListWrap.scrollTop + 20;
+            },false)*/
+
         })();
     </script>
 </div>
 \ No newline at end of file