指令问题修复与大客流报表展现

ljq
1 parent 63d137b2
Showing 13 changed files with 362 additions and 3 deletions
src/main/java/com/bsth/controller/zndd/DKlController.java
src/main/java/com/bsth/data/directive/DayOfDirectives.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/entity/DKLInfo.java
src/main/java/com/bsth/repository/DKLInfoRepository.java
src/main/java/com/bsth/service/DKLInfoService.java
src/main/java/com/bsth/service/impl/DKLInfoServiceImpl.java
src/main/resources/static/pages/forms/zndd/logger_dkl.html
src/main/resources/static/pages/permission/authorize_all/user_auth.html
src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/zndd/type/dkl.html
+package com.bsth.controller.zndd;
+
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.DKLInfo;
+import com.bsth.service.DKLInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("dkl_logger")
+public class DKlController extends BaseController<DKLInfo, Integer> {
+
+    @Autowired
+    DKLInfoService DKLInfoService;
+
+    @RequestMapping(value = "updatedkl/{id}", method = RequestMethod.POST)
+    public int updatedkl(@PathVariable("id") Integer id){
+        return DKLInfoService.updatedkl(id);
+    }
+}
@@ -2,6 +2,7 @@ package com.bsth.data.directive;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.directive.D64;
 import com.bsth.entity.directive.Directive;
