Merge branch 'minhang' into pudong

潘钊
2 parents a8c06755 be6befbd
Showing 12 changed files with 203 additions and 22 deletions
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/utils/ListFilterUtils.java
src/main/java/com/bsth/data/utils/ListPageQueryUtils.java
src/main/java/com/bsth/entity/directive/D80.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/resources/static/real_control_v2/alone_page/home/home_wrap.html
src/main/resources/static/real_control_v2/css/home.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/north/nav/report_80.html
@@ -117,6 +117,11 @@ public class PilotReport {
             //推送到页面
             sendUtils.send80ToPage(d80);
+
+            //反射搜索用 瞬时字段
+            d80.setLineId(d80.getData().getLineId());
+            d80.setNbbm(d80.getData().getNbbm());
+            d80.setRequestCode(d80.getData().getRequestCode());
         } catch (Exception e) {
             logger.error("", e);
         }
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 集合搜索过滤
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListFilterUtils {
+
+    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
+
+    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
+        List rs = new ArrayList();
+        Field[] fields = clazz.getDeclaredFields();
+
+        //参与过滤的字段
+        List<Field> fs = new ArrayList<>();
+        for (Field f : fields) {
+            f.setAccessible(true);
+            if (map.containsKey(f.getName()))
+                fs.add(f);
+        }
+
+        //过滤数据
+        for (Object obj : all) {
+            if (fieldEquals(fs, obj, map))
+                rs.add(obj);
+        }
+        return rs;
+    }
+
+    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
+}
+package com.bsth.data.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 集合分页工具
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListPageQueryUtils {
+
+    public static List paging(List all, int page, int pageSize) {
+        List rs = new ArrayList(pageSize);
+
+        int s = page * pageSize;
+        int e = (page + 1) * pageSize;
+
+        int size = all.size();
+
+        if (e > size)
+            e = size;
+
+        if (s > size)
+            return rs;
+
+        for (; s < e; s++) {
+            rs.add(all.get(s));
+        }
+        return rs;
+    }
+}
 package com.bsth.entity.directive;
 import com.bsth.entity.directive.DC0.DC0Data;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.*;
 import java.util.Date;
