update...

潘钊
1 parent 1cbb83a7
Showing 13 changed files with 367 additions and 50 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/basic/CompanyController.java
src/main/java/com/bsth/controller/schedule/InOutScheduleController.java
src/main/java/com/bsth/data/abnormal/MainAbnormalClient.java
src/main/java/com/bsth/data/abnormal/entity/AbnormalEntity.java
src/main/java/com/bsth/data/abnormal/handler/AttendanceHandler.java
src/main/java/com/bsth/data/abnormal/handler/InOutHandler.java
src/main/java/com/bsth/data/abnormal/scanner/InOutAbnormalScanner.java
src/main/java/com/bsth/data/abnormal/thread/AbnormalFixedScannerThread.java
src/main/java/com/bsth/data/schedule/real/ScheduleDataBuffer.java
src/main/java/com/bsth/service/schedule/ScheduleService.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/resources/static/pages/abnormal/fragments/m_tzrc.html
 package com.bsth.common;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.util.ConfigUtil;
+
 /**
  * 
  * @ClassName: Constants 
@@ -28,4 +31,21 @@ public class Constants {
 	 * 对外的上行输入接口
 	 */
 	public static final String UPSTREAM_URL = "/bus_park_dispatch/**";
+
+	//公司权限
+	public static  String authJsonStr;
+	public static  String tccName;
+	public static  String tccCode;
+
+	static{
+		JSONObject json = JSONObject.parseObject(ConfigUtil.get("data.company.json"));
+		JSONObject authJson = new JSONObject();
+		String[] codes = ConfigUtil.get("tcc.company.id").split(",");
+		for(int i = 0; i < codes.length; i ++){
+			authJson.put(codes[i], json.get(codes[i]));
+		}
+		authJsonStr = authJson.toJSONString();
+		tccName = ConfigUtil.get("tcc.name");
+		tccCode = ConfigUtil.get("tcc.code");
+	}
 }
 package com.bsth.controller.basic;
-import com.alibaba.fastjson.JSONObject;
-import com.bsth.util.ConfigUtil;
+import com.bsth.common.Constants;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -15,32 +14,17 @@ import java.util.Map;
 @RequestMapping("company_json")
 public class CompanyController {
-    static String jsonStr;
-    static String tccName;
-    static String tccCode;
-
-    static{
-        JSONObject json = JSONObject.parseObject(ConfigUtil.get("data.company.json"));
-        JSONObject authJson = new JSONObject();
-        String[] codes = ConfigUtil.get("tcc.company.id").split(",");
-        for(int i = 0; i < codes.length; i ++){
-            authJson.put(codes[i], json.get(codes[i]));
-        }
-        jsonStr = authJson.toJSONString();
-        tccName = ConfigUtil.get("tcc.name");
-        tccCode = ConfigUtil.get("tcc.code");
-    }
     @RequestMapping
     public String get(){
-        return jsonStr;
+        return Constants.authJsonStr;
     }
     @RequestMapping(value = "curr_tcc_info")
     public Map<String, String> getTccName(){
         Map<String, String> map = new HashMap<>();
-        map.put("name", tccName);
-        map.put("code", tccCode);
+        map.put("name", Constants.tccName);
+        map.put("code", Constants.tccCode);
         return map;
     }
 }
@@ -51,4 +51,9 @@ public class InOutScheduleController {
     public Map<String, Object> dftz(@RequestParam Map<String, Object> map){
         return inOutScheduleService.dftz(map);
     }
+
+    @RequestMapping(value = "tzrc", method = RequestMethod.POST)
+    public Map<String, Object> tzrc(@RequestParam String cpcsJson){
+        return inOutScheduleService.tzrc(cpcsJson);
+    }
 }
 package com.bsth.data.abnormal;
-import com.alibaba.fastjson.JSON;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.abnormal.handler.AttendanceHandler;
+import com.bsth.data.abnormal.handler.InOutHandler;
 import com.bsth.websocket.handler.SendUtils;
 import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
