update...

潘钊
1 parent 69bd7921
Showing 6 changed files with 78 additions and 50 deletions
src/main/java/com/bsth/data/schedule/real/InOutScheduleDataBuffer.java
src/main/java/com/bsth/entity/ac/CarInOutEntity.java
src/main/java/com/bsth/service/basic/impl/PersonServiceImpl.java
src/main/java/com/bsth/util/HexCardTransform.java
src/main/resources/static/assets/css/main.css
src/main/resources/static/pages/b_p_manager/b_p_main.html
@@ -115,10 +115,15 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         Collection<ScheduleInOut> vs = allMaps.values();
         for (ScheduleInOut sio : vs) {
-            if (sio.getBcType().equals("out"))
-                outListCopy.add(sio);
-            else if (sio.getBcType().equals("in"))
-                inListCopy.add(sio);
+            try{
+                if (sio.getBcType().equals("out"))
+                    outListCopy.add(sio);
+                else if (sio.getBcType().equals("in"))
+                    inListCopy.add(sio);
+
+            }catch (Exception e){
+                logger.error("", e);
+            }
         }
         outList = outListCopy;
@@ -167,6 +172,7 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         old.setZdsjT(now.getZdsjT());
         old.setAttJhTime(now.getAttJhTime());
         old.setUt(now.getUt());
+        old.setStatus(now.getStatus());
         boolean isCPerson = !old.getJsy().equals(now.getJsy());//换人
         boolean isCCar = !old.getNbbm().equals(now.getNbbm());//换车
