update...

潘钊
1 parent fc664e40
Showing 9 changed files with 238 additions and 9 deletions
src/main/java/com/bsth/data/abnormal/MainAbnormalClient.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/attendance/RealAttendaceHandler.java
src/main/java/com/bsth/data/in_out/RealInoutHandler.java
src/main/java/com/bsth/data/schedule/real/ScheduleDataBuffer.java
src/main/java/com/bsth/service/schedule/impl/ScheduleServiceImpl.java
src/main/resources/static/assets/css/main.css
src/main/resources/static/pages/abnormal/fragments/type_0/h_cont_hrcc.html
@@ -105,4 +105,23 @@ public class MainAbnormalClient {
     public AbnormalEntity qiandao(ScheduleInOut sio, JsyAttendance att) {
         return attendanceHandler.qiandao(sio, att);
     }
+
+    /**
+     * 调整人车后更新异常信息
+     * @param sio
+     * @return
+     */
+    public List<AbnormalEntity> updateTzrc(ScheduleInOut sio) {
+        List<AbnormalEntity> aes = new ArrayList<>();
+        AbnormalEntity ae;
+
+        ae = attendanceHandler.updateCp(sio);
+        if(null != ae)
+            aes.add(ae);
+
+        ae = inOutHandler.updateCc(sio);
+        if(null != ae)
+            aes.add(ae);
+        return aes;
+    }
 }
@@ -110,4 +110,23 @@ public class AttendanceHandler {
         schIdMap.remove(ae.getSchId());
         return ae;
     }
+
+    public AbnormalEntity updateCp(ScheduleInOut sio) {
+        AbnormalEntity ae = schIdMap.get(sio.getId());
+        if(null == ae)
+            return null;
+
+        if(!sio.getJsy().equals(ae.getJsy()))
+            ae.setJsy(sio.getJsy());
+
+        if(null != sio.getAttSjTime()){
+            ae.setHandlerTime(sio.getAttSjTime());
+            ae.setHandlerUser("system");
+            ae.setHandlerDes(fmtHHmm.print(sio.getAttSjTime()) + " 一体机签到");
+
+            sio.reCalcAnStatus();
+            schIdMap.remove(ae.getSchId());
+        }
+        return ae;
+    }
 }
@@ -96,4 +96,23 @@ public class InOutHandler {
         schIdMap.remove(ae.getSchId());
         return ae;
     }
+
+    public AbnormalEntity updateCc(ScheduleInOut sio) {
+        AbnormalEntity ae = schIdMap.get(sio.getId());
+        if(null == ae)
+            return null;
+
+        if(!sio.getNbbm().equals(ae.getNbbm()))
+            ae.setNbbm(sio.getNbbm());
+
+        if(null != sio.getOutTimeRfid()){
+            ae.setHandlerTime(sio.getOutTimeRfid());
+            ae.setHandlerUser("system");
+            ae.setHandlerDes("RFID信号出场，" + fmtHHmm.print(sio.getOutTimeRfid()));
+
+            sio.reCalcAnStatus();
+            schIdMap.remove(ae.getSchId());
+        }
+        return ae;
+    }
 }
@@ -4,11 +4,17 @@ import com.bsth.data.abnormal.MainAbnormalClient;
 import com.bsth.data.abnormal.entity.AbnormalEntity;
 import com.bsth.data.attendance.entity.JsyAttendance;
 import com.bsth.data.schedule.dto.ScheduleInOut;
