Merge remote-tracking branch 'origin/dev' into dev

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

+package com.elephant.framework.galaxy.aroad.bigdata;
+
+/**
+ * @program: pingxiang_basedata
+ * @description: ${description}
+ * @author: dongjili
+ * @create: 2019-05-07 19:33
+ **/
+public class BaseHighWayService {
+    private  String id;
+    private  String lxbh;//路线编号
+    private  String lxmc;//路线名称
+    private  String zh1;//桩号
+    private  String fwsslx;//服务设施类型
+    private  String fwssmc;//服务设施名称
+    private  String csyysj;//初始运营时间
+    private  String bjxs;//布局形式
+    private  String jyms;//经营模式
+    private  String zdmj;//占地面积
+    private  String tccmj;//停车场面积
+    private  String tcwsl;//停车位数量
+    private  String fwssgnSFycs;//服务设施功能_是否有厕所
+    private  String fwssgnSfyjyss;//服务设施功能_是否有加油设施
+    private  String fwssgnSfyjqss;//服务设施功能_是否有加气设施
+    private  String fwssgnSfyclcdss;//服务设施功能_是否有车辆充电设施
+    private  String fwssgnSfycyss;//服务设施功能_是否有餐饮设施
+    private  String fwssgnSfycs;//服务设施功能_是否有超市
+    private  String fwssgnSfyzsss;//服务设施功能_是否有住宿设施
+    private  String fwssgnSfyqcwx;//服务设施功能_是否有汽车维修
+    private  String bz;//备注
+    private  String lxbm;//路线编码
+    private  String zh;//桩号
+    private  String jd;//经度
+    private  String wd;//纬度
+
+    public BaseHighWayService() {
+    }
+
+    public BaseHighWayService(String id, String lxbh, String lxmc, String zh1, String fwsslx, String fwssmc, String csyysj, String bjxs, String jyms, String zdmj, String tccmj, String tcwsl, String fwssgnSFycs, String fwssgnSfyjyss, String fwssgnSfyjqss, String fwssgnSfyclcdss, String fwssgnSfycyss, String fwssgnSfycs, String fwssgnSfyzsss, String fwssgnSfyqcwx, String bz, String lxbm, String zh, String jd, String wd) {
+        this.id = id;
+        this.lxbh = lxbh;
+        this.lxmc = lxmc;
+        this.zh1 = zh1;
+        this.fwsslx = fwsslx;
+        this.fwssmc = fwssmc;
+        this.csyysj = csyysj;
+        this.bjxs = bjxs;
+        this.jyms = jyms;
+        this.zdmj = zdmj;
+        this.tccmj = tccmj;
+        this.tcwsl = tcwsl;
+        this.fwssgnSFycs = fwssgnSFycs;
+        this.fwssgnSfyjyss = fwssgnSfyjyss;
+        this.fwssgnSfyjqss = fwssgnSfyjqss;
+        this.fwssgnSfyclcdss = fwssgnSfyclcdss;
+        this.fwssgnSfycyss = fwssgnSfycyss;
+        this.fwssgnSfycs = fwssgnSfycs;
+        this.fwssgnSfyzsss = fwssgnSfyzsss;
+        this.fwssgnSfyqcwx = fwssgnSfyqcwx;
+        this.bz = bz;
+        this.lxbm = lxbm;
+        this.zh = zh;
+        this.jd = jd;
+        this.wd = wd;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getLxbh() {
+        return lxbh;
+    }
+
+    public void setLxbh(String lxbh) {
+        this.lxbh = lxbh;
+    }
+
+    public String getLxmc() {
+        return lxmc;
+    }
+
+    public void setLxmc(String lxmc) {
+        this.lxmc = lxmc;
+    }
+
+    public String getZh1() {
+        return zh1;
+    }
+
+    public void setZh1(String zh1) {
+        this.zh1 = zh1;
+    }
+
+    public String getFwsslx() {
+        return fwsslx;
+    }
+
+    public void setFwsslx(String fwsslx) {
+        this.fwsslx = fwsslx;
+    }
+
+    public String getFwssmc() {
+        return fwssmc;
+    }
+
+    public void setFwssmc(String fwssmc) {
+        this.fwssmc = fwssmc;
+    }
+
+    public String getCsyysj() {
+        return csyysj;
+    }
+
+    public void setCsyysj(String csyysj) {
+        this.csyysj = csyysj;
+    }
+
+    public String getBjxs() {
+        return bjxs;
+    }
+
+    public void setBjxs(String bjxs) {
+        this.bjxs = bjxs;
+    }
+
+    public String getJyms() {
+        return jyms;
+    }
+
+    public void setJyms(String jyms) {
+        this.jyms = jyms;
+    }
+
+    public String getZdmj() {
+        return zdmj;
+    }
+
+    public void setZdmj(String zdmj) {
+        this.zdmj = zdmj;
+    }
+
+    public String getTccmj() {
+        return tccmj;
+    }
+
+    public void setTccmj(String tccmj) {
+        this.tccmj = tccmj;
+    }
+
+    public String getTcwsl() {
+        return tcwsl;
+    }
+
+    public void setTcwsl(String tcwsl) {
+        this.tcwsl = tcwsl;
+    }
+
+    public String getFwssgnSFycs() {
+        return fwssgnSFycs;
+    }
+
+    public void setFwssgnSFycs(String fwssgnSFycs) {
+        this.fwssgnSFycs = fwssgnSFycs;
+    }
+
+    public String getFwssgnSfyjyss() {
+        return fwssgnSfyjyss;
+    }
+
+    public void setFwssgnSfyjyss(String fwssgnSfyjyss) {
+        this.fwssgnSfyjyss = fwssgnSfyjyss;
+    }
+
+    public String getFwssgnSfyjqss() {
+        return fwssgnSfyjqss;
+    }
+
+    public void setFwssgnSfyjqss(String fwssgnSfyjqss) {
+        this.fwssgnSfyjqss = fwssgnSfyjqss;
+    }
+
+    public String getFwssgnSfyclcdss() {
+        return fwssgnSfyclcdss;
+    }
+
+    public void setFwssgnSfyclcdss(String fwssgnSfyclcdss) {
+        this.fwssgnSfyclcdss = fwssgnSfyclcdss;
+    }
+
+    public String getFwssgnSfycyss() {
+        return fwssgnSfycyss;
+    }
+
+    public void setFwssgnSfycyss(String fwssgnSfycyss) {
+        this.fwssgnSfycyss = fwssgnSfycyss;
+    }
+
+    public String getFwssgnSfycs() {
+        return fwssgnSfycs;
+    }
+
+    public void setFwssgnSfycs(String fwssgnSfycs) {
+        this.fwssgnSfycs = fwssgnSfycs;
+    }
+
+    public String getFwssgnSfyzsss() {
+        return fwssgnSfyzsss;
+    }
+
+    public void setFwssgnSfyzsss(String fwssgnSfyzsss) {
+        this.fwssgnSfyzsss = fwssgnSfyzsss;
+    }
+
+    public String getFwssgnSfyqcwx() {
+        return fwssgnSfyqcwx;
+    }
+
+    public void setFwssgnSfyqcwx(String fwssgnSfyqcwx) {
+        this.fwssgnSfyqcwx = fwssgnSfyqcwx;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+
+    public String getLxbm() {
+        return lxbm;
+    }
+
+    public void setLxbm(String lxbm) {
+        this.lxbm = lxbm;
+    }
+
+    public String getZh() {
+        return zh;
+    }
+
+    public void setZh(String zh) {
+        this.zh = zh;
+    }
+
+    public String getJd() {
+        return jd;
+    }
+
+    public void setJd(String jd) {
+        this.jd = jd;
+    }
+
+    public String getWd() {
+        return wd;
+    }
+
+    public void setWd(String wd) {
+        this.wd = wd;
+    }
+
+    @Override
+    public String toString() {
+        return "BaseHighWayService{" +
+                "id='" + id + '\'' +
+                ", lxbh='" + lxbh + '\'' +
+                ", lxmc='" + lxmc + '\'' +
+                ", zh1='" + zh1 + '\'' +
+                ", fwsslx='" + fwsslx + '\'' +
+                ", fwssmc='" + fwssmc + '\'' +
+                ", csyysj='" + csyysj + '\'' +
+                ", bjxs='" + bjxs + '\'' +
+                ", jyms='" + jyms + '\'' +
+                ", zdmj='" + zdmj + '\'' +
+                ", tccmj='" + tccmj + '\'' +
+                ", tcwsl='" + tcwsl + '\'' +
+                ", fwssgnSFycs='" + fwssgnSFycs + '\'' +
+                ", fwssgnSfyjyss='" + fwssgnSfyjyss + '\'' +
+                ", fwssgnSfyjqss='" + fwssgnSfyjqss + '\'' +
+                ", fwssgnSfyclcdss='" + fwssgnSfyclcdss + '\'' +
+                ", fwssgnSfycyss='" + fwssgnSfycyss + '\'' +
+                ", fwssgnSfycs='" + fwssgnSfycs + '\'' +
+                ", fwssgnSfyzsss='" + fwssgnSfyzsss + '\'' +
+                ", fwssgnSfyqcwx='" + fwssgnSfyqcwx + '\'' +
+                ", bz='" + bz + '\'' +
+                ", lxbm='" + lxbm + '\'' +
+                ", zh='" + zh + '\'' +
+                ", jd='" + jd + '\'' +
+                ", wd='" + wd + '\'' +
+                '}';
+    }
+}

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

 package com.elephant.framework.galaxy.aroad.bigdata;
 
-import java.io.Serializable;
-
-public class BaseRoadToll_String implements Serializable{
-    private String id;
-
-    private String roadCode;
-
-    private String roadName;
-
-    private String number;
-
-    private String code;
-
-    private String name;
-
-    private String shortName;
-
-    private String tecLevel;
-
-    private String locationType;
-
-    private String tollDirection;
-
-    private String entNum;
-
-    private String entEtcNum;
-
-    private String entMtcNum;
-
-    private String entMixNum;
-
-    private String expNum;
-
-    private String expEtcNum;
-
-    private String expMtcNum;
-
-    private String expMixNum;
-
-    private String managementUnit;
-
-    private String longitude;
-
-    private String latitude;
+public class BaseRoadToll_String {
+    private String id;//序号
+    private String roadCode;//所在路线编号
+    private String roadName;//所在路线名称
+    private String number;//收费站桩号
+    private String code;//收费站编码
+    private String name;//收费站名称
+    private String shortName;//收费站简称
+    private String tecLevel;//所在路线技术等级
+    private String locationType;//收费站位置类型
+    private String tollDirection;//收费方向
+    private String entNum;//入口车道数（条）
+    private String entEtcNum;//入口ETC车道数
+    private String entMtcNum;//入口MTC车道数
+    private String entMixNum;//入口混合车道数
+    private String expNum;//出口车道数（条）
+    private String expEtcNum;// 出口ETC车道数
+    private String expMtcNum;//出口MTC车道数
+    private String expMixNum;//出口混合车道数
+    private String managementUnit;//管理单位
+    private String longitude;//经度
+    private String latitude;//纬度
 
     public BaseRoadToll_String() {
     }

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

@@ -2,95 +2,183 @@ package com.elephant.framework.galaxy.aroad.bigdata;
 
 public class Basehighwayalldata {
     private String id;//
-    private String luxianbianhao;
-    private String quhuadaima;
-    private String luxianmingcheng;
-    private String qidianmingcheng;
-    private String zhidianmingcheng;
-    private String qidianzhuanghaoa;
-    private String zhidianzhuanghao;
-    private String licheng;
-    private String lichengjisuan;
-    private String sandlicheng;
-    private String dengjidaima;
-    private String dengjimingcheng;
-    private String chedaodaima;
-    private String chedaofenlei;
-    private String mianchengdaima;
-    private String mianchengfenlei;
-    private String lujikuandu;
-    private String lumiankuandu;
-    private String shejishisu;
-    private String xiujianniandu;
-    private String gaijianniandu;
-    private String chengguanlu;
-    private String duantoulu;
-    private String chongfubianma;
-    private String chongfuxuhao;
-    private String qidianzhuanghaob;
-    private String zhongdianzhuanghao;
-    private String yanghulicheng;
-    private String qingyulicheng;
-    private String kelvhaolicheng;
-    private String yilvhualicheng;
-    private String dimaodaima;
-    private String dimaohanzi;
-    private String handongshuliang;
-    private String maisheqidianzhuanghao;
-    private String maishezhidianzhuanghao;
-    private String quhuamingchengshi;
-    private String quhuamingchengxian;
-    private String quhuamingchengxiang;
-    private String luduanxuhao;
-    private String guanyangdanweileibie;
-    private String beizhu;
-    private String kaigongriqi;
-    private String jungongriqi;
-    private String qidianfenjiedianleixing;
-    private String zhidianfenjiedianleixing;
-    private String shengjichurukou;
-    private String gbmlicheng;
-    private String yangbanlicheng;
-    private String tongcheriqi;
-    private String luxiandifangmingcheng;
-    private String jianshexingzhidaima;
-    private String jianshexingzhihanzi;
-    private String duanlianleixing;
-    private String luduanleixingdaima;
-    private String luduanleixing;
-    private String guanyangdanweimingcheng;
-    private String mqi;
-    private String pingdingdengji;
-    private String shoufeixingzhi;
-    private String biangengyuanyindaima;
-    private String biangengyuanyin;
-    private String biangengshijian;
-    private String xiangmuxingzhi;
-    private String xiangmumingcheng;
-    private String xiangmudaima;
-    private String xiangmuqidianmingcheng;
-    private String xiangmuzhidianmingcheng;
-    private String xiangmuleibie;
-    private String jihuaxiangmubianma;
-    private String xiangmuluxianbianma;
-    private String xiangmuluxianmingcheng;
-    private String xiangmubiangengyuanyin;
-    private String xiangmubiangengshijian;
-    private String touzilaiyuan;
-    private String miancenghoudu;
-    private String zuijinyicidaxiuniandu;
-    private String zuijinyicizhongxiuniandu;
-    private String guodaotiaozhengqianluxianbianma;
-    private String guodaozhuanghaochuandiyuliulicheng;
-    private String nianpingjunrijiaotongliang;
-    private String shifouanganxiangongluguanlijieyang;
-    private String luxiantiaozhengleixing;
-    private String shangnianluxianbianma;
-    private String shangnianluxianmingcheng;
-    private String shangnianluxianqidianzhuanghao;
-    private String shangnianluxianzhidianzhuanghao;
-    private String tianbaodanweimingcheng;
-    private String shape;
+    private String luxianbianhao;//路线编号
+
+    private String quhuadaima;//区划代码
+
+    private String luxianmingcheng;//路线名称
+
+    private String qidianmingcheng;//起点名称
+
+    private String zhidianmingcheng;//止点名称
+
+    private String qidianzhuanghaoa;//起点桩号
+
+    private String zhidianzhuanghao;//止点桩号
+
+    private String licheng;//里程
+
+    private String lichengjisuan;//里程(计算)
+
+    private String sandlicheng;//3D里程(计算)
+
+    private String dengjidaima;//等级代码
+
+    private String dengjimingcheng;//等级名称
+
+    private String chedaodaima;//车道代码
+
+    private String chedaofenlei;//车道分类
+
+    private String mianchengdaima;//面层代码
+
+    private String mianchengfenlei;//面层分类
+
+    private String lujikuandu;//路基宽度
+
+    private String lumiankuandu;//路面宽度
+
+    private String shejishisu;//设计时速
+
+    private String xiujianniandu;//修建年度
+
+    private String gaijianniandu;//改建年度
+
+    private String chengguanlu;//城管路
+
+    private String duantoulu;//断头路
+
+    private String chongfubianma;//重复编码
+
+    private String chongfuxuhao;//重复序号
+
+    private String qidianzhuanghaob;//起点桩号
+
+    private String zhongdianzhuanghao;//终点桩号
+
+    private String yanghulicheng;//养护里程
+
+    private String qingyulicheng;//晴雨里程
+
+    private String kelvhaolicheng;//可绿化里程
+
+    private String yilvhualicheng;//已绿化里程
+
+    private String dimaodaima;//地貌代码
+
+    private String dimaohanzi;//地貌汉字
+
+    private String handongshuliang;//涵洞数量
+
+    private String maisheqidianzhuanghao;//埋设起点桩号
+
+    private String maishezhidianzhuanghao;//埋设止点桩号
+
+    private String quhuamingchengshi;//区划名称(市)
+
+    private String quhuamingchengxian;//区划名称(县)
+
+    private String quhuamingchengxiang;//区划名称(乡)
+
+    private String luduanxuhao;//路段序号
+
+    private String guanyangdanweileibie;//管养单位类别
+
+    private String beizhu;//备注
+
+    private String kaigongriqi;//开工日期
+
+    private String jungongriqi;//竣工日期
+
+    private String qidianfenjiedianleixing;//起点分界点类型
+
+    private String zhidianfenjiedianleixing;//止点分界点类型
+
+    private String shengjichurukou;//省际出入口
+
+    private String gbmlicheng;//GBM里程
+
+    private String yangbanlicheng;//样板里程
+
+    private String tongcheriqi;//通车日期
+
+    private String luxiandifangmingcheng;//路线地方名称
+
+    private String jianshexingzhidaima;//建设性质代码
+
+    private String jianshexingzhihanzi;//建设性质汉字
+
+    private String duanlianleixing;//断链类型
+
+    private String luduanleixingdaima;//路段类型代码
+
+    private String luduanleixing;//路段类型
+
+    private String guanyangdanweimingcheng;//管养单位名称
+
+    private String mqi;//MQI
+
+    private String pingdingdengji;//MQI
+
+    private String shoufeixingzhi;//收费性质
+
+    private String biangengyuanyindaima;//变更原因代码
+
+    private String biangengyuanyin;//变更原因
+
+    private String biangengshijian;//变更时间
+
+    private String xiangmuxingzhi;//项目性质
+
+    private String xiangmumingcheng;//项目名称
+
+    private String xiangmudaima;//项目代码
+
+    private String xiangmuqidianmingcheng;//项目起点名称
+
+    private String xiangmuzhidianmingcheng;//项目止点名称
+
+    private String xiangmuleibie;//项目类别
+
+    private String jihuaxiangmubianma;//计划项目编码
+
+    private String xiangmuluxianbianma;//项目路线编码
+
+    private String xiangmuluxianmingcheng;//项目路线名称
+
+    private String xiangmubiangengyuanyin;//项目变更原因
+
+    private String xiangmubiangengshijian;//项目变更时间
+
+    private String touzilaiyuan;//投资来源
+
+    private String miancenghoudu;//面层厚度
+
+    private String zuijinyicidaxiuniandu;//最近一次大修年度
+
+    private String zuijinyicizhongxiuniandu;//最近一次中修年度
+
+    private String guodaotiaozhengqianluxianbianma;//国道调整前路线编码
+
+    private String guodaozhuanghaochuandiyuliulicheng;//国道桩号传递预留里程
+
+    private String nianpingjunrijiaotongliang;//年平均日交通量（辆）
+
+    private String shifouanganxiangongluguanlijieyang;//是否按干线公路管理接养
+
+    private String luxiantiaozhengleixing;//路线调整类型
+
+    private String shangnianluxianbianma;//上年路线编码
+
+    private String shangnianluxianmingcheng;//上年路线名称
+
+    private String shangnianluxianqidianzhuanghao;//上年路线起点桩号
+
+    private String shangnianluxianzhidianzhuanghao;//上年路线讫点桩号
+
+    private String tianbaodanweimingcheng;//填报单位名称
+
+    private String shape;//经纬度
 
     public String getId() {
         return id;