update...

潘钊
1 parent a1cbd957
Showing 13 changed files with 231 additions and 18 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
src/main/java/com/bsth/data/schedule/edit_logs/FormLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/SeiPstThread.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/js/data/data_line_config.js
src/main/resources/static/real_control_v2/main.html
@@ -79,6 +79,11 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 		return lineConfigService.getByLineCode(lineCode);
 	}
+	@RequestMapping(value = "/findByIdx")
+	public Map<String, Object> findByIdx(@RequestParam String idx){
+		return lineConfigService.findByIdx(idx);
+	}
+
 	/**
 	 * 到站缓冲区设置
 	 * @param lineCode
@@ -78,10 +78,11 @@ public class SchAttrCalculator {
     }
     public Long getTime(String rq, String timeStr, LineConfig conf) {
-        long t = fmtyyyyMMddHHmm.parseMillis(rq + timeStr);
-        if (StringUtils.isNotEmpty(timeStr)
-                && timeStr.compareTo(conf.getStartOpt()) < 0) {
-            return t + DAY_TIME;
+        Long t = null;
+        if (StringUtils.isNotEmpty(timeStr)) {
+            t = fmtyyyyMMddHHmm.parseMillis(rq + timeStr);
+            if(timeStr.compareTo(conf.getStartOpt()) < 0)
+                return t + DAY_TIME;
         }
         return t;
     }
@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
+import java.util.LinkedList;
 /**
  * 为报表写入相关的班次修改记录
@@ -27,9 +28,12 @@ public class FormLogger {
     Logger log = LoggerFactory.getLogger(this.getClass());
+    static LinkedList<Changetochange> ccPsts = new LinkedList<>();
+
     @Autowired
     ChangetochangeRepository changetochangeRepository;
+
     /**
      * 换人换车情况表
      */
@@ -70,7 +74,9 @@ public class FormLogger {
             if(StringUtils.isNotEmpty(newJsy))
                 cc.setSjgh(newJsy);
-            changetochangeRepository.save(cc);
+            //改异步入库
+            ccPsts.add(cc);
+            //changetochangeRepository.save(cc);
         }catch (Exception e){
             log.error("纪录换人换车情况表", e);
         }
@@ -82,4 +88,13 @@ public class FormLogger {
         cpc.setJsy(jsy);
         saveChangetochange(sch, cpc);
     }
+
+    public void saveDb(){
+        Changetochange cc;
+        for(int i = 0; i < 1000; i ++){
+            cc = ccPsts.poll();
+            if(null != cc)
+                changetochangeRepository.save(cc);
+        }
+    }
 }