+import com.bsth.data.schedule.real.ScheduleComparator;
 import com.bsth.data.schedule.real.ScheduleDataBuffer;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
 /**
  * 实时签到退数据管理
  * Created by panzhao on 2018/3/27.
@@ -23,9 +29,19 @@ public class RealAttendaceHandler {
     MainAbnormalClient mainAbnormalClient;
  
     /**
+     * K：工号 V：签到信息
+     */
+    private static ArrayListMultimap<String, JsyAttendance> qdListMap;
+
+    static {
+        qdListMap = ArrayListMultimap.create();
+    }
+
+    /**
      * 签到
      */
     public void attendace(JsyAttendance att){
+        qdListMap.put(att.getUserId(), att);
         //驾驶员的出场计划
         ScheduleInOut sio = ScheduleDataBuffer.getCurrExecOut(att.getCompany(), att.getUserId(), att.getAt());
  
@@ -40,4 +56,63 @@ public class RealAttendaceHandler {
         //通知页面
         sendUtils.scheduleAttendace(sio, ae);
     }
+
+    /**
+     * 重新匹配驾驶员报到时间
+     * @param jGh1
+     * @param jGh2
+     */
+    public void reCalcOutSignal(String company, String jGh1, String jGh2) {
+        //获取驾驶员的出场计划
+        List<ScheduleInOut> arrayA = ScheduleDataBuffer.getOutsByUserId(company, jGh1)
+                , arrayB = ScheduleDataBuffer.getOutsByUserId(company, jGh2);
+
+        reCalcOutSignal(arrayA);
+        reCalcOutSignal(arrayB);
+    }
+
+    private void reCalcOutSignal(List<ScheduleInOut> list) {
+        if (null == list || list.size() == 0)
+            return;
+
+        //清空班次上的签到时间
+        for (ScheduleInOut sio : list)
+            sio.setAttSjTime(null);
+
+        List<JsyAttendance> atts = qdListMap.get(list.get(0).getjGh());
+
+        if (null == atts || atts.size() == 0)
+            return;
+
+        Collections.sort(list, new ScheduleComparator());
+        Collections.sort(atts, new AttendanceComp());
+
+        for (JsyAttendance att : atts) {
+
+            for (ScheduleInOut sio : list)
+                matchJh2Sj(att, sio);
+        }
+    }
+
+    /**
+     * 匹配计划和实际
+     *
+     * @param att
+     * @param sio
+     */
+    private void matchJh2Sj(JsyAttendance att, ScheduleInOut sio) {
+        if(Math.abs(att.getAttTime().getTime() - sio.getAttJhTime()) > ScheduleDataBuffer.SPACE_THRESHOLD)
+            return;//2小时内
+
+        if (null == sio.getOutTimeRfid())
+            sio.setAttSjTime(att.getAttTime().getTime());
+    }
+
+    class AttendanceComp implements Comparator<JsyAttendance>{
+
+        @Override
+        public int compare(JsyAttendance o1, JsyAttendance o2) {
+            return (int) (o1.getAttTime().getTime() - o2.getAttTime().getTime());
+        }
+    }
 }
