elasticsearch所有查询的方法修改，type字段写死，字段中增加查找最新年份，按照最新年份查询所需数据

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseHighWayService.java

@@ -33,6 +33,7 @@ public class BaseHighWayService {
     private  String zh;//桩号
     private  String jd;//经度
     private  String wd;//纬度
+    private Integer year;//年度
 
     public BaseHighWayService() {
     }
@@ -65,6 +66,14 @@ public class BaseHighWayService {
         this.wd = wd;
     }
 
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
     public String getId() {
         return id;
     }
@@ -293,6 +302,7 @@ public class BaseHighWayService {
                 ", zh='" + zh + '\'' +
                 ", jd='" + jd + '\'' +
                 ", wd='" + wd + '\'' +
+                ", year=" + year +
                 '}';
     }
 }

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseRoadToll_String.java

@@ -28,7 +28,7 @@ public class BaseRoadToll_String {
     private String managementUnit;//管理单位
     private String longitude;//经度
     private String latitude;//纬度
-
+    private Integer year;//年度
     public BaseRoadToll_String() {
     }
 
@@ -56,6 +56,14 @@ public class BaseRoadToll_String {
         this.latitude = latitude;
     }
 
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
     public String getId() {
         return id;
     }
@@ -248,6 +256,7 @@ public class BaseRoadToll_String {
                 ", managementUnit='" + managementUnit + '\'' +
                 ", longitude='" + longitude + '\'' +
                 ", latitude='" + latitude + '\'' +
+                ", year=" + year +
                 '}';
     }
 }
\ No newline at end of file

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/Basebridgealldata.java

@@ -232,6 +232,15 @@ public class Basebridgealldata {
     private String shape;//经纬度
 
     private String qiaokuazuhe;//桥跨组合
+    private Integer year;//年度
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
 
     public String getId() {
         return id;
@@ -1253,6 +1262,7 @@ public class Basebridgealldata {
                 ", tianbaodanweimingcheng='" + tianbaodanweimingcheng + '\'' +
                 ", shape='" + shape + '\'' +
                 ", qiaokuazuhe='" + qiaokuazuhe + '\'' +
+                ", year=" + year +
                 '}';
     }
 }
\ No newline at end of file

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/Basehighwayalldata.java

@@ -185,6 +185,15 @@ public class Basehighwayalldata implements Comparable<Basehighwayalldata>{
     private String tianbaodanweimingcheng;//填报单位名称
 
     private String shape;//经纬度
+    private Integer year;//年度
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
 
     public String getId() {
         return id;
@@ -915,8 +924,8 @@ public class Basehighwayalldata implements Comparable<Basehighwayalldata>{
                 ", luxianmingcheng='" + luxianmingcheng + '\'' +
                 ", qidianmingcheng='" + qidianmingcheng + '\'' +
                 ", zhidianmingcheng='" + zhidianmingcheng + '\'' +
-                ", qidianzhuanghaoa='" + qidianzhuanghaoa + '\'' +
-                ", zhidianzhuanghao='" + zhidianzhuanghao + '\'' +
+                ", qidianzhuanghaoa=" + qidianzhuanghaoa +
+                ", zhidianzhuanghao=" + zhidianzhuanghao +
                 ", licheng='" + licheng + '\'' +
                 ", lichengjisuan='" + lichengjisuan + '\'' +
                 ", sandlicheng='" + sandlicheng + '\'' +
@@ -999,9 +1008,11 @@ public class Basehighwayalldata implements Comparable<Basehighwayalldata>{
                 ", shangnianluxianzhidianzhuanghao='" + shangnianluxianzhidianzhuanghao + '\'' +
                 ", tianbaodanweimingcheng='" + tianbaodanweimingcheng + '\'' +
                 ", shape='" + shape + '\'' +
+                ", year=" + year +
                 '}';
     }
-//实现Comparable方法，按照qidianzhuanghaoa排序
+
+    //实现Comparable方法，按照qidianzhuanghaoa排序
     @Override
     public int compareTo(Basehighwayalldata ob) {
         return qidianzhuanghaoa.compareTo(ob.getQidianzhuanghaoa());

src/main/java/com/elephant/framework/galaxy/aroad/bigdata/Basetunnelalldata.java

@@ -96,6 +96,16 @@ public class Basetunnelalldata {
 
     private String shape;//经纬度
 
+    private Integer year;//年度
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
     public String getId() {
         return id;
     }
@@ -504,6 +514,7 @@ public class Basetunnelalldata {
                 ", shifouzaizhangdasuidaomuluzhong='" + shifouzaizhangdasuidaomuluzhong + '\'' +
                 ", beizhu='" + beizhu + '\'' +
                 ", shape='" + shape + '\'' +
+                ", year=" + year +
                 '}';
     }
 }
\ No newline at end of file