@@ -23,6 +23,9 @@ public class SeiPstThread extends Thread{
     Logger log = LoggerFactory.getLogger(this.getClass());
+    @Autowired
+    FormLogger formLogger;
+
     @Override
     public void run() {
         try{
@@ -40,6 +43,9 @@ public class SeiPstThread extends Thread{
             }
             repository.save(pstList);
+
+            //报表结构化日志入库
+            formLogger.saveDb();
         }catch (Exception e){
             log.error("", e);
         }
@@ -718,8 +718,12 @@ public class ScheduleRealInfo {
 	 * @throws
 	 */
 	public void setFcsjActualAll(Long t){
+
 		this.fcsjActualTime = t;
-		this.fcsjActual = fmtHHmm.print(t);
+		if(null == t)
+			this.fcsjActual = null;
+		else
+			this.fcsjActual = fmtHHmm.print(t);
 		//更新班次状态
 		calcStatus();
@@ -733,7 +737,11 @@ public class ScheduleRealInfo {
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
-		this.zdsjActual = fmtHHmm.print(t);
+
+		if(null == t)
+			this.zdsjActual = null;
+		else
+			this.zdsjActual = fmtHHmm.print(t);
 		//更新班次状态
 		calcStatus();
@@ -24,4 +24,6 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
     Map<String,Object> yjtkSet(Map<String, String> map);
     Map<String,Object> parkAndStationSet(Map<String, String> map);
+
+    Map<String,Object> findByIdx(String idx);
 }
@@ -6,6 +6,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.repository.realcontrol.LineConfigRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.LineConfigService;
+import com.google.common.base.Splitter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -203,4 +204,24 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> findByIdx(String idx) {
+        Map<String, Object> rs = new HashMap();
+        try{
+            List<LineConfig> list = new ArrayList<>();
+            List<String> ids = Splitter.on(",").splitToList(idx);
+
+            for(String id : ids){
+                list.add(lineConfigData.get(id));
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        }catch (Exception e){
+            rs.put("status", ResponseCode.ERROR);
+            logger.error("", e);
+        }
+        return rs;
+    }
 }
@@ -3017,9 +3017,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Set<ScheduleRealInfo> set = new HashSet<>();
         ScheduleRealInfo sch;
+        StringBuilder sb = new StringBuilder();
         String jGh = null,jName,sGh,sName;
         for (ChangePersonCar cpc : cpcs) {
+            sb = new StringBuilder();
             sch = dayOfSchedule.get(cpc.getSchId());
             if (sch == null)
@@ -3053,7 +3055,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //日志记录
             ScheduleModifyLogger.tzrc(sch, cpc);
+            //换驾驶员
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
+                if(!jGh.equals(sch.getjGh()))
+                    sb.append(sch.getjGh() + " 换 " + jGh + ";");
                 //换驾驶员
                 if(persoChange(sch, jGh))
                     set.add(sch);
@@ -3068,6 +3073,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     rs.put("status", ResponseCode.ERROR);
                     return rs;
                 }
+
+                if(!sGh.equals(sch.getsGh()))
+                    sb.append(sch.getsGh() + " 换 " + sGh + ";");
                 if(persoChangeSPY(sch, sGh))
                     set.add(sch);
             }
@@ -3078,10 +3086,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //换车
             if (StringUtils.isNotEmpty(cpc.getClZbh()) && !cpc.getClZbh().equals(sch.getClZbh())) {
+                sb.append(sch.getClZbh() + " 换 " + cpc.getClZbh() + ";");
                 set.add(sch);
                 set.addAll(dayOfSchedule.changeCar(sch, cpc.getClZbh()));
             }
+            if(sb.length() > 0)
+                sch.setRemarks(sb.toString());
+
             dayOfSchedule.save(sch);
             set.add(sch);
@@ -1668,4 +1668,26 @@ ul.left_tabs_lg li{
 .sch-search-autocom input{
     padding: 0 !important;
     height: 100% !important;
+}
+
+label.blue_checkbox{
+    margin-left: 12px;
+}
+
+label.blue_checkbox>input{
+    width: 17px !important;
+    height: 17px !important;
+}
+
+label.blue_checkbox>input:checked:before,
+label.blue_checkbox>input:indeterminate:before{
+    line-height: 15px !important;
+}
+
+dd.disabled{
+    color: #b5b3b3;
+}
+
+dl.active>dd.disabled{
+    color: #ececec;
 }
 \ No newline at end of file
@@ -191,6 +191,12 @@
                     e.preventDefault();
                     var data = $(this).serializeJSON();
+                    //校验实发实达时间
+                    if(!validation_s_e_Time(data)){
+                        notify_err("实发时间不能晚于实达时间！");
+                        return;
+                    }
+
                     if(!data.adjustExps && (data.status==-1
                         || (data.jhlc==0 && sch.bcType != 'in' && sch.bcType != 'out'))){
                         notify_err("当前操作需要选择调整原因！");
@@ -280,6 +286,27 @@
                     })
                 });
             });
+            
+            function validation_s_e_Time(data) {
+                var config = gb_data_line_config.get(sch.xlBm);
+                var st = get_time(sch.scheduleDateStr, data.fcsjActual, config);
+                var et = get_time(sch.scheduleDateStr, data.zdsjActual, config);
+                if(st && et && st > et)
+                    return false;
+                return true;
+            }
+
+            var DAY_TIME = 1000 * 60 * 60 * 24;
+            function get_time(rq, timeStr, config) {
+                var t = null;
+                if(timeStr){
+                    t = moment(rq + timeStr, 'YYYY-MM-DDHH:mm');
+                    if(timeStr.localeCompare(config.startOpt) < 0)
+                        return t + DAY_TIME;
+                }
+
+                return t;
+            }
         })();
     </script>
 </div>
@@ -47,10 +47,13 @@
                 <div class="uk-width-1-2">
                     <div class="uk-form-row">
                         <label class="uk-form-label">车辆</label>
-                        <div class="uk-form-controls">
-                            <div class="uk-autocomplete uk-form car-autocom">
+                        <div class="uk-form-controls" >
+                            <div class="uk-autocomplete uk-form car-autocom" style="width: 77%;">
                                 <input type="text" value="" name="clZbh" required>
                             </div>
+                            <label class="blue_checkbox cl_enable_key_label">
+                                <input type="checkbox" checked>
+                            </label>
                         </div>
                     </div>
                 </div>
@@ -58,9 +61,12 @@
                     <div class="uk-form-row">
                         <label class="uk-form-label">驾驶员 </label>
                         <div class="uk-form-controls">
-                            <div class="uk-autocomplete uk-form jsy-autocom">
+                            <div class="uk-autocomplete uk-form jsy-autocom" style="width: 77%;">
                                 <input type="text" value="" name="jsy" required>
                             </div>
+                            <label class="blue_checkbox jsy_enable_key_label">
+                                <input type="checkbox" checked>
+                            </label>
                         </div>
                     </div>
                 </div>
@@ -77,7 +83,7 @@
                     </div>
                 </div>
             </div>
-            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;">
+            <div class="uk-modal-footer uk-text-right" style="margin-bottom: -20px;position: relative;">
                 <button type="button" class="uk-button uk-modal-close">取消</button>
                 <button type="submit" class="uk-button uk-button-primary" ><i class="uk-icon-check"></i> &nbsp;保存
                 </button>