@@ -156,7 +156,8 @@ public class RealInoutHandler {
      */
     public void reCalcOutSignal(String name1, String nbbm2) {
         //获取车辆的出场计划
-        List<ScheduleInOut> arrayA = ScheduleDataBuffer.getByNbbm(name1), arrayB = ScheduleDataBuffer.getByNbbm(nbbm2);
+        List<ScheduleInOut> arrayA = ScheduleDataBuffer.getByNbbm(name1)
+                , arrayB = ScheduleDataBuffer.getByNbbm(nbbm2);
  
         reCalcOutSignal(arrayA);
         reCalcOutSignal(arrayB);
@@ -197,6 +198,9 @@ public class RealInoutHandler {
      * @param sio
      */
     private void matchJh2Sj(CarInOutEntity cio, ScheduleInOut sio) {
+        if(Math.abs(cio.getT() - sio.getDfsjT()) > ScheduleDataBuffer.SPACE_THRESHOLD)
+            return;//2小时内
+
         if (null == sio.getOutTimeRfid()
                 || outSignalMatch(sio, cio))
             sio.setOutTimeRfid(cio.getT());
@@ -2,6 +2,8 @@ package com.bsth.data.schedule.real;
  
 import com.alibaba.fastjson.JSON;
 import com.bsth.Application;
+import com.bsth.data.abnormal.MainAbnormalClient;
+import com.bsth.data.attendance.RealAttendaceHandler;
 import com.bsth.data.basic.line.LineDataBuffer;
 import com.bsth.data.in_out.RealInoutHandler;
 import com.bsth.data.schedule.dto.ScheduleInOut;
@@ -45,7 +47,7 @@ public class ScheduleDataBuffer implements CommandLineRunner {
     //排序器
     static ScheduleComparator schComparator = new ScheduleComparator();
  
-    static final int SPACE_THRESHOLD = 1000 * 60 * 60 * 2;
+    public static final int SPACE_THRESHOLD = 1000 * 60 * 60 * 2;
  
     static Logger logger = LoggerFactory.getLogger(ScheduleDataBuffer.class);
     @Autowired
@@ -53,6 +55,11 @@ public class ScheduleDataBuffer implements CommandLineRunner {
  
     @Autowired
     RealInoutHandler realInoutHandler;
+    @Autowired
+    RealAttendaceHandler realAttendaceHandler;
+
+    @Autowired
+    MainAbnormalClient mainAbnormalClient;
  
     private final static String TYPE_OUT = "out";
     private final static String TYPE_IN = "in";
@@ -223,14 +230,18 @@ public class ScheduleDataBuffer implements CommandLineRunner {
         boolean isCCar = !old.getNbbm().equals(now.getNbbm());//换车
  
         if (isCPerson) {
+            String oldJgh = old.getjGh();
+            old.setJsy(now.getJsy());
+            old.setjGh(now.getjGh());
             //重新匹配人员计划和实际报到
+            realAttendaceHandler.reCalcOutSignal(old.getGsbm(), oldJgh, now.getjGh());
         }
  
         if (isCCar) {
-            String oldName = old.getNbbm();
+            String oldNbbm = old.getNbbm();
             old.setNbbm(now.getNbbm());
             //重新匹配车辆计划和实际出场
-            realInoutHandler.reCalcOutSignal(oldName, now.getNbbm());
+            realInoutHandler.reCalcOutSignal(oldNbbm, now.getNbbm());
         }
     }
  
@@ -192,12 +192,17 @@ public class ScheduleServiceImpl implements ScheduleService {
  
             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));
+                List<ScheduleInOut> list = JSONArray.parseArray(rs.getString("list"), ScheduleInOut.class);//有更新的出场班次
+                List<AbnormalEntity> aes = new ArrayList<>();//有更新的异常信息
+                for(ScheduleInOut sio : list){
+                    scheduleDataBuffer.put(sio);
+                    aes.addAll(mainAbnormalClient.updateTzrc(sio));
                 }
+
+                rs.put("list", list);
+                rs.put("aes", aes);
             }
  
             //重新按人车分组数据
@@ -4,6 +4,11 @@ html, body, .ct-container {
     font-family: "Arial","Microsoft YaHei","黑体","宋体",sans-serif;
 }
  
+html body .uk-alert-danger {
+    background: #ffe5ea;
+    color: #ff0030;
+}
+
 /*----------用来移除date向下箭头----------*/
 input[type="date"]::-webkit-calendar-picker-indicator {
     display: none;
 <div class="handler_cont_hrcc_wrap tzrc_table_wrap">
+
+    <div class="uk-alert-danger disabled_alter" style="display: none;" uk-alert>
+        <a class="uk-alert-close" uk-close></a>
+        <p><i uk-icon="info"></i>&nbsp;集调班次显示该车辆已出场，你不能再对人车进行调整。</p>
+    </div>
+
+
     <table class="uk-table uk-table-small uk-table-divider curr_out_plan_table">
         <thead>
         <tr>
@@ -83,7 +90,7 @@
     <script>
         (function () {
  
-            var wrap = '.handler_cont_hrcc_wrap', ae, inoutSch;
+            var wrap = '.handler_cont_hrcc_wrap', ae, inoutSch,modalId;
  
  
             $(wrap).on('init', function (e, data) {
@@ -92,6 +99,7 @@
                     return;
  
                 ae = data.ae;
+                modalId = data.modalId
  
                 inoutSch = gb_os_card.findByLineCode(ae.lineCode)[ae.schId];
                 $('.curr_out_plan_table>tbody', wrap).html(template('a_h_hrcc_out_tbody-temp', {obj: inoutSch}));
@@ -105,6 +113,21 @@
                 ct_autocompleter.initBus($('#nbbmAutoCompleter', wrap));
  
                 $(this).attr('data-init', 1);
+
+                //是否禁用
+                if(inoutSch.status > 0){
+                    $('.disabled_alter', wrap).show();
+                    $('.tzrc_form_card>form input', wrap)
+                            .attr('disabled', 'disabled')
+                            .each(function () {
+                                this.checked=false;
+                            });
+                    $('.submit-btn',wrap).attr('disabled', 'disabled');
+                }
+                else{
+                    //提交
+                    $(modalId).on('click', '.submit-btn', _submit);
+                }
             });
  
             var readerScheduleList = function (rs) {
@@ -190,6 +213,55 @@
                 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
+                    });
+                });
+
+                gb_common.$post('/in_out/tzrc', {cpcsJson: JSON.stringify(data)}, function (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