@@ -50,6 +51,8 @@ public class DayOfDirectives {
 	@Autowired
 	LineConfigData lineConfigData;
+	@Autowired
+	DayOfSchedule dayOfSchedule;
 	static Logger logger = LoggerFactory.getLogger(DayOfDirectives.class);
@@ -114,6 +117,8 @@ public class DayOfDirectives {
 		if (d60.isDispatch()) {
 			// 更新班次状态
 			sch.setDirectiveState(res.getStatus() * 100);
+			//持久化
+			dayOfSchedule.save(sch);
 			// 通知页面
 			sendUtils.sendDirectiveToPage(sch);
 		}
@@ -493,7 +493,8 @@ public class AutomaticSch {
                             if (i < carList.size() - 1) {
                                 ScheduleRealInfo src = carList.get(i + 1);
                                 if (sr.getZdsjActual() != null && src.getFcsjActual() != null && sr.getStatus() != -1 && src.getStatus() != -1) {
-                                    if (src.getFcsjActualTime() < sr.getZdsjActualTime()) {
+                                    //发车时间09:00 + 1  < 09:02
+                                    if (DateUtils.getTimesByHHmm(src.getFcsjActual()) < DateUtils.getTimesByHHmm(sr.getZdsjActual())) {
                                         ts(addStationPeople(src, "FCSJXZD", 0l));
                                         LogerWait("班次发车时间小于到站时间", src);
                                     }
@@ -234,7 +234,7 @@ public class OutEntrance {
                 String dir = line.get("dir").toString();
                 imgMap.put(lineCode+"_"+dir,img);
                 DKLInfo dklInfo =new DKLInfo();
-                dklInfo.setLineCode(stationCode);
+                dklInfo.setLineCode(lineCode);
                 String lineName=BasicData.lineCode2NameMap.get(lineCode);
                 String stationName=BasicData.stationCode2NameMap.get(lineCode+"_"+dir+"_"+stationCode);
                 dklInfo.setLineName(lineName);
@@ -248,6 +248,7 @@ public class OutEntrance {
                     continue;
                 }
                 Map m = new HashMap();
+                m.put("dklid",dklInfo.getId());
                 m.put("image", img);
                 m.put("stationCode", stationCode);
                 m.put("lineCode", lineCode);
@@ -28,6 +28,8 @@ public class DKLInfo {
 	private String image;
+	private String status;
+
 	// 创建日期
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
@@ -105,4 +107,11 @@ public class DKLInfo {
 		this.createDate = createDate;
 	}
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
 }
 package com.bsth.repository;
 import com.bsth.entity.DKLInfo;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
 @Repository
 public interface DKLInfoRepository extends BaseRepository<DKLInfo, Integer> {
+
+    @Transactional
+    @Modifying
+    @Query(value = "UPDATE DKLInfo t set t.status=?2 WHERE t.id = ?1")
+    public void update(Integer id, String t);
 }
@@ -4,4 +4,6 @@ import com.bsth.entity.DKLInfo;
 public interface DKLInfoService extends BaseService<DKLInfo, Integer> {
+
+    public int updatedkl(Integer id);
 }
 package com.bsth.service.impl;
 import com.bsth.entity.DKLInfo;
+import com.bsth.repository.DKLInfoRepository;
 import com.bsth.service.DKLInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 @Service
 public class DKLInfoServiceImpl extends BaseServiceImpl<DKLInfo, Integer> implements DKLInfoService {
+
+    @Autowired
+    DKLInfoRepository DKLInfoRepository;
+    public int updatedkl(Integer id){
+
+        DKLInfoRepository.update(id,"1");
+        return 0;
+
+    }
+
 }
+<style type="text/css">
+  .table-bordered {
+    border: 1px solid; }
+  .table-bordered > thead > tr > th,
+  .table-bordered > thead > tr > td,
+  .table-bordered > tbody > tr > th,
+  .table-bordered > tbody > tr > td,
+  .table-bordered > tfoot > tr > th,
+  .table-bordered > tfoot > tr > td {
+    border: 1px solid; }
+  .table-bordered > thead > tr > th,
+  .table-bordered > thead > tr > td {
+    border-bottom-width: 2px; }
+
+  .table > tbody + tbody {
+    border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+  <div class="page-title">
+    <h1>大客流执行记录</h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <div class="portlet light porttlet-fit bordered">
+      <div class="portlet-title">
+        <form class="form-inline" action="">
+          <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_daily">
+            <span class="item-label" style="width: 80px;">公司: </span>
+            <select class="form-control" name="company" id="gsdmDaily" style="width: 180px;"></select>
+          </div>
+          <div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv_daily">
+            <span class="item-label" style="width: 80px;">分公司: </span>
+            <select class="form-control" name="subCompany" id="fgsdmDaily" style="width: 180px;"></select>
+          </div>
+          <div style="margin-top: 2px"></div>
+          <div style="display: inline-block;margin-left: 33px;">
+            <span class="item-label" style="width: 80px;">线路: </span>
+            <select class="form-control" name="line" id="line" style="width: 180px;">
+              <option value="">请选择线路...</option>
+            </select>
+          </div>
+  <!--        <div style="display: inline-block;margin-left: 24px;">
+            <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+            <input class="form-control" type="text" id="date" style="width: 180px;"/>
+          </div>-->
+          <div class="form-group">
+            <input class="btn btn-default" type="button" id="query" value="筛选"/><!--
+            <input class="btn btn-default" type="button" id="export" value="导出"/>-->
+          </div>
+        </form>
+      </div>
+      <div class="portlet-body">
+        <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+          <table class="table table-bordered table-hover table-checkable" id="forms">
+            <thead>
+            <tr>
+              <th colspan="7">智能调度执行记录</th>
+            </tr>
+
+            <tr>
+              <td>线路名称</td>
+              <td>站点名称</td>
+              <td>方向</td>
+              <td>人数</td>
+              <td>生成班次</td>
+              <td>发现时间</td>
+            </tr>
+            </thead>
+            <tbody id="tbody">
+
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  $(function(){
+
+    // 关闭左侧栏
+    if (!$('body').hasClass('page-sidebar-closed'))
+      $('.menu-toggler.sidebar-toggler').click();
+
+    $("#date").datetimepicker({
+      format : 'YYYY-MM-DD',
+      locale : 'zh-cn'
+    });
+    var fage=false;
+    var xlList;
+    var obj = [];
+
+
+    $.get('/report/lineList',function(result){
+      xlList=result;
+      $.get('/user/companyData', function(result){
+        obj = result;
+        var options = '';
+        for(var i = 0; i < obj.length; i++){
+          options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+        }
+
+        if(obj.length ==0){
+          $("#gsdmDiv_daily").css('display','none');
+        }else if(obj.length ==1){
+          $("#gsdmDiv_daily").css('display','none');
+          if(obj[0].children.length == 1  || obj[0].children.length ==0)
+            $('#fgsdmDiv_daily').css('display','none');
+        }
+        $('#gsdmDaily').html(options);
+        updateCompany();
+      });
+    })
+    $("#gsdmDaily").on("change",updateCompany);
+    function updateCompany(){
+      var company = $('#gsdmDaily').val();
+      var options = '';
+      for(var i = 0; i < obj.length; i++){
+        if(obj[i].companyCode == company){
+          var children = obj[i].children;
+          for(var j = 0; j < children.length; j++){
+            options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+          }
+        }
+      }
+      $('#fgsdmDaily').html(options);
+    }
+
+    var tempData = {};
+    $.get('/report/lineList',function(xlList){
+      var data = [];
+ 			data.push({id: " ", text: "全部线路"});
+      $.get('/user/companyData', function(result){
+        for(var i = 0; i < result.length; i++){
+          var companyCode = result[i].companyCode;
+          var children = result[i].children;
+          for(var j = 0; j < children.length; j++){
+            var code = children[j].code;
+            for(var k=0;k < xlList.length;k++ ){
+                data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+                tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+
+            }
+          }
+        }
+        initPinYinSelect2('#line',data,'');
+
+      });
+    });
+
+    $("#line").on("change", function(){
+      if($("#line").val() == " "){
+        $("#gsdmDaily").attr("disabled", false);
+        $("#fgsdmDaily").attr("disabled", false);
+      } else {
+        var temp = (tempData[$("#line").val()] ? tempData[$("#line").val()] : " : ").split(":");
+        $("#gsdmDaily").val(temp[0]);
+        updateCompany();
+        $("#fgsdmDaily").val(temp[1]);
+        $("#gsdmDaily").attr("disabled", true);
+        $("#fgsdmDaily").attr("disabled", true);
+      }
+    });
+
+
+    var line;
+    var date;
+    var gsdmDaily;
+    var fgsdmDaily;
+    var lineName=$("#select2-line-container").html();
+    $("#query").on("click",function(){
+    /*  if($("#date").val() == null || $("#date").val().trim().length == 0){
+        layer.msg("请选择时间");
+        return;
+      }*/
+      line = $("#line").val();
+      date = $("#date").val();
+      gsdmDaily=$("#gsdmDaily").val();
+      fgsdmDaily = $("#fgsdmDaily").val();
+      lineName=$("#select2-line-container").html();
+      var i = layer.load(2);
+      $get('/dkl_logger/all',{lineCode_eq:line,type:'query'},function(result){
+        $("#form_line").text(lineName);
+        $("#form_date").text(date);
+
+        $.each(result, function(i, obj) {
+          obj.createDate = moment(obj.createDate).format("YYYY-MM-DD HH:mm:ss");
+        });
+
+        // 把数据填充到模版中
+        var tbodyHtml = template('dailyInfo',{list:result});
+        // 把渲染好的模版html文本追加到表格中
+        $('#tbody').html(tbodyHtml);
+        layer.close(i);
+
+        line = $("#line").val();
+        startDate = $("#startDate").val();
+        endDate = $("#endDate").val();
+        $("#sDate").text(startDate);
+        $("#eDate").text(endDate);
+
+        var total_zgl = 0,total_ks = 0;
+        var total_yh = 0,total_bc = 0;
+
+        $.each(result, function(i, obj) {
+          total_zgl +=Number(obj.zlc*10000);
+          total_ks +=Number(obj.jzl1*10000);
+          total_yh += Number(obj.yh*10000);
+          total_bc += Number(obj.bc);
+
+        });
+        $("#total_zgl").text((total_zgl/10000).toFixed(3));
+        $("#total_ks").text((total_ks/10000).toFixed(3));
+        $("#total_yh").text((total_yh/10000).toFixed(2));
+        $("#total_bc").text(total_bc.toFixed(0));
+
+        var temp = {};
+        var today_account = 0;
+
+        temp["line"] = $("#line").text();
+        $.each(result, function(i, obj) {
+          if(moment(obj.schedule_date_str).format("YYYY-MM-DD") == moment(obj.startDate).format("YYYY-MM-DD")){
+            today_account++;
+          }
+          obj.updateDate = moment(obj.startDate).format("YYYY-MM-DD HH:mm:ss");
+        });
+      })
+    });
+
+    $("#export").on("click",function(){
+     /* if($("#date").val() == null || $("#date").val().trim().length == 0){
+        layer.msg("请选择时间");
+        return;
+      }*/
+      line = $("#line").val();
+      date = $("#date").val();
+      gsdmDaily=$("#gsdmDaily").val();
+      fgsdmDaily = $("#fgsdmDaily").val();
+      lineName=$("#select2-line-container").html();
+      var i = layer.load(2);
+      $get('/logZndd/listall',{rq_eq:date,lineCode_eq:line,type:'export'},function(result){
+        window.open("/downloadFile/download?fileName="
+                +moment(date).format("YYYYMMDD")+"-"+lineName+"-班次日报表");
+        layer.close(i);
+      });
+    });
+  });
+</script>
+<script type="text/html" id="dailyInfo">
+  {{each list as obj i}}
+  <tr>
+    <td>{{obj.lineName}}</td>
+    <td>{{obj.stationName}}</td>
+    <td>
+      {{if obj.upDown == '0'}}
+      上行
+      {{else if obj.upDown == '1'}}
+      下行
+      {{/if}}
+    </td>
+    <td>{{obj.num}}</td>
+    <td>
+      {{if obj.status == '1'}}
+      是
+      {{else}}
+      否
+      {{/if}}
+    </td>
+
+    <td>{{obj.createDate}}</td>
+  </tr>
+  {{/each}}
+  {{if list.length == 0}}
+  <tr>
+    <td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+  </tr>
+  {{/if}}
+</script>
 \ No newline at end of file
@@ -59,6 +59,7 @@
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_repairReport"> 维修上报记录</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_loggerr_zndd"> 智能调度日志</label></li>
                 <li><label><input class="uk-checkbox" type="checkbox" data-event="form_message_two"> 调度消息分析</label></li>
+                <li><label><input class="uk-checkbox" type="checkbox" data-event="form_loggerr_dkl"> 大客流执行日志</label></li>
             </ul>
         </div>
@@ -146,6 +146,13 @@
         "event": "form_message_two",
         "icon": "uk-icon-table"
       }
+    ,
+      {
+        "id": 2.9,
+        "text": "大客流执行记录",
+        "event": "form_loggerr_dkl",
+        "icon": "uk-icon-table"
+      }
     ]
   },
   {
@@ -291,6 +291,10 @@ var gb_northToolbar = (function () {
             gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/zndd/logger_zndd.html', '智能调度执行记录');
         },
+        form_loggerr_dkl: function () {
+            gb_embed_form_hanlde.open_modal_form_fragment('/pages/forms/zndd/logger_dkl.html', '大客流执行记录');
+        },
+
         sch_edit_qjgz: function () {
             open_modal('/real_control_v2/zndd/qjgz/list.html', {}, modal_opts);
         },
@@ -476,7 +476,10 @@
                     open_modal(folder + '/yanshi.html', {
                     }, {center: true, bgclose: false, modal: true});*/
                     //添加成功后添加车辆监控消息
-                    gb_common.$post('/logZndd/addMessage', rs, function (ks) {}, err);
+                    //更新大客流是否加入信息dklid
+                    $.post('/dkl_logger/updatedkl/'+sch.dklid,function(dklll){})
+
+                   // gb_common.$post('/logZndd/addMessage', rs, function (ks) {}, err);
                 }, err);
                 //手动提交的时候清除一下，防止二次提交