@@ -65,6 +66,18 @@ public class D80 {
 	private Long schId;
+	@Transient
+	@JsonIgnore
+	private String lineId;
+
+	@Transient
+	@JsonIgnore
+	private String nbbm;
+
+	@Transient
+	@JsonIgnore
+	private Short requestCode;
+
 	public Long getSchId() {
 		return schId;
 	}
@@ -73,6 +86,30 @@ public class D80 {
 		this.schId = schId;
 	}
+	public String getLineId() {
+		return data.lineId;
+	}
+
+	public String getNbbm() {
+		return data.nbbm;
+	}
+
+	public void setLineId(String lineId) {
+		this.lineId = lineId;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public Short getRequestCode() {
+		return requestCode;
+	}
+
+	public void setRequestCode(Short requestCode) {
+		this.requestCode = requestCode;
+	}
+
 	@Embeddable
 	public static class D80Data {
@@ -11,6 +11,8 @@ import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.pilot80.PilotReport;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.utils.ListFilterUtils;
+import com.bsth.data.utils.ListPageQueryUtils;
 import com.bsth.entity.directive.*;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.SysUser;
@@ -110,8 +112,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 logger.warn("烂班不允许发送调度指令....");
                 return -1;
             }
+
+            //待发应到时间
+            String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
             String text = "您已完成" + finish + "个班次，下一发车时间" + fmtHHmm_CN.print(sch.getDfsjT()) + "，由"
-                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + sch.getZdsj();
+                    + sch.getQdzName() + "发往" + sch.getZdzName() + ";应到 " + dfsj;
             if(sch.getBcType().equals("venting")){
                 text += " (直放)";
@@ -445,7 +450,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     @Override
     public Map<String, Object> findAll80(Map<String, Object> map, int page, int size) {
-        List<D80> d80s = new ArrayList<>();
+        /*List<D80> d80s = new ArrayList<>();
         Object nbbm = map.get("nbbm");
         if (null != nbbm && StringUtils.isNotEmpty(nbbm.toString())) {
@@ -489,8 +494,25 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         Map<String, Object> rsMap = new HashMap<>();
         rsMap.put("list", rs);
         rsMap.put("totalPages", count % size == 0 ? count / size - 1 : count / size);
-        rsMap.put("page", page);
+        rsMap.put("page", page);*/
+        List all = ListFilterUtils.filter(pilotReport.findAll(), map, D80.class);
+        //排序
+        Collections.sort(all, new Comparator<D80>() {
+            @Override
+            public int compare(D80 o1, D80 o2) {
+                return (int) (o2.getTimestamp() - o1.getTimestamp());
+            }
+        });
+        List<D80> d80s = ListPageQueryUtils.paging(all, page, size);
+        //时间格式化
+        for (D80 d80 : d80s) {
+            d80.setTimeStr(fmtHHmm.print(d80.getTimestamp()));
+        }
+        Map<String, Object> rsMap = new HashMap<>();
+        rsMap.put("list", d80s);
+        rsMap.put("totalPages", all.size() % size == 0 ? all.size() / size - 1: all.size() / size);
+        rsMap.put("page", page);
         return rsMap;
     }
@@ -593,7 +593,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							while (it.hasNext()) {
 								ChildTaskPlan childTaskPlan = it.next();
 								if (childTaskPlan.getMileageType().equals("service")
-										&& "正常".equals(childTaskPlan.getType1())) {
+										&& "正常".equals(childTaskPlan.getType1())
+										&& childTaskPlan.getCcId()==null) {
 									if (!childTaskPlan.isDestroy()) {
 										Float jhgl = childTaskPlan.getMileage() == null ? 0
 												: childTaskPlan.getMileage();
@@ -769,7 +770,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				xxkzgf=0,xxkwgf=0,xxm=0,xxmzgf=0,xxmwgf=0;
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo s=lists.get(i);
-			if(s.getFcsjActual()!=null){
+			if(s.getFcsjActual()!=null && !s.isCcService()
+					&& !isInOut(s)){
 				String xlDir=s.getXlDir();
 				String fcsjs=s.getFcsj();
 				String[] fcsjStr = fcsjs.split(":");
@@ -779,7 +781,6 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				long fcsjActual = Long.parseLong(fcsjActualsStr[0]) * 60 + Long.parseLong(fcsjActualsStr[1]);
 				if("0".equals(xlDir)){
-					
 					if(fcsj-fcsjActual>1){
 						sxk++;
 						if(fcsj>zgf1&&fcsj<zgf2)
@@ -80,6 +80,9 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 		if(s.getBcType().equals("ldks")){
 			fage=true;
 		}
+		if(s.isCcService()){
+			fage=true;
+		}
 		return fage;
 	}
@@ -44,6 +44,7 @@
         #main-tab-content{
             padding: 0 !important;
+            list-style: none;
         }
         .home-panel{
@@ -99,6 +100,8 @@
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
 <script src="/assets/js/eventproxy.js"></script>
+<!-- Geolib -->
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
 <script>
@@ -125,6 +125,7 @@
     line-height: 25px;
     font-size: 13px;
     padding: 0 0 3px;
+    position: relative;
 }
 .data-wrap .data-title span.data-title-text {
@@ -326,4 +327,13 @@ span.signal-state-speed-limit{
 #send-phrase-multi-modal .tools>span{
     cursor: pointer;
     margin-left: 12px;
+}
+
+.device_list_filter_icon{
+    position: absolute;
+    right: 15px;
+}
+
+.device_list_filter_icon.online{
+
 }
 \ No newline at end of file
@@ -42,9 +42,9 @@
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
-                    <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过20个字符）</small></label>
+                    <label class="uk-form-label" for="form-s-t">备注<small class="font-danger">（不超过50个字符）</small></label>
                     <div class="uk-form-controls">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" >{{remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" >{{remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -167,8 +167,7 @@
                     if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
-                    //重置类型，等待调整界面触发刷新事件
-                    $(this).val(sch.bcType);
+
                     var url, detailModal;
                     if(type=='venting'){
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html';
@@ -181,6 +180,8 @@
                     else
                         return;
+                    //重置类型，等待调整界面触发刷新事件
+                    $(this).val(sch.bcType);
                     $.get(url, function(htmlStr){
                         $(document.body).append(htmlStr);
@@ -194,9 +195,9 @@
                  */
                 $('[name=bcType]', modal).mousedown(function () {
                     this.sindex = $(this)[0].selectedIndex;
-                    $(this)[0].selectedIndex = 0;
+                    $(this)[0].selectedIndex = -1;
                 }).mouseout(function () {
-                    if ($(this)[0].selectedIndex === 0) {
+                    if ($(this)[0].selectedIndex === -1) {
                         $(this)[0].selectedIndex = this.sindex;
                     }
                 });
@@ -270,17 +270,19 @@
                     if(sch.bcType == 'in' || sch.bcType == 'out')
                         return;
-                    //重置类型，等待调整界面触发刷新事件
-                    $(this).val(sch.bcType);
                     var url, detailModal;
                     if(type=='venting'){
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html';
                         detailModal='#bctype-venting-modal';
                     }
-                    else{
+                    else if(type=='major'){
                         detailModal='#bctype-major-modal';
                         url='/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html';
                     }
+                    else return;
+
+                    //重置类型，等待调整界面触发刷新事件
+                    $(this).val(sch.bcType);
                     $.get(url, function(htmlStr){
                         $(document.body).append(htmlStr);
@@ -295,9 +297,9 @@
                  */
                 $('select[name=bcType]', modal).mousedown(function () {
                     this.sindex = $(this)[0].selectedIndex;
-                    $(this)[0].selectedIndex = 0;
+                    $(this)[0].selectedIndex = -1;
                 }).mouseout(function () {
-                    if ($(this)[0].selectedIndex === 0) {
+                    if ($(this)[0].selectedIndex === -1) {
                         $(this)[0].selectedIndex = this.sindex;
                     }
                 });
@@ -12,8 +12,12 @@
                     </legend>
                     <span class="horizontal-field">请求代码</span>
                     <select name="requestCode">
-                        <option value="-1">全部</option>
+                        <option value="">全部</option>
                     </select>
+                    <span class="horizontal-field">线路</span>
+                    <div class="uk-autocomplete uk-form autocomplete-line" >
+                        <input type="text" name="lineId" placeholder="线路">
+                    </div>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form autocomplete-cars" >
                         <input type="text" name="nbbm" placeholder="车辆自编号">
@@ -84,9 +88,9 @@
                 }
                 $('[name=requestCode]', modal).append(opt);
                 //车辆 autocomplete
-                $.get('/basic/cars', function(rs) {
-                    gb_common.carAutocomplete($('.autocomplete-cars', modal), rs);
-                });
+                gb_common.carAutocomplete($('.autocomplete-cars', modal), gb_data_basic.carsArray());
+                //线路 autocomplete
+                gb_common.lineAutocomplete($('.autocomplete-line', modal));
                 query();
             });
@@ -102,6 +106,12 @@
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
+                //线路转换成编码
+                if(data.lineId){
+                    var lineCode = gb_data_basic.findCodeByLinename(data.lineId);
+                    if(lineCode)
+                        data.lineId=lineCode;
+                }
                 $.get('/directive/findAll80', data, function(rs) {
                     $.each(rs.list, function(){
                         //命令字转中文
@@ -122,7 +132,7 @@
                     if (resetPagination)
                         pagination(rs.totalPages + 1, rs.page);
                 })
-            }
+            };
             var resetPagination = true;
             var pagination = function(pages, currentPage) {