@@ -10,22 +11,24 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 /**
- * 异常监管主处理程序
+ * 异常监管
  * Created by panzhao on 2018/3/1.
  */
 @Component
 public class MainAbnormalClient {
     private static ArrayListMultimap<String, AbnormalEntity> lineMultimap;
-    private static ConcurrentMap<Long, AbnormalEntity> schIdMap;
+
+    @Autowired
+    AttendanceHandler attendanceHandler;
+
+    @Autowired
+    InOutHandler inOutHandler;
     static {
         lineMultimap = ArrayListMultimap.create();
-        schIdMap = new ConcurrentHashMap<>();
     }
     @Autowired
@@ -35,12 +38,19 @@ public class MainAbnormalClient {
     public void put(AbnormalEntity ae){
         lineMultimap.put(ae.getLineCode(), ae);
-        schIdMap.put(ae.getSchId(), ae);
+
+        if(ae.getType() == -1)
+            attendanceHandler.put(ae);
+        else if(ae.getType() == -2)
+            inOutHandler.put(ae);
         //web socket
         sendUtils.abnormal_ydwd(ae);
+    }
-        logger.info("应到未到: " + JSON.toJSONString(ae));
+    public void dftz(Long id, String source){
+        inOutHandler.dftzJd(id, source);
+        attendanceHandler.dftzJd(id, source);
     }
     public List<AbnormalEntity> findByLine(String lineCode){
@@ -44,6 +44,22 @@ public class AbnormalEntity {
     private String lpName;
+    //---------------
+    /**
+     * 处理人
+     */
+    private String handlerUser;
+
+    /**
+     * 处理时间
+     */
+    private Long handlerTime;
+
+    /**
+     * 说明
+     */
+    private String handlerDes;
+
     public int getType() {
         return type;
     }
@@ -107,4 +123,28 @@ public class AbnormalEntity {
     public void setLpName(String lpName) {
         this.lpName = lpName;
     }
+
+    public String getHandlerUser() {
+        return handlerUser;
+    }
+
+    public void setHandlerUser(String handlerUser) {
+        this.handlerUser = handlerUser;
+    }
+
+    public Long getHandlerTime() {
+        return handlerTime;
+    }
+
+    public void setHandlerTime(Long handlerTime) {
+        this.handlerTime = handlerTime;
+    }
+
+    public String getHandlerDes() {
+        return handlerDes;
+    }
+
+    public void setHandlerDes(String handlerDes) {
+        this.handlerDes = handlerDes;
+    }
 }
 package com.bsth.data.abnormal.handler;
+import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleDataBuffer;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * 考勤异常处理
  * Created by panzhao on 2018/3/1.
  */
+@Component
 public class AttendanceHandler {
+
+    /**
+     * 未处理异常
+     */
+    private static ConcurrentMap<Long, AbnormalEntity> schIdMap;
+
+    static {
+        schIdMap = new ConcurrentHashMap<>();
+    }
+
+    public void put(AbnormalEntity ae){
+        schIdMap.put(ae.getSchId(), ae);
+    }
+
+    /**
+     * 异常处理（待发调整）
+     * @param id
+     */
+    public void dftzJd(Long id, String source){
+        Long t = System.currentTimeMillis();
+
+        AbnormalEntity ae = schIdMap.get(id);
+        if(null == ae)
+            return;
+
+        ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+
+        if(sio.getAttJhTime() - t > 1000 * 60){
+            ae.setHandlerTime(t);
+            ae.setHandlerUser("system");
+            ae.setHandlerDes(source);
+
+            sio.setAbnormalStatus(0);
+
+            schIdMap.remove(ae.getSchId());
+        }
+    }
+
+    public void handler(Long id){
+
+    }
 }
 package com.bsth.data.abnormal.handler;
+import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleDataBuffer;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
 /**
  * 进出场异常处理
  * Created by panzhao on 2018/3/1.
  */
+@Component
 public class InOutHandler {
+
+    private static ConcurrentMap<Long, AbnormalEntity> schIdMap;
+
+    static {
+        schIdMap = new ConcurrentHashMap<>();
+    }
+
+    public void put(AbnormalEntity ae){
+        schIdMap.put(ae.getSchId(), ae);
+    }
+
+    /**
+     * 异常处理（待发调整）
+     * @param id
+     */
+    public void dftzJd(Long id, String source){
+        Long t = System.currentTimeMillis();
+
+        AbnormalEntity ae = schIdMap.get(id);
+        if(null == ae)
+            return;
+
+        ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+
+        if(sio.getDfsjT() - t > 1000 * 60){
+            ae.setHandlerTime(t);
+            ae.setHandlerUser("system");
+            ae.setHandlerDes(source);
+
+            sio.setAbnormalStatus(-1);
+
+            schIdMap.remove(ae.getSchId());
+        }
+    }
+
+    public void handler(Long id){
+
+    }
 }
 package com.bsth.data.abnormal.scanner;
+import com.bsth.data.abnormal.MainAbnormalClient;
+import com.bsth.data.abnormal.entity.AbnormalEntity;
+import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleDataBuffer;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
 /**
  * 进出场异常检测
  * Created by panzhao on 2018/3/1.
  */
+@Component
 public class InOutAbnormalScanner {
+
+    private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
+
+    @Autowired
+    MainAbnormalClient mainAbnormalClient;
+
+    public void scan(){
+        List<ScheduleInOut> list = ScheduleDataBuffer.all_out();
+
+        AbnormalEntity ae;
+        Long t = System.currentTimeMillis();
+        for(ScheduleInOut sio : list){
+
+            if(sio.getStatus() == -1)
+                continue;//烂班
+
+            if(sio.getDfsjT() >= t)
+                continue;//出场时间未到
+
+            if(sio.getOutTimeRfid() != null)
+                continue;//RFID已出场
+
+            if(sio.getAbnormalStatus() < -1)
+                continue;//已报异常
+
+            ae = new AbnormalEntity();
+            ae.setType(1);
+            ae.setSchId(sio.getId());
+            ae.setLineCode(sio.getLineCode());
+            ae.setNbbm(sio.getNbbm());
+            ae.setPlanTimeStr(fmtHHmm.print(sio.getDfsjT()));
+            ae.setPlanTime(sio.getDfsjT());
+            ae.setLpName(sio.getLpName());
+
+            mainAbnormalClient.put(ae);
+
+            sio.setAbnormalStatus(-2);
+        }
+    }
 }
 package com.bsth.data.abnormal.thread;
 import com.bsth.data.abnormal.scanner.AttendanceAbnormalScanner;
+import com.bsth.data.abnormal.scanner.InOutAbnormalScanner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,11 +19,15 @@ public class AbnormalFixedScannerThread extends Thread {
     @Autowired
     AttendanceAbnormalScanner attendanceAbnormalScanner;
+    @Autowired
+    InOutAbnormalScanner inOutAbnormalScanner;
+
     @Override
     public void run() {
         try {
             attendanceAbnormalScanner.scan();
+            inOutAbnormalScanner.scan();
         } catch (Exception e) {
             logger.error("", e);
         }
@@ -111,12 +111,38 @@ public class ScheduleDataBuffer implements CommandLineRunner {
     }
     public static void put(ScheduleInOut sio) {
+        try {
+            if(null == sio.getUt())
+                sio.setUt(System.currentTimeMillis());
+            //公司编码
+            Line line = LineDataBuffer.get(sio.getLineCode());
+            sio.setGsbm(line.getCompany());
+            sio.setFgsbm(line.getBrancheCompany());
+
+            //分离驾驶员工号
+            String[] jsyArray = sio.getJsy().split("/");
+            sio.setjGh(jsyArray[0]);
+
+            //为驾驶员名称做拼音映射
+            sio.setjNameFullChars(PinyinHelper.convertToPinyinString(jsyArray[1], "" , PinyinFormat.WITHOUT_TONE).toUpperCase());
+            sio.setjNameCamelChars(PinyinHelper.getShortPinyin(jsyArray[1]).toUpperCase());
+        } catch (Exception e) {
+            logger.info("计划异常 ID （jsy error...）" + sio.getId());
+        }
+
+        //计划报到时间
+        sio.setAttJhTime(sio.getDfsjT() - 1000 * 60 * 15);
+
         if (allMaps.containsKey(sio.getId()))
             update(allMaps.get(sio.getId()), sio);
         else
             allMaps.put(sio.getId(), sio);
     }
+    public static ScheduleInOut findById(Long id){
+        return allMaps.get(id);
+    }
+
     /**
      * 分离进出场计划
      */
@@ -167,7 +193,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
     /**
      * 人员，车辆分组的计划
      */
-    private static void p_c_mapps() {
+    public static void p_c_mapps() {
         //人员和车辆映射
         ArrayListMultimap pMultimapCopy = ArrayListMultimap.create(),
                 cMultimapCopy = ArrayListMultimap.create();
@@ -303,25 +329,6 @@ public class ScheduleDataBuffer implements CommandLineRunner {
                         sio.setBcType(TYPE_IN);
                     else
                         sio.setBcType("");
-
-                    //公司编码
-                    line = LineDataBuffer.get(sio.getLineCode());
-                    sio.setGsbm(line.getCompany());
-                    sio.setFgsbm(line.getBrancheCompany());
-                    try {
-                        //分离驾驶员工号
-                        String[] jsyArray = sio.getJsy().split("/");
-                        sio.setjGh(jsyArray[0]);
-
-                        //为驾驶员名称做拼音映射
-                        sio.setjNameFullChars(PinyinHelper.convertToPinyinString(jsyArray[1], "" , PinyinFormat.WITHOUT_TONE).toUpperCase());
-                        sio.setjNameCamelChars(PinyinHelper.getShortPinyin(jsyArray[1]).toUpperCase());
-                    } catch (Exception e) {
-                        logger.info("计划异常 ID （jsy error...）" + sio.getId());
-                    }
-
-                    //计划报到时间
-                    sio.setAttJhTime(sio.getDfsjT() - 1000 * 60 * 15);
                 }
                 logger.info("同步进出场班数量 " + listCopy.size());
@@ -32,6 +32,8 @@ public interface ScheduleService {
     Map<String,Object> dftz(Map<String, Object> map);
+    Map<String,Object> tzrc(String cpcsJson);
+
     //void inOut(CarInOutEntity obj);
     //void busInOut(CarInOutEntity obj);
 package com.bsth.service.schedule.impl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.abnormal.MainAbnormalClient;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
@@ -14,6 +17,7 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.schedule.ScheduleService;
 import com.bsth.util.ConfigUtil;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -146,6 +150,9 @@ public class ScheduleServiceImpl implements ScheduleService {
             if("SUCCESS".equals(rs.get("status"))){
                 ScheduleInOut sio = JSON.toJavaObject(JSON.parseObject(rs.get("t").toString()), ScheduleInOut.class);
                 ScheduleDataBuffer.put(sio);
+
+                //处理相关异常
+                mainAbnormalClient.dftz(sio.getId(), "调档");
             }
         }catch (Exception e){
             logger.error("", e);
@@ -154,4 +161,36 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> tzrc(String cpcsJson) {
+        JSONObject rs = new JSONObject();
+        try{
+            cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
+            Map<String, Object> params = new HashMap<>();
+
+            params.put("userId", SecurityUtils.getCurrentUser().getUserName());
+            params.put("cpcs", JSON.parseArray(cpcsJson));
+            params.put("tccCode", Constants.tccCode);
+            StringBuilder sb = HttpClientUtils.post(dataUrl + "/tcc_tzrc" + RsRequestUtils.getParams(), JSON.toJSONString(params));
+
+            rs = JSON.parseObject(sb.toString());
+
+            if("SUCCESS".equals(rs.get("status"))){
+                JSONArray array = rs.getJSONArray("list");
+                int size = array.size();
+                for(int i=0; i < size;i ++){
+                    ScheduleDataBuffer.put(JSON.toJavaObject(array.getJSONObject(i), ScheduleInOut.class));
+                }
+            }
+
+            //重新按人车分组数据
+            ScheduleDataBuffer.p_c_mapps();
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "服务器出现异常！");
+        }
+        return rs;
+    }
 }
@@ -40,9 +40,9 @@
                 <label class="uk-form-label">车辆</label>
                 <div class="uk-form-controls">
                     <div class="ct_auto_wrap" id="nbbmAutoCompleter">
-                        <input class="uk-input" name="nbbm" type="text" placeholder="车辆自编号" disabled autocomplete="off">
+                        <input class="uk-input" name="nbbm" type="text" placeholder="车辆自编号" autocomplete="off">
                     </div>
-                    <input class="uk-checkbox switch_c_box" type="checkbox" >
+                    <input class="uk-checkbox switch_c_box" type="checkbox" checked>
                 </div>
             </div>
             <div class="uk-width-1-2@s">
@@ -97,6 +97,9 @@
                 ct_autocompleter.initBus($('#nbbmAutoCompleter', wrap));
                 data && data.caller && data.caller();
+
+                //提交
+                $(modalId).on('click', '.submit-btn', _submit);
             });
             var reset = function () {
@@ -162,6 +165,9 @@
                     opts += '<option>'+lp+'</option>';
                 }
                 $('form [name=lpName]', wrap).html(opts);
+
+                if(!_initFlag)
+                    $('form [name=lpName]', wrap).trigger('change');
             };
             //线路切换
@@ -227,6 +233,57 @@
                 else
                     input.attr('disabled', 'disabled');
             });
+
+            /**
+             * 提交
+             */
+            function _submit() {
+                var f = $('form', modalId);
+                var fData = f.serializeJSON();
+
+                if(!fData['nbbm'] && !$('[name=nbbm]', f).attr('disabled')){
+                    _shake_elem($('[name=nbbm]', f));
+                    return UIkit.notification('车辆不能为空！', 'danger');
+                }
+
+                if(!fData['jsy'] && !$('[name=jsy]', f).attr('disabled')){
+                    _shake_elem($('[name=nbbm]', f));
+                    return UIkit.notification('驾驶员不能为空！', 'danger');
+                }
+
+                var checkeds = $('.sch_list_table>tr.active', modalId);
+                if (checkeds.length == 0)
+                    return UIkit.notification('请选中要调整的班次！', 'danger');
+
+
+                console.log('fDatafData', fData);
+                var data = [];
+                var schId;
+                $.each(checkeds, function () {
+                    schId = $(this).data('id');
+                    data.push({
+                        schId: schId,
+                        jsy: fData.jsy,
+                        spy: fData.spy,
+                        clZbh: fData.nbbm
+                    });
+                });
+
+                console.log('data', data);
+                gb_common.$post('/in_out/tzrc', {cpcsJson: JSON.stringify(data)}, function (rs) {
+                    console.log('rsrsrs', rs);
+
+                    UIkit.notification('操作成功！', 'success');
+                    gb_os_card.update(rs.list);
+                    UIkit.modal(modalId).hide();
+                });
+            }
+
+            function _shake_elem($e) {
+                $e.addClass('uk-animation-shake').one('animationend', function () {
+                    $(this).removeClass('uk-animation-shake');
+                });
+            }
         })();
     </script>
 </div>
 \ No newline at end of file