@@ -168,8 +174,6 @@
                     if(!$(this).hasClass('active')){
                         $(this).addClass('active');
                         cbox.checked = true;
-                        //var lineCode = $('[name=lineSelect]', modal).val();
-                        //var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
                         renderCell();
                     }
                     else{
@@ -215,6 +219,7 @@
                 var f = $('form.tzrc_form', modal);
                 f.on('submit', function (e) {
                     e.stopPropagation();
+                    $('[type=submit]', f).attr('disabled', 'disabled');
                     var checkeds = $('.sch-tzrc-table .ct_table_body input[type=checkbox]:checked', modal);
                     if (checkeds.length == 0)
@@ -258,20 +263,38 @@
                         renderRunFlag = false;
                     }, 200);
                 });
+
+                $('.jsy_enable_key_label', modal).on('click', function () {
+                    var checked = $('input[type=checkbox]', this)[0].checked;
+                    if(checked)
+                        enableJsy();
+                    else
+                        disabledJsy();
+                });
+
+                $('.cl_enable_key_label', modal).on('click', function () {
+                    var checked = $('input[type=checkbox]', this)[0].checked;
+                    if(checked)
+                        enableCl();
+                    else
+                        disabledCl();
+                });
             });
-            
             function renderCell() {
-                var jsy = $('input[name=jsy]', modal).val();
+                var jsy = $('input[name=jsy]:enabled', modal).val();
                 var spy = $('input[name=spy]', modal).val();
-                var nbbm = $('input[name=clZbh]', modal).val();
+                var nbbm = $('input[name=clZbh]:enabled', modal).val();
                 $('.sch-tzrc-table .ct_table_body>dl.active').each(function () {
                     var jsyCell = $(this).find('dd')[2];
                     var spyCell = $(this).find('dd')[3];
                     var clCell = $(this).find('dd')[1];
-                    $(jsyCell).text(jsy);
+
+                    if(jsy)
+                        $(jsyCell).text(jsy);
+                    if(nbbm)
+                        $(clCell).text(nbbm);
                     $(spyCell).text(spy);
-                    $(clCell).text(nbbm);
                 });
             }
@@ -305,6 +328,43 @@
                 $('.sch-tzrc-table .ct_table_body>dl', modal).each(function () {
                     $(this).removeClass('active');
                     $('input[type=checkbox]',this)[0].checked = false;
+
+                    $.each($('dd', this), function () {
+                        if($(this).data('old'))
+                            $(this).text($(this).data('old'));
+                    });
+                });
+            }
+
+            function disabledJsy() {
+                $('[name=jsy]',modal).attr('disabled', 'disabled');
+                $('.sch-tzrc-table .ct_table_body>dl').each(function () {
+                    var jsyCell = $(this).find('dd')[2];
+                    $(jsyCell).addClass('disabled').text($(jsyCell).data('old'));
+                });
+            }
+
+            function enableJsy() {
+                $('[name=jsy]',modal).removeAttr('disabled');
+                $('.sch-tzrc-table .ct_table_body>dl').each(function () {
+                    var jsyCell = $(this).find('dd')[2];
+                    $(jsyCell).removeClass('disabled').text($(jsyCell).data('old'));
+                });
+            }
+
+            function disabledCl() {
+                $('[name=clZbh]',modal).attr('disabled', 'disabled');
+                $('.sch-tzrc-table .ct_table_body>dl').each(function () {
+                    var clCell = $(this).find('dd')[1];
+                    $(clCell).addClass('disabled').text($(clCell).data('old'));
+                });
+            }
+
+            function enableCl() {
+                $('[name=clZbh]',modal).removeAttr('disabled');
+                $('.sch-tzrc-table .ct_table_body>dl').each(function () {
+                    var clCell = $(this).find('dd')[1];
+                    $(clCell).removeClass('disabled').text($(clCell).data('old'));
                 });
             }
         })();
+/**
+ * 线路配置信息
+ * @type {{}}
+ */
+var gb_data_line_config = (function () {
+
+    var lineConfigMap;
+
+    var storage = window.localStorage;
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+        }
+        return str.substr(1);
+    })();
+
+    gb_common.$get('/lineConfig/findByIdx', {idx: line_idx}, function (rs) {
+        lineConfigMap = {};
+        $.each(rs.list, function () {
+            lineConfigMap[this.line.lineCode] = this;
+        });
+
+        console.log('lineConfigMap', lineConfigMap);
+    });
+
+    return {
+        get: function (lineCode) {
+            return lineConfigMap[lineCode];
+        }
+    };
+})();
 \ No newline at end of file
@@ -167,6 +167,7 @@
 <script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/data/data_gps.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/data/gps_abnormal.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/data_line_config.js" merge="custom_js"></script>
 <!-- 线路模拟图 -->
 <script src="/real_control_v2/js/utils/svg_chart.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/utils/svg_data_convert.js" merge="custom_js"></script>