@@ -182,7 +188,7 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
     @Override
     public void run(String... strings) throws Exception {
-        Application.mainServices.scheduleWithFixedDelay(fixedRefreshThread, 10, 30, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(fixedRefreshThread, 40, 30, TimeUnit.SECONDS);
     }
     /**
@@ -209,6 +215,8 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
         List<ScheduleInOut> execs = new ArrayList<>();
         for(ScheduleInOut sio : list){
+            if(sio.getStatus() == -1)//烂班
+                continue;
             if(Math.abs(t - sio.getDfsjT()) < SPACE_THRESHOLD){
                 execs.add(sio);
             }
@@ -238,8 +246,6 @@ public class InOutScheduleDataBuffer implements CommandLineRunner {
                 Collections.sort(listCopy, schComparator);
                 Line line;
                 for (ScheduleInOut sio : listCopy) {
-                    if(sio.getStatus()==-1)
-                        continue;
                     //进场还是出场
                     if (sio.getQdzCode().equals(tccCode)) {
                         sio.setBcType("out");
@@ -5,6 +5,7 @@ import com.bsth.data.basic.person.PersonDataBuffer;
 import com.bsth.data.signal.dto.RfidInOutDto;
 import com.bsth.entity.Bus;
 import com.bsth.entity.Person;
+import com.bsth.util.HexCardTransform;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -120,7 +121,8 @@ public class CarInOutEntity {
             cio.setLineName(b.getLineName());
         }
-        Person p = PersonDataBuffer.findByCard(cio.getpCard());
+        String cardId = HexCardTransform.hexConvert(cio.getpCard());
+        Person p = PersonDataBuffer.findByCard(cardId);
         if(null != p){
             cio.setJsy(p.getUserId() + "/" + p.getPersonnelName());
             cio.setCompany(p.getCompanyCode());
@@ -7,6 +7,7 @@ import com.bsth.data.utils.ListPageQueryUtils;
 import com.bsth.entity.Person;
 import com.bsth.service.basic.PersonService;
 import com.bsth.util.CtStringUtils;
+import com.bsth.util.HexCardTransform;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -21,7 +22,6 @@ import org.springframework.util.Base64Utils;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -216,7 +216,7 @@ public class PersonServiceImpl implements PersonService {
         if(CtStringUtils.isChinese(data.get("jobCode")))
             data.put("error", "1");
         try {
-            data.put("idCard", hexConvert(getCellData(row.getCell(2))));
+            data.put("idCard", HexCardTransform.hexConvert(getCellData(row.getCell(2))));
             if(data.get("idCard").equals("0000000000")) {
                 data.put("idCard", "");
@@ -254,31 +254,8 @@ public class PersonServiceImpl implements PersonService {
         return v;
     }
-    /**
-     * 16进制卡ID号转10进制
-     *
-     * @param hexCode
-     * @return
-     */
-    private String hexConvert(String hexCode) {
-        //16进制补满8位
-        hexCode = padLeft(hexCode, 8, '0');
-
-        char[] cardIdArray = hexCode.toCharArray();
-        String cardId16Counter = "";
-        String cardId10 = "";
-        //倒序
-        for (int i = cardIdArray.length - 1; i >= 0; i -= 2) {
-            cardId16Counter += cardIdArray[i - 1] + "" + cardIdArray[i];
-        }
-        //转10进制
-        cardId10 = String.valueOf(new BigInteger(cardId16Counter, 16));
-        //10进制补满10位
-        cardId10 = padLeft(cardId10, 10, '0');
-        return cardId10;
-    }
-    /**
+   /**
      * 截断工号前缀
      *
      * @param jobCode
@@ -290,20 +267,8 @@ public class PersonServiceImpl implements PersonService {
         }
         if (jobCode.length() < 6) {
-            jobCode = padLeft(jobCode, 6, '0');
+            jobCode = HexCardTransform.padLeft(jobCode, 6, '0');
         }
         return jobCode;
     }
-
-    public String padLeft(String oriStr, int len, char alexin) {
-        String str = "";
-        int strlen = oriStr.length();
-        if (strlen < len) {
-            for (int i = 0; i < len - strlen; i++) {
-                str = str + alexin;
-            }
-        }
-        str = str + oriStr;
-        return str;
-    }
 }
+package com.bsth.util;
+
+import java.math.BigInteger;
+
+/**
+ * Created by panzhao on 2017/9/27.
+ */
+public class HexCardTransform {
+
+    /**
+     * 16进制卡ID号转10进制
+     *
+     * @param hexCode
+     * @return
+     */
+    public static String hexConvert(String hexCode) {
+        //16进制补满8位
+        hexCode = padLeft(hexCode, 8, '0');
+
+        char[] cardIdArray = hexCode.toCharArray();
+        String cardId16Counter = "";
+        String cardId10 = "";
+        //倒序
+        for (int i = cardIdArray.length - 1; i >= 0; i -= 2) {
+            cardId16Counter += cardIdArray[i - 1] + "" + cardIdArray[i];
+        }
+        //转10进制
+        cardId10 = String.valueOf(new BigInteger(cardId16Counter, 16));
+        //10进制补满10位
+        cardId10 = padLeft(cardId10, 10, '0');
+        return cardId10;
+    }
+
+    public static String padLeft(String oriStr, int len, char alexin) {
+        String str = "";
+        int strlen = oriStr.length();
+        if (strlen < len) {
+            for (int i = 0; i < len - strlen; i++) {
+                str = str + alexin;
+            }
+        }
+        str = str + oriStr;
+        return str;
+    }
+}
@@ -620,6 +620,9 @@ table tr th, table tr td{
     -webkit-user-select: none;
     user-select: none;
+    overflow: auto;
+    height: calc(100% - 50px);
+    position: relative;
 }
 .berth_card_list>.berth_card{
@@ -669,7 +672,7 @@ table tr th, table tr td{
 }
 .berth_card_list>.berth_card>.car_blank.charging:before{
-    content: "正在充电...";
+    content: "";
     width: 100%;
     height: 60%;
     display: block;
@@ -683,7 +686,7 @@ table tr th, table tr td{
 }
 .berth_card_list>.berth_card>.car_blank.no_elec{
-    background: #607D8B;
+    background: #9f9f9f;
 }
 .berth_card_list>.berth_card>.car_blank.no_elec:before{
@@ -816,4 +819,8 @@ table tr th, table tr td{
     vertical-align: middle !important;
     font-size: 18px;
     font-weight: 600;
+}
+
+.signal_gps{
+    color: #9e9e9e;
 }
 \ No newline at end of file
-<div id="b_p_manager_main_wrap" style="position: relative;">
+<div id="b_p_manager_main_wrap" style="position: relative;height: 100%;">
     <div class="drag_tip"></div>
     <div class="berth_card_list"></div>
@@ -18,6 +18,8 @@
     <script>
         (function () {
             var wrap = '#b_p_manager_main_wrap';
+            //滚动条
+            $('.berth_card_list', wrap).perfectScrollbar({suppressScrollX: true});
             /** 加载全部泊位信息 */
             $.get('/berth/all', function (list) {
@@ -28,6 +30,7 @@
                 initDragEvents();
                 //定时刷新实时车辆信息
                 fixedTimeRefresh();
+                $('.berth_card_list', wrap).perfectScrollbar('update');
             });
             //定时刷新实时车辆信息