update...

潘钊
1 parent 2de24e68
Showing 12 changed files with 117 additions and 10 deletions
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/handler/AttendanceHandler.java
src/main/java/com/bsth/data/abnormal/handler/InOutHandler.java
src/main/java/com/bsth/data/schedule/dto/ScheduleInOut.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/expand_card_modal.html
src/main/resources/static/pages/abnormal/fragments/type_0/h_cont_rybd.html
src/main/resources/static/pages/abnormal/fragments/type_1/abnormal_handler.html
src/main/resources/static/pages/abnormal/fragments/type_1/h_cont_cycc.html
src/main/resources/static/pages/abnormal/main.html
@@ -66,4 +66,14 @@ public class InOutScheduleController {
     public Map<String, Object> rybd(@RequestParam Map<String, Object> map){
         return inOutScheduleService.rybd(map);
     }
+
+    /**
+     * 车已出场
+     * @param map
+     * @return
+     */
+    @RequestMapping(value = "cycc", method = RequestMethod.POST)
+    public Map<String, Object> cycc(@RequestParam Map<String, Object> map){
+        return inOutScheduleService.cycc(map);
+    }
 }
@@ -83,4 +83,8 @@ public class MainAbnormalClient {
     public AbnormalEntity rybd(Long id,String timeStr, String reason, String remark) {
         return attendanceHandler.rybd(id, timeStr, reason, remark);
     }
+
+    public AbnormalEntity cycc(Long id, String timeStr, String reason, String remarks) {
+        return inOutHandler.cycc(id, timeStr, reason, remarks);
+    }
 }
