update...

潘钊
1 parent b9361d3a
Showing 6 changed files with 144 additions and 6 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/resources/static/real_control_v2/fragments/north/nav/report_80.html
@@ -117,6 +117,10 @@ public class PilotReport {
  
             //推送到页面
             sendUtils.send80ToPage(d80);
+
+            //反射搜索用 瞬时字段
+            d80.setLineId(d80.getData().getLineId());
+            d80.setNbbm(d80.getData().getNbbm());
         } 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,14 @@ public class D80 {
  
 	private Long schId;
  
+	@Transient
+	@JsonIgnore
+	private String lineId;
+
+	@Transient
+	@JsonIgnore
+	private String nbbm;
+
 	public Long getSchId() {
 		return schId;
 	}
@@ -73,6 +82,22 @@ 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;
+	}
+
 	@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;
@@ -448,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())) {
@@ -492,8 +494,18 @@ 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);*/
  
+        Collection all = pilotReport.findAll();
+        List<D80> d80s = ListPageQueryUtils.paging(ListFilterUtils.filter(all, map, D80.class), 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", d80s.size() % size == 0 ? d80s.size() / size - 1 : d80s.size() / size);
+        rsMap.put("page", page);
         return rsMap;
     }
  
@@ -14,6 +14,10 @@
                     <select name="requestCode">
                         <option value="-1">全部</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) {