@@ -78,8 +78,7 @@ public class AttendanceHandler {
         ae.setReason(reason);
         ScheduleInOut sio = ScheduleDataBuffer.findById(id);
-        if(null != sio && sio.getAbnormalStatus()==-1)
-            sio.setAbnormalStatus(0);
+        sio.reCalcAnStatus();
         schIdMap.remove(ae.getSchId());
         return ae;
@@ -3,6 +3,7 @@ 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 com.bsth.security.util.SecurityUtils;
 import org.springframework.stereotype.Component;
 import java.util.concurrent.ConcurrentHashMap;
@@ -54,4 +55,26 @@ public class InOutHandler {
     public void handler(Long id){
     }
+
+    public AbnormalEntity cycc(Long id, String timeStr, String reason, String remarks) {
+
+
+        AbnormalEntity ae = schIdMap.get(id);
+        if(null == ae)
+            return null;
+
+        Long t = System.currentTimeMillis();
+
+
+        ae.setHandlerTime(t);
+        ae.setHandlerUser(SecurityUtils.getCurrentUser().getUserName());
+        ae.setHandlerDes(timeStr + "已出场，备注：" + remarks);
+        ae.setReason(reason);
+
+        ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+        sio.reCalcAnStatus();
+
+        schIdMap.remove(ae.getSchId());
+        return ae;
+    }
 }
@@ -52,6 +52,11 @@ public class ScheduleInOut {
     private Long outTimeRfid;//出场时间 -rfid
     private Long outTimePzsb;//出场时间 -牌照识别
+    /**
+     * 设置出场时间的用户，手动出场时，该字段有值
+     */
+    private String ccTimeUser;
+
     public Long getId() {
         return id;
     }
@@ -315,4 +320,24 @@ public class ScheduleInOut {
     public void setjNameCamelChars(String jNameCamelChars) {
         this.jNameCamelChars = jNameCamelChars;
     }
+
+    /**
+     * 设置异常状态
+     */
+    public void reCalcAnStatus() {
+        this.abnormalStatus = 0;
+        if(null == this.attSjTime)
+            this.abnormalStatus = -1;
+
+        if(null == this.outTimeRfid)
+            this.abnormalStatus = -2;
+    }
+
+    public String getCcTimeUser() {
+        return ccTimeUser;
+    }
+
+    public void setCcTimeUser(String ccTimeUser) {
+        this.ccTimeUser = ccTimeUser;
+    }
 }
@@ -36,6 +36,8 @@ public interface ScheduleService {
     Map<String,Object> rybd(Map<String, Object> map);
+    Map<String,Object> cycc(Map<String, Object> map);
+
     //void inOut(CarInOutEntity obj);
     //void busInOut(CarInOutEntity obj);
@@ -237,4 +237,36 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> cycc(Map<String, Object> map) {
+        Map<String, Object> rs = new HashMap<>();
+
+        try{
+            String rq = map.get("rq").toString();
+            String timeStr = map.get("outSjTimeStr").toString();
+            String reason = map.get("reason").toString();
+            String remarks = map.get("remarks").toString();
+            Long id = Long.parseLong(map.get("schId").toString());
+
+
+            long time = fmtyyyyMMddHHmm.parseMillis(rq+timeStr);
+
+            //班次设置RFID出场时间
+            ScheduleInOut sio = ScheduleDataBuffer.findById(id);
+            sio.setOutTimeRfid(time);
+            sio.setCcTimeUser(SecurityUtils.getCurrentUser().getUserName());
+
+            //处理掉异常
+            AbnormalEntity ae = mainAbnormalClient.cycc(id,timeStr,reason,remarks);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sio);
+            rs.put("ae", ae);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
 }
@@ -67,7 +67,9 @@
                 </td>
                 <td><span title="{{sch.remarks}}">{{sch.remarks}}</span></td>
                 <td>
-                    {{if sch.outTimeRfid!=null && sch.outTimePzsb!=null}}
+                    {{if sch.outTimeRfid!=null && sch.ccTimeUser!=null}}
+                        <small>已出场（-{{sch.ccTimeUser}}）</small>
+                    {{else if sch.outTimeRfid!=null && sch.outTimePzsb!=null}}
                         <small style="color: #2283e3;">已出场（2）</small>
                     {{else if sch.outTimeRfid!=null}}
                         <small>已出场（RFID）</small>
@@ -79,6 +79,8 @@
                 //submit
                 var f = $('form', wrap).formValidation(gb_form_validation_opts);
+
+                $('[name=attSjTimeStr]', f).focus();
                 //日期默认值
                 $('[name=rq]', f).val(moment().format('YYYY-MM-DD'));
                 $('.submit-btn', wrap).on('click', function () {
@@ -89,7 +91,6 @@
                     var data = $(this).serializeJSON();
-                    console.log('data', data);
                     gb_common.$post('/in_out/rybd', data, function (rs) {
                         UIkit.notification('操作成功！', 'success');
                         gb_os_card.update(rs.t);
@@ -24,7 +24,7 @@
                 //加载片段1
                 $.get(folder + 'h_cont_cycc.html', function (dom) {
                     $('._content_one',wrap).html(dom);
-                    $('.handler_cont_cycc_wrap', wrap).trigger('init', {ae: ae});
+                    $('.handler_cont_cycc_wrap', wrap).trigger('init', {ae: ae, modalId: modalId});
                 });
                 //加载片段2
@@ -19,18 +19,19 @@
                 <td>{{ae.lineName}}</td>
                 <td>{{ae.lpName}}</td>
                 <td>{{ae.nbbm}}</td>
-                <td>{{ae.dfsjStr}}</td>
+                <td>{{ae.planTimeStr}}</td>
                 <td>{{current_tcc_name}}</td>
                 <td><samp>未出场</samp></td>
             </tr>
         </table>
         <form class="uk-form-horizontal">
+            <input type="hidden" value="{{ae.schId}}" name="schId">
             <div class="uk-margin">
                 <label class="uk-form-label" for="form-horizontal-text">出场时间</label>
                 <div class="uk-form-controls">
                     <input class="uk-input" name="rq" type="date" style="width: 160px;" required>
-                    <input class="uk-input" name="attSjTimeStr" id="form-horizontal-text" type="time" style="width: calc(100% - 170px)" required>
+                    <input class="uk-input" name="outSjTimeStr" id="form-horizontal-text" type="time" style="width: calc(100% - 170px)" required>
                 </div>
             </div>
@@ -62,7 +63,7 @@
     <script>
         (function () {
-            var wrap = '.handler_cont_cycc_wrap', ae, $cont;
+            var wrap = '.handler_cont_cycc_wrap', ae, $cont, modalId;
             $(wrap).on('init', function (e, data) {
@@ -71,13 +72,16 @@
                     return;
                 ae = data.ae;
+                modalId = data.modalId;
                 var htmlStr = template('o_s_abnormal_handler_cycc-temp', {ae: ae, current_tcc_name: current_tcc_name});
                 $cont = $('.hc_body', wrap).html(htmlStr);
                 //submit
                 var f = $('form', wrap).formValidation(gb_form_validation_opts);
+
                 $('[name=rq]', f).val(moment().format('YYYY-MM-DD'));
+                $('[name=outSjTimeStr]', f).focus();
                 $('.submit-btn', wrap).on('click', function () {
                     f.submit();
                 });
@@ -86,7 +90,12 @@
                     var data = $(this).serializeJSON();
-                    console.log('data', data);
+                    gb_common.$post('/in_out/cycc', data, function (rs) {
+                        UIkit.notification('操作成功！', 'success');
+                        gb_os_card.update(rs.t);
+                        gb_o_s_abnormal.handle(rs.ae);
+                        UIkit.modal(modalId).hide();
+                    });
                 });
                 //选择原因
@@ -135,7 +135,7 @@
                         </dd>
                         <dd class="parallel_dl">
                             <span>{{sch.dfsjStr}}</span>
-                            <span class="green"></span>
+                            <span style="color: {{sch.rfidLate>0?'red':'blue'}};">{{sch.outTimeRfidStr}}</span>
                         </dd>
                     </dl>
                     {{/if}}