3.23--修改线路相关的实体类

src/main/java/com/example/tdl/callabletask/GWConfigWorker.java

@@ -110,8 +110,8 @@ public class GWConfigWorker implements Callable<String>, MqttCallback {
                                         mqttAsyncClient.subscribe(RespTopic, qos);//订阅主题
                                     }
                                     //获取数据
-                                    ConfigVo configVo = configService.getConfig(SN,Type);
-                                    ConfigCMD = configVo.getMessage();
+                                    //ConfigVo configVo = configService.getConfig(SN,Type);
+                                    //ConfigCMD = configVo.getMessage();
                                     //发送数据
                                     publish(ConfigCMD,ConfigTopic);
                                 } catch (MqttException e){
@@ -175,15 +175,15 @@ public class GWConfigWorker implements Callable<String>, MqttCallback {
             this.ret_data = Message;
             //解析Message消息
             RespVo respVo = new Gson().fromJson(Message,RespVo.class);
-            if(respVo.getResponse().equals("config")){
-                //配置回复
-                configService.bindiSuccess(SN,Type,respVo.getStatus());
-            }else{
-                //解绑回复
-                if(respVo.getStatus() ==0 || respVo.getStatus() == 1){
-                    configService.delConfig(SN,Type);
-                }
-            }
+//            if(respVo.getResponse().equals("config")){
+//                //配置回复
+//                configService.bindiSuccess(SN,Type,respVo.getStatus());
+//            }else{
+//                //解绑回复
+//                if(respVo.getStatus() ==0 || respVo.getStatus() == 1){
+//                    configService.delConfig(SN,Type);
+//                }
+//            }
             if(NeedResp){
                 mqttAsyncClient.unsubscribe(RespTopic);//不监听回复主题
             }

src/main/java/com/example/tdl/entity/Circuit.java

@@ -15,137 +15,169 @@ public class Circuit implements Serializable {
 
     private String transportationNo;//运输编号
 
-    private Route route;//路由
-
     private Long startTime;
 
     private Long endTime;
 
-    private Alarm alarm;
+    private Long expTime;
+
+    private Long compTime;//预计结束时间
 
-    private String boxNo;
+    private String cargoNo;//货物编号
 
-    private String containerNo;
+    private String plateNo;//车牌号
 
     private String deliveryAddress;
 
+    private String transportation;
+
     private String transportationType;
 
-    private boolean circuitState;//线路完成状态
+    private Float evaluate;
+
+    private String evaluateRemark;
 
-    private String routeNumber;
+    private Integer circuitState;//线路完成状态
 
     private String remark;
 
-    public Serializable getSerializable() {
-        return serializable;
+    private Boolean state;
+
+    private Alarm alarm;
+
+    public Integer getId() {
+        return id;
     }
 
-    public void setSerializable(Serializable serializable) {
-        this.serializable = serializable;
+    public void setId(Integer id) {
+        this.id = id;
     }
 
-    public Alarm getAlarm() {
-        return alarm;
+    public String getTransportationNo() {
+        return transportationNo;
     }
 
-    public void setAlarm(Alarm alarm) {
-        this.alarm = alarm;
+    public void setTransportationNo(String transportationNo) {
+        this.transportationNo = transportationNo;
     }
 
-    public String getBoxNo() {
-        return boxNo;
+    public Long getStartTime() {
+        return startTime;
     }
 
-    public void setBoxNo(String boxNo) {
-        this.boxNo = boxNo;
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
     }
 
-    public String getContainerNo() {
-        return containerNo;
+    public Long getEndTime() {
+        return endTime;
     }
 
-    public void setContainerNo(String containerNo) {
-        this.containerNo = containerNo;
+    public void setEndTime(Long endTime) {
+        this.endTime = endTime;
     }
 
-    public String getDeliveryAddress() {
-        return deliveryAddress;
+    public Long getExpTime() {
+        return expTime;
     }
 
-    public void setDeliveryAddress(String deliveryAddress) {
-        this.deliveryAddress = deliveryAddress;
+    public void setExpTime(Long expTime) {
+        this.expTime = expTime;
     }
 
-    public String getTransportationType() {
-        return transportationType;
+    public Long getCompTime() {
+        return compTime;
     }
 
-    public void setTransportationType(String transportationType) {
-        this.transportationType = transportationType;
+    public void setCompTime(Long compTime) {
+        this.compTime = compTime;
     }
 
-    public String getRemark() {
-        return remark;
+    public String getCargoNo() {
+        return cargoNo;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark;
+    public void setCargoNo(String cargoNo) {
+        this.cargoNo = cargoNo;
     }
 
-    public Integer getId() {
-        return id;
+    public String getPlateNo() {
+        return plateNo;
     }
 
-    public void setId(Integer id) {
-        this.id = id;
+    public void setPlateNo(String plateNo) {
+        this.plateNo = plateNo;
     }
 
-    public String getTransportationNo() {
-        return transportationNo;
+    public String getDeliveryAddress() {
+        return deliveryAddress;
     }
 
-    public void setTransportationNo(String transportationNo) {
-        this.transportationNo = transportationNo;
+    public void setDeliveryAddress(String deliveryAddress) {
+        this.deliveryAddress = deliveryAddress;
     }
 
-    public Route getRoute() {
-        return route;
+    public String getTransportation() {
+        return transportation;
     }
 
-    public void setRoute(Route route) {
-        this.route = route;
+    public void setTransportation(String transportation) {
+        this.transportation = transportation;
     }
 
-    public Long getStartTime() {
-        return startTime;
+    public String getTransportationType() {
+        return transportationType;
     }
 
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
+    public void setTransportationType(String transportationType) {
+        this.transportationType = transportationType;
     }
 
-    public Long getEndTime() {
-        return endTime;
+    public Float getEvaluate() {
+        return evaluate;
     }
 
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
+    public void setEvaluate(Float evaluate) {
+        this.evaluate = evaluate;
+    }
+
+    public String getEvaluateRemark() {
+        return evaluateRemark;
     }
 
-    public boolean isCircuitState() {
+    public void setEvaluateRemark(String evaluateRemark) {
+        this.evaluateRemark = evaluateRemark;
+    }
+
+    public Integer getCircuitState() {
         return circuitState;
     }
 
-    public void setCircuitState(boolean circuitState) {
+    public void setCircuitState(Integer circuitState) {
         this.circuitState = circuitState;
     }
 
-    public String getRouteNumber() {
-        return routeNumber;
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
 
-    public void setRouteNumber(String routeNumber) {
-        this.routeNumber = routeNumber;
+    public Boolean getState() {
+        return state;
+    }
+
+    public void setState(Boolean state) {
+        this.state = state;
+    }
+
+    public Alarm getAlarm() {
+        return alarm;
+    }
+
+    public void setAlarm(Alarm alarm) {
+        this.alarm = alarm;
     }
 }

src/main/java/com/example/tdl/entity/CircuitTransfer.java

+package com.example.tdl.entity;
+
+public class CircuitTransfer {
+
+    private Integer id;
+
+    private String addressDetail;
+
+    private String lng;
+
+    private String lat;
+
+    private String postCode;
+
+    private Integer sequence;
+
+    private Long startTime;
+
+    private Long arrivalTime;
+
+    private City city;
+
+    private Circuit circuit;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public Long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Long startTime) {
+        this.startTime = startTime;
+    }
+
+    public Long getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Long arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public City getCity() {
+        return city;
+    }
+
+    public void setCity(City city) {
+        this.city = city;
+    }
+
+    public Circuit getCircuit() {
+        return circuit;
+    }
+
+    public void setCircuit(Circuit circuit) {
+        this.circuit = circuit;
+    }
+}

src/main/java/com/example/tdl/entity/City.java

+package com.example.tdl.entity;
+
+public class City {
+
+    private  Integer id;
+
+    private String country;
+
+    private String cuty;
+
+    private String remark;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getCuty() {
+        return cuty;
+    }
+
+    public void setCuty(String cuty) {
+        this.cuty = cuty;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/entity/TransferModel.java

+package com.example.tdl.entity;
+
+public class TransferModel {
+
+    private Integer id;
+
+    private String transferNo;
+
+    private String transferName;
+
+    private Integer counts;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getTransferNo() {
+        return transferNo;
+    }
+
+    public void setTransferNo(String transferNo) {
+        this.transferNo = transferNo;
+    }
+
+    public String getTransferName() {
+        return transferName;
+    }
+
+    public void setTransferName(String transferName) {
+        this.transferName = transferName;
+    }
+
+    public Integer getCounts() {
+        return counts;
+    }
+
+    public void setCounts(Integer counts) {
+        this.counts = counts;
+    }
+}

src/main/java/com/example/tdl/entity/TransferModelConfig.java

+package com.example.tdl.entity;
+
+public class TransferModelConfig {
+
+    private Integer id;
+
+    private String addressDetail;
+
+    private String lng;
+
+    private String lat;
+
+    private String postCode;
+
+    private Integer sequence;
+
+    private String remark;
+
+    private TransferModel transferModel;
+
+    private City city;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getPostCode() {
+        return postCode;
+    }
+
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
+    }
+
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public TransferModel getTransferModel() {
+        return transferModel;
+    }
+
+    public void setTransferModel(TransferModel transferModel) {
+        this.transferModel = transferModel;
+    }
+
+    public City getCity() {
+        return city;
+    }
+
+    public void setCity(City city) {
+        this.city = city;
+    }
+}

src/main/java/com/example/tdl/entity/UserRoute.java → src/main/java/com/example/tdl/entity/UserAddress.java

 package com.example.tdl.entity;
 
-public class UserRoute {
+public class UserAddress {
     private Integer id;
 
     private String userNumber;
 
     private String name;
 
-    private String country;
+    private String addressDetail;
 
-    private String province;
+    private String log;
 
-    private String city;
+    private String lat;
 
-    private String address;
-
-    private String longitude;
-
-    private String latitude;
+    private String postCode;
 
     private String remark;
 
+    private City city;
+
     public Integer getId() {
         return id;
     }
@@ -45,52 +43,36 @@ public class UserRoute {
         this.name = name;
     }
 
-    public String getCountry() {
-        return country;
-    }
-
-    public void setCountry(String country) {
-        this.country = country;
+    public String getAddressDetail() {
+        return addressDetail;
     }
 
-    public String getProvince() {
-        return province;
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
     }
 
-    public void setProvince(String province) {
-        this.province = province;
+    public String getLog() {
+        return log;
     }
 
-    public String getCity() {
-        return city;
+    public void setLog(String log) {
+        this.log = log;
     }
 
-    public void setCity(String city) {
-        this.city = city;
+    public String getLat() {
+        return lat;
     }
 
-    public String getAddress() {
-        return address;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public String getPostCode() {
+        return postCode;
     }
 
-    public String getLongitude() {
-        return longitude;
-    }
-
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
-    }
-
-    public String getLatitude() {
-        return latitude;
-    }
-
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
     }
 
     public String getRemark() {
@@ -100,4 +82,12 @@ public class UserRoute {
     public void setRemark(String remark) {
         this.remark = remark;
     }
+
+    public City getCity() {
+        return city;
+    }
+
+    public void setCity(City city) {
+        this.city = city;
+    }
 }

src/main/java/com/example/tdl/mapper/CircuitMapper.java

@@ -8,35 +8,35 @@ import java.util.Map;
 
 @Mapper
 public interface CircuitMapper {
-    List<ResultCircuitVo> getAll();
-
-    List<CircuitVo> getDistinct();
-
-    List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo);
-
-    int addCircuit(Map<Object,Object> map);
-
-    int updateCircuit(Map<Object,Object> map);
-
-    int updateEndTime(UpdateCircuitVo updateCircuitVo);
-
-    int delCircuit(String transportationNo);
-
-    ResultCircuitVo getByTransportationNo(String transportation);
-
-    ResultGatewayVo getByNo(String transportationNo);
-
-    Integer getOnRoute();
-
-    Integer getComplted();
-
-    Integer getCount();
-
-    List<CircuitVo> getByTime(String time);
-
-    List<ResultCircuitVo> getByContainerNo(String containerNo);
-
-    int updateEvaluate(UpdateEvaluateVo updateEvaluateVo);
-
-    List<ResultCircuitVo> getByCircuitState(Integer circuitState);
+//    List<ResultCircuitVo> getAll();
+//
+//    List<CircuitVo> getDistinct();
+//
+//    List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo);
+//
+//    int addCircuit(Map<Object,Object> map);
+//
+//    int updateCircuit(Map<Object,Object> map);
+//
+//    int updateEndTime(UpdateCircuitVo updateCircuitVo);
+//
+//    int delCircuit(String transportationNo);
+//
+//    ResultCircuitVo getByTransportationNo(String transportation);
+//
+//    ResultGatewayVo getByNo(String transportationNo);
+//
+//    Integer getOnRoute();
+//
+//    Integer getComplted();
+//
+//    Integer getCount();
+//
+//    List<CircuitVo> getByTime(String time);
+//
+//    List<ResultCircuitVo> getByContainerNo(String containerNo);
+//
+//    int updateEvaluate(UpdateEvaluateVo updateEvaluateVo);
+//
+//    List<ResultCircuitVo> getByCircuitState(Integer circuitState);
 }

src/main/java/com/example/tdl/mapper/RouteMapper.java

@@ -13,19 +13,19 @@ import java.util.Map;
 @Mapper
 public interface RouteMapper {
 
-    List<ResultRouteVo> getAll();
-
-    List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo);
-
-    int addRoute(Map<Object,Object> map);
-
-    int delRoute(String routeNumber);
-
-    int getByRouteNumber(String routeNumber);
-
-    ResultRouteVo getInfoByRouteNumber(String routeNumber);
-
-    ResultRouteVo getInfoByRouteName(String routeName);
+//    List<ResultRouteVo> getAll();
+//
+//    List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo);
+//
+//    int addRoute(Map<Object,Object> map);
+//
+//    int delRoute(String routeNumber);
+//
+//    int getByRouteNumber(String routeNumber);
+//
+//    ResultRouteVo getInfoByRouteNumber(String routeNumber);
+//
+//    ResultRouteVo getInfoByRouteName(String routeName);
 
 //    List<ResultRouteVo> getAllRoute(String time);
 

src/main/java/com/example/tdl/mapper/TDLLogMapper.java

 package com.example.tdl.mapper;
 
-
-import com.example.tdl.domain.vo.ResultGatewayVo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface TDLLogMapper {
 
-    ResultGatewayVo getByNo(String transportationNo);
+//    ResultGatewayVo getByNo(String transportationNo);
 }

src/main/java/com/example/tdl/mapper/UserRouteMapper.java

@@ -11,13 +11,13 @@ import java.util.Map;
 
 @Mapper
 public interface UserRouteMapper {
-    List<ResultUserRouteVo> getByUserNumber(String userNumber);
-
-    int addUserRoute(Map<Object,Object> map);
-
-    int updateUserRoute(Map<Object,Object> map);
-
-    int delUserRoute(@Param("userNumber") String userNumber,@Param("name") String name);
-
-    ResultUserRouteVo getByUserNumberAndName(@Param("userNumber") String userNumber,@Param("name") String name);
+//    List<ResultUserRouteVo> getByUserNumber(String userNumber);
+//
+//    int addUserRoute(Map<Object,Object> map);
+//
+//    int updateUserRoute(Map<Object,Object> map);
+//
+//    int delUserRoute(@Param("userNumber") String userNumber,@Param("name") String name);
+//
+//    ResultUserRouteVo getByUserNumberAndName(@Param("userNumber") String userNumber,@Param("name") String name);
 }

src/main/java/com/example/tdl/mqtt/MqttListener.java

@@ -128,26 +128,26 @@ public class MqttListener implements MqttCallback {
             String[] tmparray = topic.split("/");
             String Type = tmparray[1];
             String SN = tmparray[2];
-            Integer flag = parseData(Message,SN,Type);
+//            Integer flag = parseData(Message,SN,Type);
             String ConfigData;
             Future<String> result = null;
             GWConfigWorker gcconfig = null;
-            if(flag == 0){
-                ConfigCMDVo configCMDVo = new ConfigCMDVo();
-                configCMDVo.setAction("sleep");
-                configCMDVo.setT(System.currentTimeMillis()/1000l);
-                ConfigData = new Gson().toJson(configCMDVo);
-                gcconfig = new GWConfigWorker(Type,SN,ConfigData, false);
-            }else if(flag == 2){
-                ConfigCMDVo configCMDVo = new ConfigCMDVo();
-                configCMDVo.setAction("end");
-                configCMDVo.setT(System.currentTimeMillis()/1000l);
-                ConfigData = new Gson().toJson(configCMDVo);
-                gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
-            }else if(flag == 1){
-                ConfigData = configService.getConfig(SN,Type).getMessage();
-                gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
-            }
+//            if(flag == 0){
+//                ConfigCMDVo configCMDVo = new ConfigCMDVo();
+//                configCMDVo.setAction("sleep");
+//                configCMDVo.setT(System.currentTimeMillis()/1000l);
+//                ConfigData = new Gson().toJson(configCMDVo);
+//                gcconfig = new GWConfigWorker(Type,SN,ConfigData, false);
+//            }else if(flag == 2){
+//                ConfigCMDVo configCMDVo = new ConfigCMDVo();
+//                configCMDVo.setAction("end");
+//                configCMDVo.setT(System.currentTimeMillis()/1000l);
+//                ConfigData = new Gson().toJson(configCMDVo);
+//                gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
+//            }else if(flag == 1){
+////                ConfigData = configService.getConfig(SN,Type).getMessage();
+////                gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
+//            }
 //            String ConfigData ="{\"action\":\"config\"}";
             gcconfig.SetMqttConfig(mqttconfig.getUrl(),mqttconfig.getPort(),
                     mqttconfig.getUsername(), mqttconfig.getPassword(),mqttconfig.getQos(),
@@ -178,29 +178,29 @@ public class MqttListener implements MqttCallback {
     }
 
     //checkIn数据解析,true即发送休眠信息；false发送config信息
-    public Integer parseData(String message,String SN,String Type){
-        CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
-        if(StringUtils.isEmpty(checkInVo.getDevList()==null ? "" :checkInVo.getDevList().toString())){
-            return 1;//重发
-        }
+//    public Integer parseData(String message,String SN,String Type){
+//        CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
+//        if(StringUtils.isEmpty(checkInVo.getDevList()==null ? "" :checkInVo.getDevList().toString())){
+//            return 1;//重发
+//        }
         //有设备信息
-        ConfigVo configVo = configService.getConfig(SN,Type);
-        ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class);
-        if(configVo.getUntie()){
-            //解绑状态
-            return 2;//解绑
-        }
-        //判断两者的devList是否一致
-        if (configCMDVo.getDevList().containsAll(checkInVo.getDevList())
-                && checkInVo.getDevList().containsAll(configCMDVo.getDevList())
-                && checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod())
-                && checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod())
-                && checkInVo.getMode().equals(configCMDVo.getMode())) {
-            //一致
-            return 0;//发送休眠信息
-        } else {
-            //不一致
-            return 1;//重发
-        }
-    }
+//        ConfigVo configVo = configService.getConfig(SN,Type);
+//        ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class);
+//        if(configVo.getUntie()){
+//            //解绑状态
+//            return 2;//解绑
+//        }
+//        //判断两者的devList是否一致
+//        if (configCMDVo.getDevList().containsAll(checkInVo.getDevList())
+//                && checkInVo.getDevList().containsAll(configCMDVo.getDevList())
+//                && checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod())
+//                && checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod())
+//                && checkInVo.getMode().equals(configCMDVo.getMode())) {
+//            //一致
+//            return 0;//发送休眠信息
+//        } else {
+//            //不一致
+//            return 1;//重发
+//        }
+//    }
 }

src/main/java/com/example/tdl/service/CircuitService.java

@@ -12,72 +12,72 @@ import java.util.Map;
 
 @Service
 public class CircuitService {
-    @Autowired
-    private CircuitMapper circuitMapper;
-
-    public List<ResultCircuitVo> getAll(){
-        return circuitMapper.getAll();
-    }
-
-    public List<CircuitVo> getDistinct(){
-        return circuitMapper.getDistinct();
-    }
-
-    public List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo){
-        return circuitMapper.getByTerm(circuitTermVo);
-    }
-
-    public int addCircuit(Map<Object,Object> map){
-        return circuitMapper.addCircuit(map);
-    }
-
-    public int updateCircuit(Map<Object,Object> map){
-        return circuitMapper.updateCircuit(map);
-    }
-
-    public int updateEndTime(UpdateCircuitVo updateCircuitVo){
-        return circuitMapper.updateEndTime(updateCircuitVo);
-    }
-
-    public int delCircuit(String transportationNo){
-        return circuitMapper.delCircuit(transportationNo);
-    }
-
-    public ResultCircuitVo getByTransportationNo(String transportationNo){
-        return circuitMapper.getByTransportationNo(transportationNo);
-    }
-
-    public ResultGatewayVo getByNo(String transportationNo){
-        return circuitMapper.getByNo(transportationNo);
-    }
-
-    public Integer getOnRoute(){
-        return circuitMapper.getOnRoute();
-    }
-
-    public Integer getComplted(){
-        return circuitMapper.getComplted();
-    }
-
-
-    public Integer getCount(){
-        return circuitMapper.getCount();
-    }
-
-    public List<CircuitVo> getByTime(String time){
-        return circuitMapper.getByTime(time);
-    }
-
-    public List<ResultCircuitVo> getByContainerNo(String containerNo){
-        return circuitMapper.getByContainerNo(containerNo);
-    }
-
-    public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){
-        return circuitMapper.updateEvaluate(updateEvaluateVo);
-    }
-
-    public List<ResultCircuitVo> getByCircuitState(Integer circuitState){
-        return circuitMapper.getByCircuitState(circuitState);
-    }
+//    @Autowired
+//    private CircuitMapper circuitMapper;
+//
+//    public List<ResultCircuitVo> getAll(){
+//        return circuitMapper.getAll();
+//    }
+//
+//    public List<CircuitVo> getDistinct(){
+//        return circuitMapper.getDistinct();
+//    }
+//
+//    public List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo){
+//        return circuitMapper.getByTerm(circuitTermVo);
+//    }
+//
+//    public int addCircuit(Map<Object,Object> map){
+//        return circuitMapper.addCircuit(map);
+//    }
+//
+//    public int updateCircuit(Map<Object,Object> map){
+//        return circuitMapper.updateCircuit(map);
+//    }
+//
+//    public int updateEndTime(UpdateCircuitVo updateCircuitVo){
+//        return circuitMapper.updateEndTime(updateCircuitVo);
+//    }
+//
+//    public int delCircuit(String transportationNo){
+//        return circuitMapper.delCircuit(transportationNo);
+//    }
+//
+//    public ResultCircuitVo getByTransportationNo(String transportationNo){
+//        return circuitMapper.getByTransportationNo(transportationNo);
+//    }
+//
+//    public ResultGatewayVo getByNo(String transportationNo){
+//        return circuitMapper.getByNo(transportationNo);
+//    }
+//
+//    public Integer getOnRoute(){
+//        return circuitMapper.getOnRoute();
+//    }
+//
+//    public Integer getComplted(){
+//        return circuitMapper.getComplted();
+//    }
+//
+//
+//    public Integer getCount(){
+//        return circuitMapper.getCount();
+//    }
+//
+//    public List<CircuitVo> getByTime(String time){
+//        return circuitMapper.getByTime(time);
+//    }
+//
+//    public List<ResultCircuitVo> getByContainerNo(String containerNo){
+//        return circuitMapper.getByContainerNo(containerNo);
+//    }
+//
+//    public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){
+//        return circuitMapper.updateEvaluate(updateEvaluateVo);
+//    }
+//
+//    public List<ResultCircuitVo> getByCircuitState(Integer circuitState){
+//        return circuitMapper.getByCircuitState(circuitState);
+//    }
 
 }

src/main/java/com/example/tdl/service/ConfigService.java

@@ -10,40 +10,40 @@ import java.util.Map;
 @Service
 public class ConfigService {
 
-    @Autowired
-    private ConfigMapper configMapper;
-
-    //绑定getway和tdl
-   /* public int addConfig(ConfigVo configVo){
-        return configMapper.addConfig(configVo);
-    }*/
-
-    public int addConfig(Map<Object,Object> map){
-        return configMapper.addConfig(map);
-    }
-
-
-    //获取绑定的数据信息
-    public ConfigVo getConfig(String gSN,String gType){
-        return  configMapper.getConfig(gSN,gType);
-    }
-
-    //绑定成功
-    public int bindiSuccess(String gSN,String gType,Integer resp){
-        return  configMapper.bindiSuccess(gSN,gType,resp);
-    }
-
-    //解绑getWay和tdl
-//    public int updateConfig(String gSN,String gType,Boolean untie ){
-//        return configMapper.updateConfig(gSN,gType,untie);
+//    @Autowired
+//    private ConfigMapper configMapper;
+//
+//    //绑定getway和tdl
+//   /* public int addConfig(ConfigVo configVo){
+//        return configMapper.addConfig(configVo);
+//    }*/
+//
+//    public int addConfig(Map<Object,Object> map){
+//        return configMapper.addConfig(map);
+//    }
+//
+//
+//    //获取绑定的数据信息
+//    public ConfigVo getConfig(String gSN,String gType){
+//        return  configMapper.getConfig(gSN,gType);
+//    }
+//
+//    //绑定成功
+//    public int bindiSuccess(String gSN,String gType,Integer resp){
+//        return  configMapper.bindiSuccess(gSN,gType,resp);
+//    }
+//
+//    //解绑getWay和tdl
+////    public int updateConfig(String gSN,String gType,Boolean untie ){
+////        return configMapper.updateConfig(gSN,gType,untie);
+////    }
+//
+//    public int updateConfig(Map<Object,Object> map ){
+//        return configMapper.updateConfig(map);
+//    }
+//
+//    //解绑成功
+//    public int delConfig(String gSN,String gType){
+//        return configMapper.delConfig(gSN,gType);
 //    }
-
-    public int updateConfig(Map<Object,Object> map ){
-        return configMapper.updateConfig(map);
-    }
-
-    //解绑成功
-    public int delConfig(String gSN,String gType){
-        return configMapper.delConfig(gSN,gType);
-    }
 }

src/main/java/com/example/tdl/service/RouteService.java

@@ -15,36 +15,36 @@ import java.util.Map;
 
 @Service
 public class RouteService {
-    @Autowired
-    private RouteMapper routeMapper;
-
-    public List<ResultRouteVo> getAll(){
-        return routeMapper.getAll();
-    }
-
-    public List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo){
-        return routeMapper.getRouteByTerm(routeTermVo);
-    }
-
-    public int addRoute(Map<Object,Object> map){
-        return routeMapper.addRoute(map);
-    }
-
-    public int delRoute(String routeNumber){
-        return routeMapper.delRoute(routeNumber);
-    }
-
-    public int getByRouteNumber(String routeNumber){
-        return routeMapper.getByRouteNumber(routeNumber);
-    }
-
-    public ResultRouteVo getInfoByRouteNumber(String routeNumber){
-        return routeMapper.getInfoByRouteNumber(routeNumber);
-    }
-
-    public ResultRouteVo getInfoByRouteName(String routeName){
-        return routeMapper.getInfoByRouteName(routeName);
-    }
+//    @Autowired
+//    private RouteMapper routeMapper;
+//
+//    public List<ResultRouteVo> getAll(){
+//        return routeMapper.getAll();
+//    }
+//
+//    public List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo){
+//        return routeMapper.getRouteByTerm(routeTermVo);
+//    }
+//
+//    public int addRoute(Map<Object,Object> map){
+//        return routeMapper.addRoute(map);
+//    }
+//
+//    public int delRoute(String routeNumber){
+//        return routeMapper.delRoute(routeNumber);
+//    }
+//
+//    public int getByRouteNumber(String routeNumber){
+//        return routeMapper.getByRouteNumber(routeNumber);
+//    }
+//
+//    public ResultRouteVo getInfoByRouteNumber(String routeNumber){
+//        return routeMapper.getInfoByRouteNumber(routeNumber);
+//    }
+//
+//    public ResultRouteVo getInfoByRouteName(String routeName){
+//        return routeMapper.getInfoByRouteName(routeName);
+//    }
 
     //    public List<ResultRouteVo> getAllRoute(String time){
 //        return routeMapper.getAllRoute(time);

src/main/java/com/example/tdl/service/TDLLogService.java

@@ -9,11 +9,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TDLLogService {
 
-    @Autowired
-    private TDLLogMapper tdlLogMapper;
-
-    public ResultGatewayVo getByNo(String transportationNo){
-        return  tdlLogMapper.getByNo(transportationNo);
-    }
+//    @Autowired
+//    private TDLLogMapper tdlLogMapper;
+//
+//    public ResultGatewayVo getByNo(String transportationNo){
+//        return  tdlLogMapper.getByNo(transportationNo);
+//    }
 
 }

src/main/java/com/example/tdl/service/UserRouteService.java

@@ -12,26 +12,26 @@ import java.util.Map;
 
 @Service
 public class UserRouteService {
-    @Autowired
-    private UserRouteMapper userRouteMapper;
-
-    public List<ResultUserRouteVo> getByUserNumber(String userNumber){
-        return userRouteMapper.getByUserNumber(userNumber);
-    }
-
-    public int addUserRoute(Map<Object,Object> map){
-        return userRouteMapper.addUserRoute(map);
-    }
-
-    public int updateUserRoute(Map<Object,Object> map){
-        return userRouteMapper.updateUserRoute(map);
-    }
-
-    public int delUserRoute(String userNumber,String name){
-        return userRouteMapper.delUserRoute(userNumber,name);
-    }
-
-    public ResultUserRouteVo getByUserNumberAndName(String userNumber,String name){
-        return userRouteMapper.getByUserNumberAndName(userNumber,name);
-    }
+//    @Autowired
+//    private UserRouteMapper userRouteMapper;
+//
+//    public List<ResultUserRouteVo> getByUserNumber(String userNumber){
+//        return userRouteMapper.getByUserNumber(userNumber);
+//    }
+//
+//    public int addUserRoute(Map<Object,Object> map){
+//        return userRouteMapper.addUserRoute(map);
+//    }
+//
+//    public int updateUserRoute(Map<Object,Object> map){
+//        return userRouteMapper.updateUserRoute(map);
+//    }
+//
+//    public int delUserRoute(String userNumber,String name){
+//        return userRouteMapper.delUserRoute(userNumber,name);
+//    }
+//
+//    public ResultUserRouteVo getByUserNumberAndName(String userNumber,String name){
+//        return userRouteMapper.getByUserNumberAndName(userNumber,name);
+//    }
 }

src/main/java/com/example/tdl/web/AlarmDataController.java

@@ -28,178 +28,178 @@ public class AlarmDataController {
     private CommFeedback fb=new CommFeedback();
 
     private Gson gson=new Gson();
-    @Autowired
-    private CircuitService circuitService;
-
-    @Autowired
-    private InfluxDBTemplate influxDBTemplate;
-
-    @Autowired
-    private TDLDeviceService tdlDeviceService;
-
-    @Autowired
-    private RealRedisService realRedisService;
-
-    private final static String database ="original";
-
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getAlarmCircuit",method = RequestMethod.POST)
-    public Object getAlarmCircuit(@RequestBody String transportationNo){
-//        String transportationNo="CHN20180227G0505";
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=(String)jsonObject.get("transportationNo");
-        ResultGatewayVo resultGatewayVo=circuitService.getByNo(transportationNo);
-        if (resultGatewayVo==null){
-            fb.setCode(0);
-            fb.setMessage("该线路没有绑定网关");
-            return gson.toJson(fb);
-        }
-        Integer circuitState=circuitService.getByTransportationNo(transportationNo).getCircuitState();
-        String device = resultGatewayVo.getType() +"_" +resultGatewayVo.getSN();
-        if(circuitState==0){
-            return null;
-        }else if(circuitState==1){
-            List<String> list=tdlDeviceService.getByGatewaySN(resultGatewayVo.getSN(),resultGatewayVo.getType());
-            String tdl="";
-            if (list.size()==1){
-                tdl="'tdl-"+list.get(0)+"'";
-            }else if(list.size()==0){
-                fb.setCode(0);
-                fb.setMessage("该网关下没有tdl设备");
-                return gson.toJson(fb);
-            }else{
-                for (int a=0;a<list.size();a++){
-                    tdl=tdl+"'tdl-"+list.get(a)+"'";
-                    if (a<list.size()-1){
-                        tdl=tdl+"or \"tdl\"=";
-                    }
-                }
-            }
-            String sql = "SELECT \"b\",\"tdl\" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"= "+tdl;
-            QueryResult queryResult  = influxDBTemplate.query(new Query(sql,database));
-            List<CircuitAlarmVo> circuitAlarmVos=new ArrayList<>();
-            if (queryResult.getResults().get(0).getSeries()!=null){
-                circuitAlarmVos=getAlarmData(queryResult);
-            }
-            String sqls ="";
-            for (int a=0;a<circuitAlarmVos.size();a++){
-                sqls=sqls+"SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time <='"+circuitAlarmVos.get(a).getTime()+"' ORDER BY time desc limit 1;";
-            }
-            QueryResult queryResults  = influxDBTemplate.query(new Query(sqls,database));
-            List<LocationDataVo>  locationDataVos = new ArrayList<>();
-            if (queryResults.getResults().get(0).getSeries()!=null){
-                locationDataVos=getAddress(queryResults);
-            }
-            String sql1="SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" order by time";
-            QueryResult queryResult1  = influxDBTemplate.query(new Query(sql1,database));
-            List<LocationDataVo>  locationDataVos1 = new ArrayList<>();
-            if (queryResult1.getResults().get(0).getSeries()!=null){
-                locationDataVos1=getAllAddress(queryResult1);
-            }
-            for (int a=0;a<locationDataVos1.size();a++){
-                for (int b=0;b<locationDataVos.size();b++){
-                    if (locationDataVos1.get(a).getLng().equals(locationDataVos.get(b).getLng())&&locationDataVos1.get(a).getLat().equals(locationDataVos.get(b).getLat())){
-                        locationDataVos1.get(a).setError(1);
-                    }
-                }
-            }
-            return gson.toJson(locationDataVos1);
-        }else{
-//            Map<Object,Object> map=new HashMap<>();
-//            map.put(device,locationDataVos1);
-//            realRedisService.setHash("CircuitAlarm",map,System.currentTimeMillis());
-            Object o =realRedisService.getHash("CircuitAlarm",device);
-            return gson.toJson(o);
-        }
-
-    }
-
-    public List<LocationDataVo> getAddress(QueryResult queryResult){
-        List<List<Object>> lists=getValue(queryResult);
-        List<LocationDataVo> locationDataVos=new ArrayList<>();
-        for (List<Object> value:lists){
-            LocationDataVo locationDataVo=new LocationDataVo();
-            locationDataVo.setTime(dateToStamp(value.get(0).toString()));
-            locationDataVo.setLng((Double)value.get(1));
-            locationDataVo.setLat((Double)value.get(2));
-            locationDataVos.add(locationDataVo);
-        }
-        return locationDataVos;
-    }
-
-    public List<LocationDataVo> getAllAddress(QueryResult queryResult){
-        List<List<Object>> lists=getValues(queryResult);
-        List<LocationDataVo> locationDataVos=new ArrayList<>();
-        for (List<Object> value:lists){
-            LocationDataVo locationDataVo=new LocationDataVo();
-            locationDataVo.setTime(dateToStamp(value.get(0).toString()));
-            locationDataVo.setLng((Double)value.get(1));
-            locationDataVo.setLat((Double)value.get(2));
-            locationDataVo.setError(0);
-            locationDataVos.add(locationDataVo);
-        }
-        return locationDataVos;
-    }
-
-    public List<CircuitAlarmVo> getAlarmData(QueryResult queryResult){
-        List<List<Object>> lists=getValues(queryResult);
-        List<CircuitAlarmVo> alarmVoList=new ArrayList<>();
-        for (List<Object> value:lists){
-            CircuitAlarmVo circuitAlarmVo=new CircuitAlarmVo();
-            circuitAlarmVo.setTime(value.get(0).toString());
-            circuitAlarmVo.setShockEnergy(value.get(1).toString());
-            circuitAlarmVo.setTdl(value.get(2).toString());
-            alarmVoList.add(circuitAlarmVo);
-        }
-        return alarmVoList;
-    }
-
-    public List<List<Object>> getValues(QueryResult queryResult){
-        List<List<Object>> lists=new ArrayList<>();
-        for (QueryResult.Result result:queryResult.getResults()){
-            if (result.getSeries()!=null){
-                for (QueryResult.Series series:result.getSeries()){
-                    if (series!=null){
-                        lists=series.getValues();
-                    }
-                }
-            }
-        }
-        return lists;
-    }
-
-    public List<List<Object>> getValue(QueryResult queryResult){
-        List<List<Object>> lists=new ArrayList<>();
-        for (QueryResult.Result result:queryResult.getResults()){
-            if (result.getSeries()!=null){
-                for (int a=0;a<result.getSeries().size();a++){
-                    lists.add(result.getSeries().get(a).getValues().get(0));
-                }
-            }
-        }
-        return lists;
-    }
-
-    public String dateToStamp(String time){
-        String res;
-        Date date=null;
-        try {
-            if (time.length()!=20){
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-                date = simpleDateFormat.parse(time);
-            }else{
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-                date=simpleDateFormat.parse(time);
-            }
-            long ts = date.getTime()*1000000;
-            res = String.valueOf(ts);
-        }catch (Exception e){
-            fb.setCode(0);
-            fb.setMessage("时间转换出错");
-            return gson.toJson(fb);
-        }
-        return res;
-    }
+//    @Autowired
+//    private CircuitService circuitService;
+//
+//    @Autowired
+//    private InfluxDBTemplate influxDBTemplate;
+//
+//    @Autowired
+//    private TDLDeviceService tdlDeviceService;
+//
+//    @Autowired
+//    private RealRedisService realRedisService;
+//
+//    private final static String database ="original";
+//
+//    @ApiImplicitParams({
+//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getAlarmCircuit",method = RequestMethod.POST)
+//    public Object getAlarmCircuit(@RequestBody String transportationNo){
+////        String transportationNo="CHN20180227G0505";
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=(String)jsonObject.get("transportationNo");
+//        ResultGatewayVo resultGatewayVo=circuitService.getByNo(transportationNo);
+//        if (resultGatewayVo==null){
+//            fb.setCode(0);
+//            fb.setMessage("该线路没有绑定网关");
+//            return gson.toJson(fb);
+//        }
+//        Integer circuitState=circuitService.getByTransportationNo(transportationNo).getCircuitState();
+//        String device = resultGatewayVo.getType() +"_" +resultGatewayVo.getSN();
+//        if(circuitState==0){
+//            return null;
+//        }else if(circuitState==1){
+//            List<String> list=tdlDeviceService.getByGatewaySN(resultGatewayVo.getSN(),resultGatewayVo.getType());
+//            String tdl="";
+//            if (list.size()==1){
+//                tdl="'tdl-"+list.get(0)+"'";
+//            }else if(list.size()==0){
+//                fb.setCode(0);
+//                fb.setMessage("该网关下没有tdl设备");
+//                return gson.toJson(fb);
+//            }else{
+//                for (int a=0;a<list.size();a++){
+//                    tdl=tdl+"'tdl-"+list.get(a)+"'";
+//                    if (a<list.size()-1){
+//                        tdl=tdl+"or \"tdl\"=";
+//                    }
+//                }
+//            }
+//            String sql = "SELECT \"b\",\"tdl\" FROM \"tdl_policy\".\""+device+"\" where \"tdl\"= "+tdl;
+//            QueryResult queryResult  = influxDBTemplate.query(new Query(sql,database));
+//            List<CircuitAlarmVo> circuitAlarmVos=new ArrayList<>();
+//            if (queryResult.getResults().get(0).getSeries()!=null){
+//                circuitAlarmVos=getAlarmData(queryResult);
+//            }
+//            String sqls ="";
+//            for (int a=0;a<circuitAlarmVos.size();a++){
+//                sqls=sqls+"SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time <='"+circuitAlarmVos.get(a).getTime()+"' ORDER BY time desc limit 1;";
+//            }
+//            QueryResult queryResults  = influxDBTemplate.query(new Query(sqls,database));
+//            List<LocationDataVo>  locationDataVos = new ArrayList<>();
+//            if (queryResults.getResults().get(0).getSeries()!=null){
+//                locationDataVos=getAddress(queryResults);
+//            }
+//            String sql1="SELECT \"time\",\"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" order by time";
+//            QueryResult queryResult1  = influxDBTemplate.query(new Query(sql1,database));
+//            List<LocationDataVo>  locationDataVos1 = new ArrayList<>();
+//            if (queryResult1.getResults().get(0).getSeries()!=null){
+//                locationDataVos1=getAllAddress(queryResult1);
+//            }
+//            for (int a=0;a<locationDataVos1.size();a++){
+//                for (int b=0;b<locationDataVos.size();b++){
+//                    if (locationDataVos1.get(a).getLng().equals(locationDataVos.get(b).getLng())&&locationDataVos1.get(a).getLat().equals(locationDataVos.get(b).getLat())){
+//                        locationDataVos1.get(a).setError(1);
+//                    }
+//                }
+//            }
+//            return gson.toJson(locationDataVos1);
+//        }else{
+////            Map<Object,Object> map=new HashMap<>();
+////            map.put(device,locationDataVos1);
+////            realRedisService.setHash("CircuitAlarm",map,System.currentTimeMillis());
+//            Object o =realRedisService.getHash("CircuitAlarm",device);
+//            return gson.toJson(o);
+//        }
+//
+//    }
+//
+//    public List<LocationDataVo> getAddress(QueryResult queryResult){
+//        List<List<Object>> lists=getValue(queryResult);
+//        List<LocationDataVo> locationDataVos=new ArrayList<>();
+//        for (List<Object> value:lists){
+//            LocationDataVo locationDataVo=new LocationDataVo();
+//            locationDataVo.setTime(dateToStamp(value.get(0).toString()));
+//            locationDataVo.setLng((Double)value.get(1));
+//            locationDataVo.setLat((Double)value.get(2));
+//            locationDataVos.add(locationDataVo);
+//        }
+//        return locationDataVos;
+//    }
+//
+//    public List<LocationDataVo> getAllAddress(QueryResult queryResult){
+//        List<List<Object>> lists=getValues(queryResult);
+//        List<LocationDataVo> locationDataVos=new ArrayList<>();
+//        for (List<Object> value:lists){
+//            LocationDataVo locationDataVo=new LocationDataVo();
+//            locationDataVo.setTime(dateToStamp(value.get(0).toString()));
+//            locationDataVo.setLng((Double)value.get(1));
+//            locationDataVo.setLat((Double)value.get(2));
+//            locationDataVo.setError(0);
+//            locationDataVos.add(locationDataVo);
+//        }
+//        return locationDataVos;
+//    }
+//
+//    public List<CircuitAlarmVo> getAlarmData(QueryResult queryResult){
+//        List<List<Object>> lists=getValues(queryResult);
+//        List<CircuitAlarmVo> alarmVoList=new ArrayList<>();
+//        for (List<Object> value:lists){
+//            CircuitAlarmVo circuitAlarmVo=new CircuitAlarmVo();
+//            circuitAlarmVo.setTime(value.get(0).toString());
+//            circuitAlarmVo.setShockEnergy(value.get(1).toString());
+//            circuitAlarmVo.setTdl(value.get(2).toString());
+//            alarmVoList.add(circuitAlarmVo);
+//        }
+//        return alarmVoList;
+//    }
+//
+//    public List<List<Object>> getValues(QueryResult queryResult){
+//        List<List<Object>> lists=new ArrayList<>();
+//        for (QueryResult.Result result:queryResult.getResults()){
+//            if (result.getSeries()!=null){
+//                for (QueryResult.Series series:result.getSeries()){
+//                    if (series!=null){
+//                        lists=series.getValues();
+//                    }
+//                }
+//            }
+//        }
+//        return lists;
+//    }
+//
+//    public List<List<Object>> getValue(QueryResult queryResult){
+//        List<List<Object>> lists=new ArrayList<>();
+//        for (QueryResult.Result result:queryResult.getResults()){
+//            if (result.getSeries()!=null){
+//                for (int a=0;a<result.getSeries().size();a++){
+//                    lists.add(result.getSeries().get(a).getValues().get(0));
+//                }
+//            }
+//        }
+//        return lists;
+//    }
+//
+//    public String dateToStamp(String time){
+//        String res;
+//        Date date=null;
+//        try {
+//            if (time.length()!=20){
+//                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+//                date = simpleDateFormat.parse(time);
+//            }else{
+//                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+//                date=simpleDateFormat.parse(time);
+//            }
+//            long ts = date.getTime()*1000000;
+//            res = String.valueOf(ts);
+//        }catch (Exception e){
+//            fb.setCode(0);
+//            fb.setMessage("时间转换出错");
+//            return gson.toJson(fb);
+//        }
+//        return res;
+//    }
 }
\ No newline at end of file

src/main/java/com/example/tdl/web/CircuitController.java

@@ -36,754 +36,754 @@ public class CircuitController {
 
     Gson gson=new Gson();
 
-    @Autowired
-    private CircuitService circuitService;
-
-    @Autowired
-    private RouteService routeService;
-
-    @Autowired
-    private TokenRedisService tokenRedisService;
-
-
-    //获取线路信息
-    @ApiOperation(value = "获取线路信息",notes = "获取线路信息，返回值说明：" +
-            "   transportationNo:运输编号," +
-            "   routeNumber:路由编号," +
-            "   routeName:路由名" +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startCity:起运城市," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endCity:目的城市," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   transport:运输方式," +
-            "   alarmType:预警类型," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型" +
-            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
-            "   remark:备注," +
-            "   createTime:创建线路时间" +
-            "   evaluate:评分，" +
-            "   evaluateRemark:评分备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getAll",method = RequestMethod.GET)
-    public Object getAll(){
-        return circuitService.getAll();
-    }
-
-    //根据条件查询
-    @ApiOperation(value = "根据条件查询",notes = "根据条件查询:" +
-            "   transportationNo:运输编号," +
-            "   routeNumber:路由编号," +
-            "   alarmType:预警情况（正常传0，预警传1）" +
-            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
-            "   startCity:起运城市," +
-            "   endCity:目的城市," +
-            "   startTimeMin:起运时间的最小值," +
-            "   startTimeMax:起运时间的最大值," +
-            "   endTimeMin:到达时间的最小值," +
-            "   endTimeMax:到达时间的最大值。" +
-            "返回值说明：" +
-            "   transportationNo:运输编号," +
-            "   routeNumber:路由编号," +
-            "   routeName:路由名" +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startCity:起运城市," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endCity:目的城市," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   transport:运输方式," +
-            "   alarmType:预警类型," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型" +
-            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
-            "   remark:备注," +
-            "   createTime:创建线路时间," +
-            "   evaluate:评分，" +
-            "   evaluateRemark:评分备注")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getByTerm",method = RequestMethod.POST)
-    public Object getByTerm(@RequestBody CircuitTermVo circuitTermVo){
-        if(circuitTermVo.getStartTimeMin()!=null&&circuitTermVo.getStartTimeMax()==null){
-            fb.setCode(0);
-            fb.setMessage("起运时间的最大值不能为空");
-            return gson.toJson(fb);
-        }
-        if(circuitTermVo.getEndTimeMin()!=null&&circuitTermVo.getEndTimeMax()==null){
-            fb.setCode(0);
-            fb.setMessage("到达时间的最大值不能为空");
-            return gson.toJson(fb);
-        }
-        return circuitService.getByTerm(circuitTermVo);
-    }
-
-    //添加线路信息
-    @ApiOperation(value = "添加线路信息",notes = "添加线路信息，如果是选择一条之前的已经建立的线路，" +
-            "则只用传routeNumber,startLongitude,startLatitude,startAddress,startTime,endLongitude,endLatitude,endAddress,endTime,boxNo,containerNo,deliveryAddress,transportationType,remark," +
-            "如果是新建线路，则除了routeNumber都要传，传值说明：" +
-            "   routeNumber:路由编号," +
-            "   startCountry:起运国," +
-            "   startProvince:起运省," +
-            "   startCity:起运市," +
-            "   endCountry:目的国," +
-            "   endProvince:目的省," +
-            "   endCity:目的市," +
-            "   transport:运输方式," +
-            "   createTime:创建时间," +
-            "   updateTime:修改时间," +
-            "   rRemark:路由备注," +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型," +
-            "   remark:备注")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/addCircuit",method = RequestMethod.POST)
-    public Object addCircuit(@RequestBody AddCircuitVo addCircuitVo){
-        if(StringUtils.isEmpty(addCircuitVo.getStartCountry())){
-            fb.setCode(0);
-            fb.setMessage("起运国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getStartCity())){
-            fb.setCode(0);
-            fb.setMessage("起运市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getEndCountry())){
-            fb.setCode(0);
-            fb.setMessage("目的国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getEndCity())){
-            fb.setCode(0);
-            fb.setMessage("目的市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getTransport())){
-            fb.setCode(0);
-            fb.setMessage("运输方式不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getStartLongitude())){
-            fb.setCode(0);
-            fb.setMessage("起运经度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getStartLatitude())){
-            fb.setCode(0);
-            fb.setMessage("起运纬度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getStartAddress())){
-            fb.setCode(0);
-            fb.setMessage("起运具体地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getEndLongitude())){
-            fb.setCode(0);
-            fb.setMessage("目的经度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getEndLatitude())){
-            fb.setCode(0);
-            fb.setMessage("目的纬度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getEndAddress())){
-            fb.setCode(0);
-            fb.setMessage("目的具体地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getBoxNo())){
-            fb.setCode(0);
-            fb.setMessage("箱单号不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getContainerNo())){
-            fb.setCode(0);
-            fb.setMessage("集装箱号/车牌号不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getDeliveryAddress())){
-            fb.setCode(0);
-            fb.setMessage("交付地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addCircuitVo.getTransportationType())){
-            fb.setCode(0);
-            fb.setMessage("运输类型不能为空");
-            return gson.toJson(fb);
-        }
-        if(!addCircuitVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!addCircuitVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if(!addCircuitVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!addCircuitVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if (!addCircuitVo.getTransport().equals("铁路")&&
-                !addCircuitVo.getTransport().equals("汽运")&&
-                !addCircuitVo.getTransport().equals("海运")&&
-                !addCircuitVo.getTransport().equals("空运")&&
-                !addCircuitVo.getTransport().equals("快递")){
-            fb.setCode(0);
-            fb.setMessage("请选择正确的运输方式");
-            return gson.toJson(fb);
-        }
-        if (!addCircuitVo.getDeliveryAddress().equals("港口")&&
-                !addCircuitVo.getDeliveryAddress().equals("仓库")&&
-                !addCircuitVo.getDeliveryAddress().equals("站点")){
-            fb.setCode(0);
-            fb.setMessage("请输入正确的交付地址");
-            return gson.toJson(fb);
-        }
-        if (!addCircuitVo.getTransportationType().equals("本地运输")&&
-                !addCircuitVo.getTransportationType().equals("国际运输")){
-            fb.setCode(0);
-            fb.setMessage("请输入正确的运输类型");
-            return gson.toJson(fb);
-        }
-        Date day=new Date();
-        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
-        Map<Object,Object> map=new HashMap<>();
-        map.put("startCountry",addCircuitVo.getStartCountry());
-        map.put("startProvince",addCircuitVo.getStartProvince());
-        map.put("startCity",addCircuitVo.getStartCity());
-        map.put("endCountry",addCircuitVo.getEndCountry());
-        map.put("endProvince",addCircuitVo.getEndProvince());
-        map.put("endCity",addCircuitVo.getEndCity());
-        map.put("transport",addCircuitVo.getTransport());
-        map.put("createTime",System.currentTimeMillis());
-        map.put("updateTime",System.currentTimeMillis());
-        map.put("rRemark",addCircuitVo.getrRemark());
-        map.put("startLongitude",addCircuitVo.getStartLongitude());
-        map.put("startLatitude",addCircuitVo.getStartLatitude());
-        map.put("startAddress",addCircuitVo.getStartAddress());
-        map.put("startTime",System.currentTimeMillis());
-        map.put("endLongitude",addCircuitVo.getEndLongitude());
-        map.put("endLatitude",addCircuitVo.getEndLatitude());
-        map.put("endAddress",addCircuitVo.getEndAddress());
-        map.put("endTime",0);
-        map.put("boxNo",addCircuitVo.getBoxNo());
-        map.put("containerNo",addCircuitVo.getContainerNo());
-        map.put("deliveryAddress",addCircuitVo.getDeliveryAddress());
-        map.put("transportationType",addCircuitVo.getTransportationType());
-        map.put("remark",addCircuitVo.getRemark());
-        String transportationNo = "";
-        if (addCircuitVo.getTransportationType().equals("国际运输")){
-            transportationNo="HUN"+df.format(day);
-        }
-        if (addCircuitVo.getTransportationType().equals("本地运输")){
-            transportationNo="CHN"+df.format(day);
-        }
-        String routeNumber="RT"+df.format(day);
-        String routeName=addCircuitVo.getStartCountry()+addCircuitVo.getStartCity()+"_"+addCircuitVo.getEndCountry()+addCircuitVo.getEndCity();
-        if (addCircuitVo.getTransport().equals("汽运")){
-            routeName=routeName+"_汽运";
-            routeNumber=routeNumber+"G";
-            transportationNo=transportationNo+"G";
-        }
-        if (addCircuitVo.getTransport().equals("铁路")){
-            routeName=routeName+"_铁路";
-            routeNumber=routeNumber+"T";
-            transportationNo=transportationNo+"T";
-        }
-        if (addCircuitVo.getTransport().equals("空运")){
-            routeName=routeName+"_空运";
-            routeNumber=routeNumber+"K";
-            transportationNo=transportationNo+"K";
-        }
-        if (addCircuitVo.getTransport().equals("快递")){
-            routeName=routeName+"_快递";
-            routeNumber=routeNumber+"D";
-            transportationNo=transportationNo+"D";
-        }
-        if (addCircuitVo.getTransport().equals("海运")){
-            routeName=routeName+"_海运";
-            routeNumber=routeNumber+"H";
-            transportationNo=transportationNo+"H";
-        }
-        routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
-        if (routeService.getByRouteNumber(routeNumber)>0){
-            while (routeService.getByRouteNumber(routeNumber)>0){
-                routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
-            }
-        }
-        transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
-        if (circuitService.getByTransportationNo(transportationNo)!=null){
-            while (routeService.getByRouteNumber(transportationNo)>0){
-                transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
-            }
-        }
-        map.put("routeName",routeName);
-        map.put("routeNumber",routeNumber);
-        map.put("transportationNo",transportationNo);
-        circuitService.addCircuit(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("添加线路成功")){
-            fb.setCode(1);
-            fb.setMessage("添加线路成功");
-        }else {
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    //修改线路结束时间
-    @ApiOperation(value = "修改线路结束时间",notes = "修改线路结束时间，传值说明：" +
-            "   transportationNo:运输编号," +
-            "   endTime:目的时间 " )
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/updateEndTime",method = RequestMethod.POST)
-    public Object updateEndTime(@RequestBody UpdateCircuitVo updateCircuitVo){
-        if (StringUtils.isEmpty(updateCircuitVo.getTransportationNo())){
-            fb.setCode(0);
-            fb.setMessage("需要修改的运输编号不能为空");
-            return gson.toJson(fb);
-        }
-        if (updateCircuitVo.getEndTime()==null){
-            fb.setCode(0);
-            fb.setMessage("线路结束时间不能为空");
-            return gson.toJson(fb);
-        }
-        if (circuitService.getByTransportationNo(updateCircuitVo.getTransportationNo()).getCircuitState()!=2){
-            fb.setCode(0);
-            fb.setMessage("线路未完成");
-            return gson.toJson(fb);
-        }
-        int a = circuitService.updateEndTime(updateCircuitVo);
-        if (a>0){
-            fb.setCode(1);
-            fb.setMessage("修改线路结束时间成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage("修改线路结束时间失败");
-        }
-        return gson.toJson(fb);
-    }
-
-    //修改线路信息
-    @ApiOperation(value = "修改线路信息",notes = "修改线路信息，传值说明：" +
-            "   transportationNo:需要修改的运输编号," +
-            "   routeNumber:修改之后的路由编号（如果没有就是空）," +
-            "   startCountry:起运国," +
-            "   startProvince:起运省," +
-            "   startCity:起运市," +
-            "   endCountry:目的国," +
-            "   endProvince:目的省," +
-            "   endCity:目的市," +
-            "   transport:运输方式," +
-            "   createTime:创建时间," +
-            "   updateTime:修改时间," +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型," +
-            "   remark:备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/updateCircuit",method = RequestMethod.POST)
-    public Object updateCircuit(@RequestBody UpdateCircuitInfo updateCircuitInfo){
-        if (StringUtils.isEmpty(updateCircuitInfo.getTransportationNo())){
-            fb.setCode(0);
-            fb.setMessage("需要修改的运输编号不能为空");
-            return gson.toJson(fb);
-        }
-        if(StringUtils.isEmpty(updateCircuitInfo.getStartCountry())){
-            fb.setCode(0);
-            fb.setMessage("起运国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getStartCity())){
-            fb.setCode(0);
-            fb.setMessage("起运市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getEndCountry())){
-            fb.setCode(0);
-            fb.setMessage("目的国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getEndCity())){
-            fb.setCode(0);
-            fb.setMessage("目的市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getTransport())){
-            fb.setCode(0);
-            fb.setMessage("运输方式不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getStartLongitude())){
-            fb.setCode(0);
-            fb.setMessage("起运经度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getStartLatitude())){
-            fb.setCode(0);
-            fb.setMessage("起运纬度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getStartAddress())){
-            fb.setCode(0);
-            fb.setMessage("起运具体地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getEndLongitude())){
-            fb.setCode(0);
-            fb.setMessage("目的经度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getEndLatitude())){
-            fb.setCode(0);
-            fb.setMessage("目的纬度不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getEndAddress())){
-            fb.setCode(0);
-            fb.setMessage("目的具体地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getBoxNo())){
-            fb.setCode(0);
-            fb.setMessage("箱单号不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getContainerNo())){
-            fb.setCode(0);
-            fb.setMessage("集装箱号/车牌号不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getDeliveryAddress())){
-            fb.setCode(0);
-            fb.setMessage("交付地址不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateCircuitInfo.getTransportationType())){
-            fb.setCode(0);
-            fb.setMessage("运输类型不能为空");
-            return gson.toJson(fb);
-        }
-        if(!updateCircuitInfo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!updateCircuitInfo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if(!updateCircuitInfo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!updateCircuitInfo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if (!updateCircuitInfo.getTransport().equals("铁路")&&
-                !updateCircuitInfo.getTransport().equals("汽运")&&
-                !updateCircuitInfo.getTransport().equals("海运")&&
-                !updateCircuitInfo.getTransport().equals("空运")&&
-                !updateCircuitInfo.getTransport().equals("快递")){
-            fb.setCode(0);
-            fb.setMessage("请选择正确的运输方式");
-            return gson.toJson(fb);
-        }
-        if (!updateCircuitInfo.getDeliveryAddress().equals("港口")&&
-                !updateCircuitInfo.getDeliveryAddress().equals("仓库")&&
-                !updateCircuitInfo.getDeliveryAddress().equals("站点")){
-            fb.setCode(0);
-            fb.setMessage("请输入正确的交付地址");
-            return gson.toJson(fb);
-        }
-        if (!updateCircuitInfo.getTransportationType().equals("本地运输")&&
-                !updateCircuitInfo.getTransportationType().equals("国际运输")){
-            fb.setCode(0);
-            fb.setMessage("请输入正确的运输类型");
-            return gson.toJson(fb);
-        }
-        if(circuitService.getByTransportationNo(updateCircuitInfo.getTransportationNo()).getCircuitState()!=0){
-            fb.setCode(0);
-            fb.setMessage("线路只能在未开始运输时才能修改");
-            return gson.toJson(fb);
-        }
-        String routeNumber="";
-        Date day=new Date();
-        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
-        Map<Object,Object> map=new HashMap<>();
-        map.put("routeNumber",updateCircuitInfo.getRouteNumber());
-        map.put("startCountry",updateCircuitInfo.getStartCountry());
-        map.put("startProvince",updateCircuitInfo.getStartProvince());
-        map.put("startCity",updateCircuitInfo.getStartCity());
-        map.put("endCountry",updateCircuitInfo.getEndCountry());
-        map.put("endProvince",updateCircuitInfo.getEndProvince());
-        map.put("endCity",updateCircuitInfo.getEndCity());
-        map.put("transport",updateCircuitInfo.getTransport());
-        map.put("createTime",System.currentTimeMillis());
-        map.put("updateTime",System.currentTimeMillis());
-        map.put("transportationNo",updateCircuitInfo.getTransportationNo());
-        map.put("startLongitude",updateCircuitInfo.getStartLongitude());
-        map.put("startLatitude",updateCircuitInfo.getStartLatitude());
-        map.put("startAddress",updateCircuitInfo.getStartAddress());
-        map.put("startTime",System.currentTimeMillis());
-        map.put("endLongitude",updateCircuitInfo.getEndLongitude());
-        map.put("endLatitude",updateCircuitInfo.getEndLatitude());
-        map.put("endAddress",updateCircuitInfo.getEndAddress());
-        map.put("endTime",0);
-        map.put("boxNo",updateCircuitInfo.getBoxNo());
-        map.put("containerNo",updateCircuitInfo.getContainerNo());
-        map.put("deliveryAddress",updateCircuitInfo.getDeliveryAddress());
-        map.put("transportationType",updateCircuitInfo.getTransportationType());
-        map.put("remark",updateCircuitInfo.getRemark());
-        if (StringUtils.isEmpty(updateCircuitInfo.getRouteNumber())){
-            routeNumber="RT"+df.format(day);
-            String routeName=updateCircuitInfo.getStartCountry()+updateCircuitInfo.getStartCity()+"_"+updateCircuitInfo.getEndCountry()+updateCircuitInfo.getEndCity();
-            if (updateCircuitInfo.getTransport().equals("汽运")){
-                routeName=routeName+"_汽运";
-                routeNumber=routeNumber+"G";
-            }
-            if (updateCircuitInfo.getTransport().equals("铁路")){
-                routeName=routeName+"_铁路";
-                routeNumber=routeNumber+"T";
-            }
-            if (updateCircuitInfo.getTransport().equals("空运")){
-                routeName=routeName+"_空运";
-                routeNumber=routeNumber+"K";
-            }
-            if (updateCircuitInfo.getTransport().equals("快递")){
-                routeName=routeName+"_快递";
-                routeNumber=routeNumber+"D";
-            }
-            if (updateCircuitInfo.getTransport().equals("海运")){
-                routeName=routeName+"_海运";
-                routeNumber=routeNumber+"H";
-            }
-            routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
-            if (routeService.getByRouteNumber(routeNumber)>0){
-                while (routeService.getByRouteNumber(routeNumber)>0){
-                    routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
-                }
-            }
-            map.put("routeName",routeName);
-            map.put("routeNumber",routeNumber);
-        }
-        circuitService.updateCircuit(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("修改线路成功")){
-            fb.setCode(1);
-            fb.setMessage("修改线路成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    //删除线路
-    @ApiOperation(value = "删除线路",notes = "删除线路，传值说明：" +
-            "   transportationNo:运输编号" )
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/delCircuit",method = RequestMethod.POST)
-    public Object delCircuit(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=(String)jsonObject.get("transportationNo");
-        if (StringUtils.isEmpty(transportationNo)){
-            fb.setCode(0);
-            fb.setMessage("需要删除的运输编号不能为空");
-            return gson.toJson(fb);
-        }
-        if (circuitService.getByTransportationNo(transportationNo).getCircuitState()==1){
-            fb.setCode(0);
-            fb.setMessage("线路运输中不能删除");
-            return gson.toJson(fb);
-        }
-        int a = circuitService.delCircuit(transportationNo);
-        if (a>0){
-            fb.setCode(1);
-            fb.setMessage("删除线路成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage("删除线路失败");
-        }
-        return gson.toJson(fb);
-    }
-
-    //根据车牌号查线路
-    @ApiOperation(value = "获取线路信息",notes = "获取线路信息，返回值说明：" +
-            "   transportationNo:运输编号," +
-            "   routeNumber:路由编号," +
-            "   routeName:路由名" +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startCity:起运城市," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endCity:目的城市," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   transport:运输方式," +
-            "   alarmType:预警类型," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型" +
-            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
-            "   remark:备注," +
-            "   createTime:创建线路时间" +
-            "   evaluate:评分，" +
-            "   evaluateRemark:评分备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getByContainerNo",method = RequestMethod.POST)
-    public Object getByContainerNo(@RequestBody String containerNo){
-        JSONObject jsonObject=JSON.parseObject(containerNo);
-        containerNo=(String)jsonObject.get("containerNo");
-        return circuitService.getByContainerNo(containerNo);
-    }
-
-    //评价
-    @ApiOperation(value = "评价",notes = "评价线路传值说明：" +
-            "   transportationNo:运输编号," +
-            "   evaluate:评分，" +
-            "   evaluateRemark:评分备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/updateEvaluate",method = RequestMethod.POST)
-    public Object updateEvaluate(@RequestBody UpdateEvaluateVo updateEvaluateVo){
-        if (updateEvaluateVo.getEvaluate()==null){
-            fb.setCode(0);
-            fb.setMessage("评价的等级不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateEvaluateVo.getTransportationNo())){
-            fb.setCode(0);
-            fb.setMessage("需要评价的线路编号不能为空");
-            return gson.toJson(fb);
-        }
-        if (circuitService.getByTransportationNo(updateEvaluateVo.getTransportationNo()).getCircuitState()!=2){
-            fb.setCode(0);
-            fb.setMessage("线路完成运输才能评价");
-            return gson.toJson(fb);
-        }
-        if (circuitService.getByTransportationNo(updateEvaluateVo.getTransportationNo()).getEvaluate()!=null){
-            fb.setCode(0);
-            fb.setMessage("该线路已经被评价");
-            return gson.toJson(fb);
-        }
-        int a = circuitService.updateEvaluate(updateEvaluateVo);
-        if (a>0){
-            fb.setCode(1);
-            fb.setMessage("评价成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage("评价失败");
-        }
-        return gson.toJson(fb);
-    }
-
-    //根据运输状态查询线路信息
-    @ApiOperation(value = "根据运输状态查询线路信息",notes = "根据运输状态查询线路信息，传值说明：{\"circuitState\":2}  ,circuitState:线路状态（0未开始，1运输中，2完成），返回值说明：" +
-            "   transportationNo:运输编号," +
-            "   routeNumber:路由编号," +
-            "   routeName:路由名" +
-            "   startLongitude:起运经度," +
-            "   startLatitude:起运纬度," +
-            "   startCity:起运城市," +
-            "   startAddress:起运具体地址," +
-            "   startTime:起运时间," +
-            "   endLongitude:目的经度," +
-            "   endLatitude:目的纬度," +
-            "   endCity:目的城市," +
-            "   endAddress:目的具体地址," +
-            "   endTime:目的时间," +
-            "   transport:运输方式," +
-            "   alarmType:预警类型," +
-            "   boxNo:箱单号," +
-            "   containerNo:集装箱号," +
-            "   deliveryAddress:交付地址," +
-            "   transportationType:运输类型" +
-            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
-            "   remark:备注," +
-            "   createTime:创建线路时间" +
-            "   evaluate:评分，" +
-            "   evaluateRemark:评分备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getByCircuitState",method = RequestMethod.POST)
-    public Object getByCircuitState(@RequestBody Map map){
-        if (!map.containsKey("circuitState")){
-            fb.setCode(0);
-            fb.setMessage("需要查询的线路状态不能为空");
-            return gson.toJson(fb);
-        }
-        return circuitService.getByCircuitState(Integer.valueOf(map.get("circuitState").toString()));
-    }
+//    @Autowired
+//    private CircuitService circuitService;
+//
+//    @Autowired
+//    private RouteService routeService;
+//
+//    @Autowired
+//    private TokenRedisService tokenRedisService;
+//
+//
+//    //获取线路信息
+//    @ApiOperation(value = "获取线路信息",notes = "获取线路信息，返回值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   routeNumber:路由编号," +
+//            "   routeName:路由名" +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startCity:起运城市," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endCity:目的城市," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   transport:运输方式," +
+//            "   alarmType:预警类型," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型" +
+//            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
+//            "   remark:备注," +
+//            "   createTime:创建线路时间" +
+//            "   evaluate:评分，" +
+//            "   evaluateRemark:评分备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getAll",method = RequestMethod.GET)
+//    public Object getAll(){
+//        return circuitService.getAll();
+//    }
+//
+//    //根据条件查询
+//    @ApiOperation(value = "根据条件查询",notes = "根据条件查询:" +
+//            "   transportationNo:运输编号," +
+//            "   routeNumber:路由编号," +
+//            "   alarmType:预警情况（正常传0，预警传1）" +
+//            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
+//            "   startCity:起运城市," +
+//            "   endCity:目的城市," +
+//            "   startTimeMin:起运时间的最小值," +
+//            "   startTimeMax:起运时间的最大值," +
+//            "   endTimeMin:到达时间的最小值," +
+//            "   endTimeMax:到达时间的最大值。" +
+//            "返回值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   routeNumber:路由编号," +
+//            "   routeName:路由名" +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startCity:起运城市," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endCity:目的城市," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   transport:运输方式," +
+//            "   alarmType:预警类型," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型" +
+//            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
+//            "   remark:备注," +
+//            "   createTime:创建线路时间," +
+//            "   evaluate:评分，" +
+//            "   evaluateRemark:评分备注")
+//    @ApiImplicitParams({
+//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getByTerm",method = RequestMethod.POST)
+//    public Object getByTerm(@RequestBody CircuitTermVo circuitTermVo){
+//        if(circuitTermVo.getStartTimeMin()!=null&&circuitTermVo.getStartTimeMax()==null){
+//            fb.setCode(0);
+//            fb.setMessage("起运时间的最大值不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(circuitTermVo.getEndTimeMin()!=null&&circuitTermVo.getEndTimeMax()==null){
+//            fb.setCode(0);
+//            fb.setMessage("到达时间的最大值不能为空");
+//            return gson.toJson(fb);
+//        }
+//        return circuitService.getByTerm(circuitTermVo);
+//    }
+//
+//    //添加线路信息
+//    @ApiOperation(value = "添加线路信息",notes = "添加线路信息，如果是选择一条之前的已经建立的线路，" +
+//            "则只用传routeNumber,startLongitude,startLatitude,startAddress,startTime,endLongitude,endLatitude,endAddress,endTime,boxNo,containerNo,deliveryAddress,transportationType,remark," +
+//            "如果是新建线路，则除了routeNumber都要传，传值说明：" +
+//            "   routeNumber:路由编号," +
+//            "   startCountry:起运国," +
+//            "   startProvince:起运省," +
+//            "   startCity:起运市," +
+//            "   endCountry:目的国," +
+//            "   endProvince:目的省," +
+//            "   endCity:目的市," +
+//            "   transport:运输方式," +
+//            "   createTime:创建时间," +
+//            "   updateTime:修改时间," +
+//            "   rRemark:路由备注," +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型," +
+//            "   remark:备注")
+//    @ApiImplicitParams({
+//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/addCircuit",method = RequestMethod.POST)
+//    public Object addCircuit(@RequestBody AddCircuitVo addCircuitVo){
+//        if(StringUtils.isEmpty(addCircuitVo.getStartCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("起运国不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getStartCity())){
+//            fb.setCode(0);
+//            fb.setMessage("起运市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getEndCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("目的国不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getEndCity())){
+//            fb.setCode(0);
+//            fb.setMessage("目的市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getTransport())){
+//            fb.setCode(0);
+//            fb.setMessage("运输方式不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getStartLongitude())){
+//            fb.setCode(0);
+//            fb.setMessage("起运经度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getStartLatitude())){
+//            fb.setCode(0);
+//            fb.setMessage("起运纬度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getStartAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("起运具体地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getEndLongitude())){
+//            fb.setCode(0);
+//            fb.setMessage("目的经度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getEndLatitude())){
+//            fb.setCode(0);
+//            fb.setMessage("目的纬度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getEndAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("目的具体地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getBoxNo())){
+//            fb.setCode(0);
+//            fb.setMessage("箱单号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getContainerNo())){
+//            fb.setCode(0);
+//            fb.setMessage("集装箱号/车牌号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getDeliveryAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("交付地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addCircuitVo.getTransportationType())){
+//            fb.setCode(0);
+//            fb.setMessage("运输类型不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(!addCircuitVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!addCircuitVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if(!addCircuitVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!addCircuitVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if (!addCircuitVo.getTransport().equals("铁路")&&
+//                !addCircuitVo.getTransport().equals("汽运")&&
+//                !addCircuitVo.getTransport().equals("海运")&&
+//                !addCircuitVo.getTransport().equals("空运")&&
+//                !addCircuitVo.getTransport().equals("快递")){
+//            fb.setCode(0);
+//            fb.setMessage("请选择正确的运输方式");
+//            return gson.toJson(fb);
+//        }
+//        if (!addCircuitVo.getDeliveryAddress().equals("港口")&&
+//                !addCircuitVo.getDeliveryAddress().equals("仓库")&&
+//                !addCircuitVo.getDeliveryAddress().equals("站点")){
+//            fb.setCode(0);
+//            fb.setMessage("请输入正确的交付地址");
+//            return gson.toJson(fb);
+//        }
+//        if (!addCircuitVo.getTransportationType().equals("本地运输")&&
+//                !addCircuitVo.getTransportationType().equals("国际运输")){
+//            fb.setCode(0);
+//            fb.setMessage("请输入正确的运输类型");
+//            return gson.toJson(fb);
+//        }
+//        Date day=new Date();
+//        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("startCountry",addCircuitVo.getStartCountry());
+//        map.put("startProvince",addCircuitVo.getStartProvince());
+//        map.put("startCity",addCircuitVo.getStartCity());
+//        map.put("endCountry",addCircuitVo.getEndCountry());
+//        map.put("endProvince",addCircuitVo.getEndProvince());
+//        map.put("endCity",addCircuitVo.getEndCity());
+//        map.put("transport",addCircuitVo.getTransport());
+//        map.put("createTime",System.currentTimeMillis());
+//        map.put("updateTime",System.currentTimeMillis());
+//        map.put("rRemark",addCircuitVo.getrRemark());
+//        map.put("startLongitude",addCircuitVo.getStartLongitude());
+//        map.put("startLatitude",addCircuitVo.getStartLatitude());
+//        map.put("startAddress",addCircuitVo.getStartAddress());
+//        map.put("startTime",System.currentTimeMillis());
+//        map.put("endLongitude",addCircuitVo.getEndLongitude());
+//        map.put("endLatitude",addCircuitVo.getEndLatitude());
+//        map.put("endAddress",addCircuitVo.getEndAddress());
+//        map.put("endTime",0);
+//        map.put("boxNo",addCircuitVo.getBoxNo());
+//        map.put("containerNo",addCircuitVo.getContainerNo());
+//        map.put("deliveryAddress",addCircuitVo.getDeliveryAddress());
+//        map.put("transportationType",addCircuitVo.getTransportationType());
+//        map.put("remark",addCircuitVo.getRemark());
+//        String transportationNo = "";
+//        if (addCircuitVo.getTransportationType().equals("国际运输")){
+//            transportationNo="HUN"+df.format(day);
+//        }
+//        if (addCircuitVo.getTransportationType().equals("本地运输")){
+//            transportationNo="CHN"+df.format(day);
+//        }
+//        String routeNumber="RT"+df.format(day);
+//        String routeName=addCircuitVo.getStartCountry()+addCircuitVo.getStartCity()+"_"+addCircuitVo.getEndCountry()+addCircuitVo.getEndCity();
+//        if (addCircuitVo.getTransport().equals("汽运")){
+//            routeName=routeName+"_汽运";
+//            routeNumber=routeNumber+"G";
+//            transportationNo=transportationNo+"G";
+//        }
+//        if (addCircuitVo.getTransport().equals("铁路")){
+//            routeName=routeName+"_铁路";
+//            routeNumber=routeNumber+"T";
+//            transportationNo=transportationNo+"T";
+//        }
+//        if (addCircuitVo.getTransport().equals("空运")){
+//            routeName=routeName+"_空运";
+//            routeNumber=routeNumber+"K";
+//            transportationNo=transportationNo+"K";
+//        }
+//        if (addCircuitVo.getTransport().equals("快递")){
+//            routeName=routeName+"_快递";
+//            routeNumber=routeNumber+"D";
+//            transportationNo=transportationNo+"D";
+//        }
+//        if (addCircuitVo.getTransport().equals("海运")){
+//            routeName=routeName+"_海运";
+//            routeNumber=routeNumber+"H";
+//            transportationNo=transportationNo+"H";
+//        }
+//        routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
+//        if (routeService.getByRouteNumber(routeNumber)>0){
+//            while (routeService.getByRouteNumber(routeNumber)>0){
+//                routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
+//            }
+//        }
+//        transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
+//        if (circuitService.getByTransportationNo(transportationNo)!=null){
+//            while (routeService.getByRouteNumber(transportationNo)>0){
+//                transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
+//            }
+//        }
+//        map.put("routeName",routeName);
+//        map.put("routeNumber",routeNumber);
+//        map.put("transportationNo",transportationNo);
+//        circuitService.addCircuit(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("添加线路成功")){
+//            fb.setCode(1);
+//            fb.setMessage("添加线路成功");
+//        }else {
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //修改线路结束时间
+//    @ApiOperation(value = "修改线路结束时间",notes = "修改线路结束时间，传值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   endTime:目的时间 " )
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/updateEndTime",method = RequestMethod.POST)
+//    public Object updateEndTime(@RequestBody UpdateCircuitVo updateCircuitVo){
+//        if (StringUtils.isEmpty(updateCircuitVo.getTransportationNo())){
+//            fb.setCode(0);
+//            fb.setMessage("需要修改的运输编号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (updateCircuitVo.getEndTime()==null){
+//            fb.setCode(0);
+//            fb.setMessage("线路结束时间不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (circuitService.getByTransportationNo(updateCircuitVo.getTransportationNo()).getCircuitState()!=2){
+//            fb.setCode(0);
+//            fb.setMessage("线路未完成");
+//            return gson.toJson(fb);
+//        }
+//        int a = circuitService.updateEndTime(updateCircuitVo);
+//        if (a>0){
+//            fb.setCode(1);
+//            fb.setMessage("修改线路结束时间成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage("修改线路结束时间失败");
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //修改线路信息
+//    @ApiOperation(value = "修改线路信息",notes = "修改线路信息，传值说明：" +
+//            "   transportationNo:需要修改的运输编号," +
+//            "   routeNumber:修改之后的路由编号（如果没有就是空）," +
+//            "   startCountry:起运国," +
+//            "   startProvince:起运省," +
+//            "   startCity:起运市," +
+//            "   endCountry:目的国," +
+//            "   endProvince:目的省," +
+//            "   endCity:目的市," +
+//            "   transport:运输方式," +
+//            "   createTime:创建时间," +
+//            "   updateTime:修改时间," +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型," +
+//            "   remark:备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/updateCircuit",method = RequestMethod.POST)
+//    public Object updateCircuit(@RequestBody UpdateCircuitInfo updateCircuitInfo){
+//        if (StringUtils.isEmpty(updateCircuitInfo.getTransportationNo())){
+//            fb.setCode(0);
+//            fb.setMessage("需要修改的运输编号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(StringUtils.isEmpty(updateCircuitInfo.getStartCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("起运国不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getStartCity())){
+//            fb.setCode(0);
+//            fb.setMessage("起运市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getEndCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("目的国不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getEndCity())){
+//            fb.setCode(0);
+//            fb.setMessage("目的市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getTransport())){
+//            fb.setCode(0);
+//            fb.setMessage("运输方式不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getStartLongitude())){
+//            fb.setCode(0);
+//            fb.setMessage("起运经度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getStartLatitude())){
+//            fb.setCode(0);
+//            fb.setMessage("起运纬度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getStartAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("起运具体地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getEndLongitude())){
+//            fb.setCode(0);
+//            fb.setMessage("目的经度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getEndLatitude())){
+//            fb.setCode(0);
+//            fb.setMessage("目的纬度不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getEndAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("目的具体地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getBoxNo())){
+//            fb.setCode(0);
+//            fb.setMessage("箱单号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getContainerNo())){
+//            fb.setCode(0);
+//            fb.setMessage("集装箱号/车牌号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getDeliveryAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("交付地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateCircuitInfo.getTransportationType())){
+//            fb.setCode(0);
+//            fb.setMessage("运输类型不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateCircuitInfo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateCircuitInfo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateCircuitInfo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateCircuitInfo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if (!updateCircuitInfo.getTransport().equals("铁路")&&
+//                !updateCircuitInfo.getTransport().equals("汽运")&&
+//                !updateCircuitInfo.getTransport().equals("海运")&&
+//                !updateCircuitInfo.getTransport().equals("空运")&&
+//                !updateCircuitInfo.getTransport().equals("快递")){
+//            fb.setCode(0);
+//            fb.setMessage("请选择正确的运输方式");
+//            return gson.toJson(fb);
+//        }
+//        if (!updateCircuitInfo.getDeliveryAddress().equals("港口")&&
+//                !updateCircuitInfo.getDeliveryAddress().equals("仓库")&&
+//                !updateCircuitInfo.getDeliveryAddress().equals("站点")){
+//            fb.setCode(0);
+//            fb.setMessage("请输入正确的交付地址");
+//            return gson.toJson(fb);
+//        }
+//        if (!updateCircuitInfo.getTransportationType().equals("本地运输")&&
+//                !updateCircuitInfo.getTransportationType().equals("国际运输")){
+//            fb.setCode(0);
+//            fb.setMessage("请输入正确的运输类型");
+//            return gson.toJson(fb);
+//        }
+//        if(circuitService.getByTransportationNo(updateCircuitInfo.getTransportationNo()).getCircuitState()!=0){
+//            fb.setCode(0);
+//            fb.setMessage("线路只能在未开始运输时才能修改");
+//            return gson.toJson(fb);
+//        }
+//        String routeNumber="";
+//        Date day=new Date();
+//        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("routeNumber",updateCircuitInfo.getRouteNumber());
+//        map.put("startCountry",updateCircuitInfo.getStartCountry());
+//        map.put("startProvince",updateCircuitInfo.getStartProvince());
+//        map.put("startCity",updateCircuitInfo.getStartCity());
+//        map.put("endCountry",updateCircuitInfo.getEndCountry());
+//        map.put("endProvince",updateCircuitInfo.getEndProvince());
+//        map.put("endCity",updateCircuitInfo.getEndCity());
+//        map.put("transport",updateCircuitInfo.getTransport());
+//        map.put("createTime",System.currentTimeMillis());
+//        map.put("updateTime",System.currentTimeMillis());
+//        map.put("transportationNo",updateCircuitInfo.getTransportationNo());
+//        map.put("startLongitude",updateCircuitInfo.getStartLongitude());
+//        map.put("startLatitude",updateCircuitInfo.getStartLatitude());
+//        map.put("startAddress",updateCircuitInfo.getStartAddress());
+//        map.put("startTime",System.currentTimeMillis());
+//        map.put("endLongitude",updateCircuitInfo.getEndLongitude());
+//        map.put("endLatitude",updateCircuitInfo.getEndLatitude());
+//        map.put("endAddress",updateCircuitInfo.getEndAddress());
+//        map.put("endTime",0);
+//        map.put("boxNo",updateCircuitInfo.getBoxNo());
+//        map.put("containerNo",updateCircuitInfo.getContainerNo());
+//        map.put("deliveryAddress",updateCircuitInfo.getDeliveryAddress());
+//        map.put("transportationType",updateCircuitInfo.getTransportationType());
+//        map.put("remark",updateCircuitInfo.getRemark());
+//        if (StringUtils.isEmpty(updateCircuitInfo.getRouteNumber())){
+//            routeNumber="RT"+df.format(day);
+//            String routeName=updateCircuitInfo.getStartCountry()+updateCircuitInfo.getStartCity()+"_"+updateCircuitInfo.getEndCountry()+updateCircuitInfo.getEndCity();
+//            if (updateCircuitInfo.getTransport().equals("汽运")){
+//                routeName=routeName+"_汽运";
+//                routeNumber=routeNumber+"G";
+//            }
+//            if (updateCircuitInfo.getTransport().equals("铁路")){
+//                routeName=routeName+"_铁路";
+//                routeNumber=routeNumber+"T";
+//            }
+//            if (updateCircuitInfo.getTransport().equals("空运")){
+//                routeName=routeName+"_空运";
+//                routeNumber=routeNumber+"K";
+//            }
+//            if (updateCircuitInfo.getTransport().equals("快递")){
+//                routeName=routeName+"_快递";
+//                routeNumber=routeNumber+"D";
+//            }
+//            if (updateCircuitInfo.getTransport().equals("海运")){
+//                routeName=routeName+"_海运";
+//                routeNumber=routeNumber+"H";
+//            }
+//            routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
+//            if (routeService.getByRouteNumber(routeNumber)>0){
+//                while (routeService.getByRouteNumber(routeNumber)>0){
+//                    routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
+//                }
+//            }
+//            map.put("routeName",routeName);
+//            map.put("routeNumber",routeNumber);
+//        }
+//        circuitService.updateCircuit(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("修改线路成功")){
+//            fb.setCode(1);
+//            fb.setMessage("修改线路成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //删除线路
+//    @ApiOperation(value = "删除线路",notes = "删除线路，传值说明：" +
+//            "   transportationNo:运输编号" )
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/delCircuit",method = RequestMethod.POST)
+//    public Object delCircuit(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=(String)jsonObject.get("transportationNo");
+//        if (StringUtils.isEmpty(transportationNo)){
+//            fb.setCode(0);
+//            fb.setMessage("需要删除的运输编号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (circuitService.getByTransportationNo(transportationNo).getCircuitState()==1){
+//            fb.setCode(0);
+//            fb.setMessage("线路运输中不能删除");
+//            return gson.toJson(fb);
+//        }
+//        int a = circuitService.delCircuit(transportationNo);
+//        if (a>0){
+//            fb.setCode(1);
+//            fb.setMessage("删除线路成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage("删除线路失败");
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //根据车牌号查线路
+//    @ApiOperation(value = "获取线路信息",notes = "获取线路信息，返回值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   routeNumber:路由编号," +
+//            "   routeName:路由名" +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startCity:起运城市," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endCity:目的城市," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   transport:运输方式," +
+//            "   alarmType:预警类型," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型" +
+//            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
+//            "   remark:备注," +
+//            "   createTime:创建线路时间" +
+//            "   evaluate:评分，" +
+//            "   evaluateRemark:评分备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getByContainerNo",method = RequestMethod.POST)
+//    public Object getByContainerNo(@RequestBody String containerNo){
+//        JSONObject jsonObject=JSON.parseObject(containerNo);
+//        containerNo=(String)jsonObject.get("containerNo");
+//        return circuitService.getByContainerNo(containerNo);
+//    }
+//
+//    //评价
+//    @ApiOperation(value = "评价",notes = "评价线路传值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   evaluate:评分，" +
+//            "   evaluateRemark:评分备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/updateEvaluate",method = RequestMethod.POST)
+//    public Object updateEvaluate(@RequestBody UpdateEvaluateVo updateEvaluateVo){
+//        if (updateEvaluateVo.getEvaluate()==null){
+//            fb.setCode(0);
+//            fb.setMessage("评价的等级不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateEvaluateVo.getTransportationNo())){
+//            fb.setCode(0);
+//            fb.setMessage("需要评价的线路编号不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (circuitService.getByTransportationNo(updateEvaluateVo.getTransportationNo()).getCircuitState()!=2){
+//            fb.setCode(0);
+//            fb.setMessage("线路完成运输才能评价");
+//            return gson.toJson(fb);
+//        }
+//        if (circuitService.getByTransportationNo(updateEvaluateVo.getTransportationNo()).getEvaluate()!=null){
+//            fb.setCode(0);
+//            fb.setMessage("该线路已经被评价");
+//            return gson.toJson(fb);
+//        }
+//        int a = circuitService.updateEvaluate(updateEvaluateVo);
+//        if (a>0){
+//            fb.setCode(1);
+//            fb.setMessage("评价成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage("评价失败");
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //根据运输状态查询线路信息
+//    @ApiOperation(value = "根据运输状态查询线路信息",notes = "根据运输状态查询线路信息，传值说明：{\"circuitState\":2}  ,circuitState:线路状态（0未开始，1运输中，2完成），返回值说明：" +
+//            "   transportationNo:运输编号," +
+//            "   routeNumber:路由编号," +
+//            "   routeName:路由名" +
+//            "   startLongitude:起运经度," +
+//            "   startLatitude:起运纬度," +
+//            "   startCity:起运城市," +
+//            "   startAddress:起运具体地址," +
+//            "   startTime:起运时间," +
+//            "   endLongitude:目的经度," +
+//            "   endLatitude:目的纬度," +
+//            "   endCity:目的城市," +
+//            "   endAddress:目的具体地址," +
+//            "   endTime:目的时间," +
+//            "   transport:运输方式," +
+//            "   alarmType:预警类型," +
+//            "   boxNo:箱单号," +
+//            "   containerNo:集装箱号," +
+//            "   deliveryAddress:交付地址," +
+//            "   transportationType:运输类型" +
+//            "   circuitState:线路状态（0未开始，1运输中，2完成）," +
+//            "   remark:备注," +
+//            "   createTime:创建线路时间" +
+//            "   evaluate:评分，" +
+//            "   evaluateRemark:评分备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getByCircuitState",method = RequestMethod.POST)
+//    public Object getByCircuitState(@RequestBody Map map){
+//        if (!map.containsKey("circuitState")){
+//            fb.setCode(0);
+//            fb.setMessage("需要查询的线路状态不能为空");
+//            return gson.toJson(fb);
+//        }
+//        return circuitService.getByCircuitState(Integer.valueOf(map.get("circuitState").toString()));
+//    }
 
 }

src/main/java/com/example/tdl/web/DataController.java

@@ -38,771 +38,771 @@ public class DataController {
 
     CommFeedback fb = new CommFeedback();
 
-    @Autowired
-    private TDLDeviceService tdlDeviceService;
-
-    @Autowired
-    private ProbesService probesService;
-
-    @Autowired
-    private RealRedisService realRedisService;
-
-    @Autowired
-    private InfoRedisService infoRedisService;
-
-    @Autowired
-    private InfluxDBTemplate influxDBTemplate;
-
-    @Autowired
-    private AlarmLogService alarmLogService;
-
-    @Autowired
-    private CircuitService circuitService;
-
-    @Autowired
-    private TDLLogService tdlLogService;
-
-    private final static String database ="original";
-
-    //获取实时数据
-    @ApiOperation(value = "获取实时数据",notes = "获取实时数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @PostMapping("/getRealTimeData")
-    public Object getRealTimeData(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        //获取gateway的信息
-        ResultGatewayVo gatewayVo = circuitService.getByNo(transportationNo);
-        if(gatewayVo==null){
-            fb.setCode(0);
-            fb.setMessage("该线路未绑定设备");
-            return gson.toJson(fb);
-        }
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        //根据gateWay获取tdl信息
-        List<String> key = new ArrayList<>();
-        key.add(gatewayVo.getSN()+"_"+gatewayVo.getType() +":"+gatewayVo.getSN()+"_"+gatewayVo.getType());
-        for (int i = 0;i<devList.size();i++){
-            key.add(gatewayVo.getSN()+"_"+gatewayVo.getType()+":"+devList.get(i));
-        }
-        List<LiveDataVo> liveDataVos = new ArrayList<>();
-        for(int j=0;j<key.size();j++){
-            Map<Object,Object> ret = realRedisService.getHashAll(key.get(j));
-            if(ret == null){
-                continue;
-            }else{
-                Iterator entries = ret.entrySet().iterator();
-                List<String> aliasList = new ArrayList<>();
-                List<String> valueList = new ArrayList<>();
-                while(entries.hasNext()){
-                    Map.Entry entry = (Map.Entry) entries.next();
-                    aliasList.add((String) entry.getKey());
-                    valueList.add((String) entry.getValue());
-                }
-                //根据通道别名获取通道信息
-                List<ProbesVo> probesVoList =  probesService.getByAliasList(gatewayVo.getSN(),gatewayVo.getType(),aliasList);
-                for(int m = 0;m<probesVoList.size();m++){
-                    probesVoList.get(m).setValue(valueList.get(m));
-                }
-                LiveDataVo liveDataVo = new LiveDataVo();
-                liveDataVo.setKey(key.get(j).substring(key.get(j).indexOf(":"),key.get(j).length()));
-                liveDataVo.setProbesVoList(probesVoList);
-                liveDataVos.add(liveDataVo);
-            }
-        }
-        return  gson.toJson(liveDataVos);
-    }
-
-
-    //获取坐标数据数据
-    @ApiOperation(value = "获取坐标数据数据",notes = "获取坐标数据数据" +
-            "time:时间" +
-            "lng：经度" +
-            "lat: 纬度")
-    @PostMapping("/getLocation")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getLocation(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        //根据运输编号获取线路信息
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        if(resultCircuitVo.getEndTime() !=0  && infoRedisService.hasHashKey("TransportConfig",transportationNo)){
-            Object ret = infoRedisService.getHash("TransportConfig",transportationNo);
-            return ret;
-        }else{
-            //获取gateway的信息
-            ResultGatewayVo gatewayVo = new ResultGatewayVo();
-            if(resultCircuitVo.getEndTime() == 0){
-                gatewayVo = circuitService.getByNo(transportationNo);
-            }else{
-                gatewayVo = tdlLogService.getByNo(transportationNo);
-            }
-            if(gatewayVo==null){
-                fb.setCode(0);
-                fb.setMessage("该线路未绑定设备");
-                return gson.toJson(fb);
-            }
-            String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-            Long startTime = resultCircuitVo.getStartTime() *1000000l;
-            //获取tdl信息
-            String sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  ORDER BY time ";
-            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-            //解析经纬度数据
-            List<LocationDataVo>  locationDataVos = new ArrayList<>();
-            if(queryResult.getResults().get(0).getSeries() != null){
-                locationDataVos=getLocation(queryResult);
-            }
-            //获取震动的数据
-            String sql2 = "SELECT \"b\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +" ORDER BY time";
-            QueryResult  queryResult2  = influxDBTemplate.query(new Query(sql2,database));
-            List<String> timeList = new ArrayList<>();
-            if(queryResult2.getResults().get(0).getSeries() != null){
-                //获取震动的时间戳
-                timeList =  getTime(queryResult2);
-            }
-            //获取震动数据的坐标
-            String sql3 ="";
-            for(String time : timeList){
-                Long t = Long.valueOf(time) *1000000l;
-                sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +" and time<="+ t +" ORDER BY time desc limit 1;" +sql3;
-            }
-            QueryResult  queryResult3  = influxDBTemplate.query(new Query(sql3,database));
-            List<String> time= new ArrayList<>();
-            if(queryResult3.getResults() !=null){
-                time = getShockLocation(queryResult3);
-            }
-            List<LocationDataVo> locationDataVoList =new ArrayList<>();
-            for(LocationDataVo locationDataVo :locationDataVos){
-                if(time.contains(locationDataVo.getTime())){
-                    locationDataVo.setError(1);
-                    locationDataVoList.add(locationDataVo);
-                }else{
-                    locationDataVo.setError(0);
-                    locationDataVoList.add(locationDataVo);
-                }
-            }
-            //如果是已经完结保存到redis中
-            if(resultCircuitVo.getEndTime() != 0){
-                infoRedisService.setHash("TransportConfig",transportationNo,locationDataVoList.toString(),60*30);
-            }
-            return gson.toJson(locationDataVoList);
-        }
-    }
-
-
-    //根据运输编号获取路线以及设备信息
-    @ApiOperation(value = "获取路线以及设备信息",notes = "获取路线以及设备信息" +
-            "transportationNo:运输编号" +
-            "startCity:启运城市" +
-            "startTime:开始时间" +
-            "endCity:目的城市" +
-            "endTime:结束时间（未结束为\"\"）" +
-            "gatewaySN:网关编号" +
-            "battery:网关点量" +
-            "TDLSN:tdl编号" +
-            "batteryVoltage:tdl电压" +
-            "lastTime：运输时长（未结束为\"\"）" +
-            "circuitState:运输状态(0--未开始，1--运输中，2--完成)" +
-            "remark：备注信息")
-    @PostMapping("/getCircuit")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object  getCircuit(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        ResultCircuit resultCircuit = new ResultCircuit();
-        resultCircuit.setTransportationNo(transportationNo);
-        //根据运输编号获取线路信息，设备信息
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        resultCircuit.setStartCity(resultCircuitVo.getStartCity());
-        resultCircuit.setStartTime(resultCircuitVo.getStartTime());
-        resultCircuit.setEndCity(resultCircuitVo.getEndCity());
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            resultCircuit.setEndTime(null);
-            resultCircuit.setLastTime(null);
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            resultCircuit.setEndTime(resultCircuitVo.getEndTime());
-            resultCircuit.setLastTime(getDistanceTime(resultCircuit.getStartTime(),resultCircuit.getEndTime()));
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        //获取gateway的信息
-        if(gatewayVo==null){
-            fb.setCode(0);
-            fb.setMessage("该线路未绑定设备");
-            return gson.toJson(fb);
-        }
-        resultCircuit.setGatewaySN(gatewayVo.getSN());
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //获取tdl信息
-        String sql = "SELECT \"battery\"  FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +"  ORDER BY time  desc limit 1";
-        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-        if(queryResult.getResults().get(0).getSeries() != null){
-            List<List<Object>> values = getValues(queryResult);
-            for(List<Object> value:values){
-                logger.info(value.get(1).toString());
-                resultCircuit.setBattery(value.get(1)==null ?  "": value.get(1).toString());
-            }
-        }
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String key=gatewayVo.getSN()+"_"+gatewayVo.getType() +":"+gatewayVo.getSN()+"_"+gatewayVo.getType() ;
-        //获取网关以及TDL的电量
-        if(devList.size() == 0 ){
-            fb.setCode(0);
-            fb.setMessage("该线路未绑定设备");
-            return gson.toJson(fb);
-        }
-        for(int i = 0;i<devList.size();i++){
-            String sql2 = "SELECT \"b\"  FROM \"tdl_policy\".\""+device+"\" where \"tdl\"=\'tdl-"+devList.get(i)+"\'and  time >= "+startTime +"  ORDER BY time desc limit 1";
-            QueryResult  queryResult2  = influxDBTemplate.query(new Query(sql2,database));
-            if(queryResult2.getResults().get(0).getSeries() != null){
-                List<List<Object>> values = getValues(queryResult2);
-                for(List<Object> value:values){
-                    resultCircuit.setTDLSN(devList.get(i));
-                    resultCircuit.setBatteryVoltage(value.get(1)==null ? "" :value.get(1).toString());
-                }
-            }
-        }
-        resultCircuit.setCircuitState(resultCircuitVo.getCircuitState());
-        return  gson.toJson(resultCircuit);
-    }
-
-
-    //获取温度数据
-    @ApiOperation(value = "获取温度数据",notes = "获取温度数据" +
-            "TDLSN:tdl编号" +
-            "temperatureDataVos:" +
-                "time:时间" +
-                "value:温度数据")
-    @PostMapping("/getTemperature")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getTemperature(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //SELECT "h" FROM "tdl_policy"."WTD93LG_20180314" WHERE "tdl" = 'tdl-0A0B0C0D0F' ORDER BY time DESC
-        if(devList.size() == 0){
-            fb.setCode(0);
-            fb.setMessage("没有数据");
-            return gson.toJson(fb);
-        }
-        List<Temperature> temperatures = new ArrayList<>();
-        for( int i =0;i<devList.size();i++){
-            Temperature temperature = new Temperature();
-            temperature.setTDLSN(devList.get(i));
-            String sql = "SELECT \"t\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\'  and time >="+startTime + " ORDER BY time ";
-            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-            List<TemperatureDataVo>  temperatureDataVos = new ArrayList<>();
-            if(queryResult.getResults().get(0).getSeries() != null){
-                //解析数据
-                temperatureDataVos = getTemperature(queryResult);
-            }
-            temperature.setTemperatureDataVos(temperatureDataVos);
-            temperatures.add(temperature);
-        }
-        /*String sql = "SELECT \"t\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
-        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-        List<TemperatureDataVo>  temperatureDataVos = new ArrayList<>();
-        if(queryResult.getResults().get(0).getSeries() != null){
-            //解析数据
-            temperatureDataVos = getTemperature(queryResult);
-        }*/
-        return  gson.toJson(temperatures);
-    }
-
-
-    //获取湿度数据
-    @ApiOperation(value = "获取湿度数据",notes = "获取湿度数据")
-    @PostMapping("/getHumidity")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getHumidity(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        if(devList.size() == 0){
-            fb.setCode(0);
-            fb.setMessage("没有数据");
-            return gson.toJson(fb);
-        }
-        List<Humidity> humidities = new ArrayList<>();
-        for( int i =0;i<devList.size();i++){
-            Humidity humidity = new Humidity();
-            humidity.setTDLSN(devList.get(i));
-            String sql = "SELECT \"h\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
-            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-            List<HumidityDataVo>  humidityDataVos = new ArrayList<>();
-            if(queryResult.getResults().get(0).getSeries() != null){
-                //解析数据
-                humidityDataVos = getHumidity(queryResult);
-            }
-            humidity.setHumidityDataVoList(humidityDataVos);
-            humidities.add(humidity);
-        }
+//    @Autowired
+//    private TDLDeviceService tdlDeviceService;
+//
+//    @Autowired
+//    private ProbesService probesService;
+//
+//    @Autowired
+//    private RealRedisService realRedisService;
+//
+//    @Autowired
+//    private InfoRedisService infoRedisService;
+//
+//    @Autowired
+//    private InfluxDBTemplate influxDBTemplate;
+//
+//    @Autowired
+//    private AlarmLogService alarmLogService;
+//
+//    @Autowired
+//    private CircuitService circuitService;
+//
+//    @Autowired
+//    private TDLLogService tdlLogService;
+//
+//    private final static String database ="original";
+//
+//    //获取实时数据
+//    @ApiOperation(value = "获取实时数据",notes = "获取实时数据")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @PostMapping("/getRealTimeData")
+//    public Object getRealTimeData(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        //获取gateway的信息
+//        ResultGatewayVo gatewayVo = circuitService.getByNo(transportationNo);
+//        if(gatewayVo==null){
+//            fb.setCode(0);
+//            fb.setMessage("该线路未绑定设备");
+//            return gson.toJson(fb);
+//        }
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        //根据gateWay获取tdl信息
+//        List<String> key = new ArrayList<>();
+//        key.add(gatewayVo.getSN()+"_"+gatewayVo.getType() +":"+gatewayVo.getSN()+"_"+gatewayVo.getType());
+//        for (int i = 0;i<devList.size();i++){
+//            key.add(gatewayVo.getSN()+"_"+gatewayVo.getType()+":"+devList.get(i));
+//        }
+//        List<LiveDataVo> liveDataVos = new ArrayList<>();
+//        for(int j=0;j<key.size();j++){
+//            Map<Object,Object> ret = realRedisService.getHashAll(key.get(j));
+//            if(ret == null){
+//                continue;
+//            }else{
+//                Iterator entries = ret.entrySet().iterator();
+//                List<String> aliasList = new ArrayList<>();
+//                List<String> valueList = new ArrayList<>();
+//                while(entries.hasNext()){
+//                    Map.Entry entry = (Map.Entry) entries.next();
+//                    aliasList.add((String) entry.getKey());
+//                    valueList.add((String) entry.getValue());
+//                }
+//                //根据通道别名获取通道信息
+//                List<ProbesVo> probesVoList =  probesService.getByAliasList(gatewayVo.getSN(),gatewayVo.getType(),aliasList);
+//                for(int m = 0;m<probesVoList.size();m++){
+//                    probesVoList.get(m).setValue(valueList.get(m));
+//                }
+//                LiveDataVo liveDataVo = new LiveDataVo();
+//                liveDataVo.setKey(key.get(j).substring(key.get(j).indexOf(":"),key.get(j).length()));
+//                liveDataVo.setProbesVoList(probesVoList);
+//                liveDataVos.add(liveDataVo);
+//            }
+//        }
+//        return  gson.toJson(liveDataVos);
+//    }
+//
+//
+//    //获取坐标数据数据
+//    @ApiOperation(value = "获取坐标数据数据",notes = "获取坐标数据数据" +
+//            "time:时间" +
+//            "lng：经度" +
+//            "lat: 纬度")
+//    @PostMapping("/getLocation")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getLocation(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        //根据运输编号获取线路信息
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        if(resultCircuitVo.getEndTime() !=0  && infoRedisService.hasHashKey("TransportConfig",transportationNo)){
+//            Object ret = infoRedisService.getHash("TransportConfig",transportationNo);
+//            return ret;
+//        }else{
+//            //获取gateway的信息
+//            ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//            if(resultCircuitVo.getEndTime() == 0){
+//                gatewayVo = circuitService.getByNo(transportationNo);
+//            }else{
+//                gatewayVo = tdlLogService.getByNo(transportationNo);
+//            }
+//            if(gatewayVo==null){
+//                fb.setCode(0);
+//                fb.setMessage("该线路未绑定设备");
+//                return gson.toJson(fb);
+//            }
+//            String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//            Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//            //获取tdl信息
+//            String sql = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +"  ORDER BY time ";
+//            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//            //解析经纬度数据
+//            List<LocationDataVo>  locationDataVos = new ArrayList<>();
+//            if(queryResult.getResults().get(0).getSeries() != null){
+//                locationDataVos=getLocation(queryResult);
+//            }
+//            //获取震动的数据
+//            String sql2 = "SELECT \"b\" FROM \"tdl_policy\".\""+device+"\"where time >= "+startTime +" ORDER BY time";
+//            QueryResult  queryResult2  = influxDBTemplate.query(new Query(sql2,database));
+//            List<String> timeList = new ArrayList<>();
+//            if(queryResult2.getResults().get(0).getSeries() != null){
+//                //获取震动的时间戳
+//                timeList =  getTime(queryResult2);
+//            }
+//            //获取震动数据的坐标
+//            String sql3 ="";
+//            for(String time : timeList){
+//                Long t = Long.valueOf(time) *1000000l;
+//                sql3 = "SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +" and time<="+ t +" ORDER BY time desc limit 1;" +sql3;
+//            }
+//            QueryResult  queryResult3  = influxDBTemplate.query(new Query(sql3,database));
+//            List<String> time= new ArrayList<>();
+//            if(queryResult3.getResults() !=null){
+//                time = getShockLocation(queryResult3);
+//            }
+//            List<LocationDataVo> locationDataVoList =new ArrayList<>();
+//            for(LocationDataVo locationDataVo :locationDataVos){
+//                if(time.contains(locationDataVo.getTime())){
+//                    locationDataVo.setError(1);
+//                    locationDataVoList.add(locationDataVo);
+//                }else{
+//                    locationDataVo.setError(0);
+//                    locationDataVoList.add(locationDataVo);
+//                }
+//            }
+//            //如果是已经完结保存到redis中
+//            if(resultCircuitVo.getEndTime() != 0){
+//                infoRedisService.setHash("TransportConfig",transportationNo,locationDataVoList.toString(),60*30);
+//            }
+//            return gson.toJson(locationDataVoList);
+//        }
+//    }
+//
+//
+//    //根据运输编号获取路线以及设备信息
+//    @ApiOperation(value = "获取路线以及设备信息",notes = "获取路线以及设备信息" +
+//            "transportationNo:运输编号" +
+//            "startCity:启运城市" +
+//            "startTime:开始时间" +
+//            "endCity:目的城市" +
+//            "endTime:结束时间（未结束为\"\"）" +
+//            "gatewaySN:网关编号" +
+//            "battery:网关点量" +
+//            "TDLSN:tdl编号" +
+//            "batteryVoltage:tdl电压" +
+//            "lastTime：运输时长（未结束为\"\"）" +
+//            "circuitState:运输状态(0--未开始，1--运输中，2--完成)" +
+//            "remark：备注信息")
+//    @PostMapping("/getCircuit")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object  getCircuit(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        ResultCircuit resultCircuit = new ResultCircuit();
+//        resultCircuit.setTransportationNo(transportationNo);
+//        //根据运输编号获取线路信息，设备信息
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        resultCircuit.setStartCity(resultCircuitVo.getStartCity());
+//        resultCircuit.setStartTime(resultCircuitVo.getStartTime());
+//        resultCircuit.setEndCity(resultCircuitVo.getEndCity());
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            resultCircuit.setEndTime(null);
+//            resultCircuit.setLastTime(null);
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            resultCircuit.setEndTime(resultCircuitVo.getEndTime());
+//            resultCircuit.setLastTime(getDistanceTime(resultCircuit.getStartTime(),resultCircuit.getEndTime()));
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        //获取gateway的信息
+//        if(gatewayVo==null){
+//            fb.setCode(0);
+//            fb.setMessage("该线路未绑定设备");
+//            return gson.toJson(fb);
+//        }
+//        resultCircuit.setGatewaySN(gatewayVo.getSN());
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//        //获取tdl信息
+//        String sql = "SELECT \"battery\"  FROM \"tdl_policy\".\""+device+"\" where time >= "+startTime +"  ORDER BY time  desc limit 1";
+//        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//        if(queryResult.getResults().get(0).getSeries() != null){
+//            List<List<Object>> values = getValues(queryResult);
+//            for(List<Object> value:values){
+//                logger.info(value.get(1).toString());
+//                resultCircuit.setBattery(value.get(1)==null ?  "": value.get(1).toString());
+//            }
+//        }
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String key=gatewayVo.getSN()+"_"+gatewayVo.getType() +":"+gatewayVo.getSN()+"_"+gatewayVo.getType() ;
+//        //获取网关以及TDL的电量
+//        if(devList.size() == 0 ){
+//            fb.setCode(0);
+//            fb.setMessage("该线路未绑定设备");
+//            return gson.toJson(fb);
+//        }
+//        for(int i = 0;i<devList.size();i++){
+//            String sql2 = "SELECT \"b\"  FROM \"tdl_policy\".\""+device+"\" where \"tdl\"=\'tdl-"+devList.get(i)+"\'and  time >= "+startTime +"  ORDER BY time desc limit 1";
+//            QueryResult  queryResult2  = influxDBTemplate.query(new Query(sql2,database));
+//            if(queryResult2.getResults().get(0).getSeries() != null){
+//                List<List<Object>> values = getValues(queryResult2);
+//                for(List<Object> value:values){
+//                    resultCircuit.setTDLSN(devList.get(i));
+//                    resultCircuit.setBatteryVoltage(value.get(1)==null ? "" :value.get(1).toString());
+//                }
+//            }
+//        }
+//        resultCircuit.setCircuitState(resultCircuitVo.getCircuitState());
+//        return  gson.toJson(resultCircuit);
+//    }
+//
+//
+//    //获取温度数据
+//    @ApiOperation(value = "获取温度数据",notes = "获取温度数据" +
+//            "TDLSN:tdl编号" +
+//            "temperatureDataVos:" +
+//                "time:时间" +
+//                "value:温度数据")
+//    @PostMapping("/getTemperature")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getTemperature(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
 //        //SELECT "h" FROM "tdl_policy"."WTD93LG_20180314" WHERE "tdl" = 'tdl-0A0B0C0D0F' ORDER BY time DESC
-//        String sql = "SELECT \"h\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+//        if(devList.size() == 0){
+//            fb.setCode(0);
+//            fb.setMessage("没有数据");
+//            return gson.toJson(fb);
+//        }
+//        List<Temperature> temperatures = new ArrayList<>();
+//        for( int i =0;i<devList.size();i++){
+//            Temperature temperature = new Temperature();
+//            temperature.setTDLSN(devList.get(i));
+//            String sql = "SELECT \"t\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\'  and time >="+startTime + " ORDER BY time ";
+//            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//            List<TemperatureDataVo>  temperatureDataVos = new ArrayList<>();
+//            if(queryResult.getResults().get(0).getSeries() != null){
+//                //解析数据
+//                temperatureDataVos = getTemperature(queryResult);
+//            }
+//            temperature.setTemperatureDataVos(temperatureDataVos);
+//            temperatures.add(temperature);
+//        }
+//        /*String sql = "SELECT \"t\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+//        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//        List<TemperatureDataVo>  temperatureDataVos = new ArrayList<>();
+//        if(queryResult.getResults().get(0).getSeries() != null){
+//            //解析数据
+//            temperatureDataVos = getTemperature(queryResult);
+//        }*/
+//        return  gson.toJson(temperatures);
+//    }
+//
+//
+//    //获取湿度数据
+//    @ApiOperation(value = "获取湿度数据",notes = "获取湿度数据")
+//    @PostMapping("/getHumidity")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getHumidity(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        if(devList.size() == 0){
+//            fb.setCode(0);
+//            fb.setMessage("没有数据");
+//            return gson.toJson(fb);
+//        }
+//        List<Humidity> humidities = new ArrayList<>();
+//        for( int i =0;i<devList.size();i++){
+//            Humidity humidity = new Humidity();
+//            humidity.setTDLSN(devList.get(i));
+//            String sql = "SELECT \"h\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
 //            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
 //            List<HumidityDataVo>  humidityDataVos = new ArrayList<>();
 //            if(queryResult.getResults().get(0).getSeries() != null){
 //                //解析数据
 //                humidityDataVos = getHumidity(queryResult);
 //            }
-        return  gson.toJson(humidities);
-    }
-
-    //获取倾斜度数据
-    @ApiOperation(value = "获取倾斜度数据",notes = "获取倾斜度数据")
-    @PostMapping("/getTiltAngle")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getTiltAngle(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        if(devList.size() == 0){
-            fb.setCode(0);
-            fb.setMessage("没有数据");
-            return gson.toJson(fb);
-        }
-        List<TiltAngle> tiltAngles = new ArrayList<>();
-        for( int i =0;i<devList.size();i++){
-            TiltAngle tiltAngle = new TiltAngle();
-            tiltAngle.setTDLSN(devList.get(i));
-            String sql = "SELECT \"ta\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
-            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-            List<TiltAngleVo>  tiltAngleVos = new ArrayList<>();
-            if(queryResult.getResults().get(0).getSeries() != null){
-                //解析数据
-                tiltAngleVos = getTiltAngle(queryResult);
-            }
-            tiltAngle.setShockEnergyVoList(tiltAngleVos);
-            tiltAngles.add(tiltAngle);
-        }
-//        String sql = "SELECT \"ta\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+//            humidity.setHumidityDataVoList(humidityDataVos);
+//            humidities.add(humidity);
+//        }
+////        //SELECT "h" FROM "tdl_policy"."WTD93LG_20180314" WHERE "tdl" = 'tdl-0A0B0C0D0F' ORDER BY time DESC
+////        String sql = "SELECT \"h\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+////        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+////        List<HumidityDataVo>  humidityDataVos = new ArrayList<>();
+////        if(queryResult.getResults().get(0).getSeries() != null){
+////            //解析数据
+////            humidityDataVos = getHumidity(queryResult);
+////        }
+//        return  gson.toJson(humidities);
+//    }
+//
+//    //获取倾斜度数据
+//    @ApiOperation(value = "获取倾斜度数据",notes = "获取倾斜度数据")
+//    @PostMapping("/getTiltAngle")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getTiltAngle(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        if(devList.size() == 0){
+//            fb.setCode(0);
+//            fb.setMessage("没有数据");
+//            return gson.toJson(fb);
+//        }
+//        List<TiltAngle> tiltAngles = new ArrayList<>();
+//        for( int i =0;i<devList.size();i++){
+//            TiltAngle tiltAngle = new TiltAngle();
+//            tiltAngle.setTDLSN(devList.get(i));
+//            String sql = "SELECT \"ta\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
 //            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
 //            List<TiltAngleVo>  tiltAngleVos = new ArrayList<>();
 //            if(queryResult.getResults().get(0).getSeries() != null){
 //                //解析数据
 //                tiltAngleVos = getTiltAngle(queryResult);
 //            }
-        return  gson.toJson(tiltAngles);
-    }
-
-    //获取震动能量
-    @ApiOperation(value = "获取震动能量",notes = "获取震动能量")
-    @PostMapping("/getShockEnergy")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getShockEnergy(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        if(devList.size() == 0){
-            fb.setCode(0);
-            fb.setMessage("没有数据");
-            return gson.toJson(fb);
-        }
-        List<ShockEnergy> shockEnergies = new ArrayList<>();
-        for( int i =0;i<devList.size();i++){
-            ShockEnergy shockEnergy = new ShockEnergy();
-            shockEnergy.setTDLSN(devList.get(i));
-            String sql = "SELECT \"a0\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
-            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-            List<ShockEnergyVo>  shockEnergyVos = new ArrayList<>();
-            if(queryResult.getResults().get(0).getSeries() != null){
-                //解析数据
-                shockEnergyVos = getShockEnergy(queryResult);
-            }
-            shockEnergy.setShockEnergyVoList(shockEnergyVos);
-            shockEnergies.add(shockEnergy);
-        }
-//        String sql = "SELECT \"a0\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+//            tiltAngle.setShockEnergyVoList(tiltAngleVos);
+//            tiltAngles.add(tiltAngle);
+//        }
+////        String sql = "SELECT \"ta\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+////        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+////        List<TiltAngleVo>  tiltAngleVos = new ArrayList<>();
+////        if(queryResult.getResults().get(0).getSeries() != null){
+////            //解析数据
+////            tiltAngleVos = getTiltAngle(queryResult);
+////        }
+//        return  gson.toJson(tiltAngles);
+//    }
+//
+//    //获取震动能量
+//    @ApiOperation(value = "获取震动能量",notes = "获取震动能量")
+//    @PostMapping("/getShockEnergy")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getShockEnergy(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        if(devList.size() == 0){
+//            fb.setCode(0);
+//            fb.setMessage("没有数据");
+//            return gson.toJson(fb);
+//        }
+//        List<ShockEnergy> shockEnergies = new ArrayList<>();
+//        for( int i =0;i<devList.size();i++){
+//            ShockEnergy shockEnergy = new ShockEnergy();
+//            shockEnergy.setTDLSN(devList.get(i));
+//            String sql = "SELECT \"a0\"  FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\"=\'"+devList.get(i)+"\' and time >="+startTime+" ORDER BY time ";
 //            QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
 //            List<ShockEnergyVo>  shockEnergyVos = new ArrayList<>();
 //            if(queryResult.getResults().get(0).getSeries() != null){
 //                //解析数据
 //                shockEnergyVos = getShockEnergy(queryResult);
 //            }
-        return  gson.toJson(shockEnergies);
-    }
-
-
-    //根据运输编号获取所有的报警数据
-    @ApiOperation(value = "根据运输编号获取所有的报警数据????",notes = "根据运输编号获取所有的报警数据")
-    @PostMapping("/getAlarmData")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public  Object  getAlarmData(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        //根据运输编号获取报警信息
-        List<ResultAlarmLog> alarmLogVoList = alarmLogService.getByTransportationNo(transportationNo);
-        return  gson.toJson(alarmLogVoList);
-    }
-
-
-    //根据时间获取经纬度信息
-    @ApiOperation(value = "根据时间获取经纬度信息",notes = "根据时间获取经纬度信息" +
-            "transportationNo:运输编号" +
-            "TDLSN:tdl编号" +
-            "gatewaySN:网关编号" +
-            "startCity:出发城市" +
-            "endCity:目的城市" +
-            "startTime:出发时间" +
-            "endTime:到达时间" +
-            "alarmTime:报警时间" +
-            "alarmType:报警类型" +
-            "alarmValue:报警值" +
-            "lng:经度" +
-            "lat:纬度")
-    @PostMapping("/getLocationByTime")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getLocationByTime(@RequestBody LocationVo locationVo ){
-        //获取线路信息
-        //获取网关以及tdl信息
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(locationVo.getTransportationNo());
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(locationVo.getTransportationNo());
-        }else{
-            gatewayVo = tdlLogService.getByNo(locationVo.getTransportationNo());
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        //根据时间获取坐标信息
-        String sql ="SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+devcie+"\" where time = "+locationVo.getTime() *1000000l;
-        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-        List<LocationMessageVo>  locationDataVos = new ArrayList<>();
-        if(queryResult.getResults().get(0).getSeries() != null){
-            List<List<Object>> values = getValues(queryResult);
-            for(List<Object> value:values){
-                LocationMessageVo messageVo = new LocationMessageVo();
-                messageVo.setTransportationNo(locationVo.getTransportationNo());
-                messageVo.setGatewaySN(gatewayVo.getSN());
-                messageVo.setTDLSN(devList);
-                messageVo.setStartCity(resultCircuitVo.getStartCity());
-                messageVo.setEndCity(resultCircuitVo.getEndCity());
-                messageVo.setStartTime(resultCircuitVo.getStartTime());
-                messageVo.setEndTime(resultCircuitVo.getEndTime());
-                messageVo.setAlarmTime(Long.valueOf(parseTime(value.get(0).toString())));
-                messageVo.setAlarmType(locationVo.getAlarmType());
-                messageVo.setAlarmValue(locationVo.getVlaue());
-                messageVo.setLng(value.get(1)==null ?  "" : value.get(1).toString());
-                messageVo.setLat(value.get(2)==null ?  "" : value.get(2).toString());
-                locationDataVos.add(messageVo);
-            }
-        }
-        return  gson.toJson(locationDataVos);
-    }
-
-
-    //获取温度、湿度、震动强度、震动能量、倾斜度
-    @PostMapping("/getDeviceData")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getDeviceData(@RequestBody String transportationNo){
-        JSONObject jsonObject= JSON.parseObject(transportationNo);
-        transportationNo=jsonObject.getString("transportationNo");
-        //获取网关以及tdl信息
-        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
-        ResultGatewayVo gatewayVo = new ResultGatewayVo();
-        if(resultCircuitVo.getEndTime() == 0){
-            gatewayVo = circuitService.getByNo(transportationNo);
-        }else{
-            gatewayVo = tdlLogService.getByNo(transportationNo);
-        }
-        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
-        Long startTime = resultCircuitVo.getStartTime() *1000000l;
-        //获取tdl信息
-        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
-        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
-        //SELECT "h" FROM "tdl_policy"."WTD93LG_20180314" WHERE "tdl" = 'tdl-0A0B0C0D0F' ORDER BY time DESC
-        String sql = "SELECT \"t\",\"h\",\"p\",\"a0\",\"ta\" FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\" = \'"+devList.get(0)+"\' and  time>="+startTime+"  ORDER BY time ";
-        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
-        //解析经纬度数据
-        List<DeviceDataVo>  deviceDataVos = new ArrayList<>();
-        if(queryResult.getResults().get(0).getSeries() != null){
-            deviceDataVos= getDeviceData(queryResult);
-        }
-        return gson.toJson(deviceDataVos);
-    }
-
-
-    //解析数据
-    public List<LocationDataVo> getLocation(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<LocationDataVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            LocationDataVo historyData = new LocationDataVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setLng(Double.parseDouble(value.get(1).toString()));
-            historyData.setLat(Double.parseDouble(value.get(2).toString()));
-            historyData.setError(0);
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    public List<DeviceDataVo> getDeviceData(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<DeviceDataVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            DeviceDataVo historyData = new DeviceDataVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setTemperature(value.get(1)==null ? "" :value.get(1).toString());
-            historyData.setHumidity(value.get(2)==null  ? "" :value.get(2).toString());
-            historyData.setPressure(value.get(3)==null  ? "" :value.get(3).toString());
-            historyData.setShockEnergy(value.get(4)==null  ? "" :value.get(4).toString());
-            historyData.setTiltAngle(value.get(5)==null  ? "" :value.get(5).toString());
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    public List<TemperatureDataVo> getTemperature(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<TemperatureDataVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            TemperatureDataVo historyData = new TemperatureDataVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    public List<TiltAngleVo> getTiltAngle(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<TiltAngleVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            TiltAngleVo historyData = new TiltAngleVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    public List<ShockEnergyVo> getShockEnergy(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<ShockEnergyVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            ShockEnergyVo historyData = new ShockEnergyVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    public List<HumidityDataVo> getHumidity(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<HumidityDataVo> historyDataList = new ArrayList<>();
-        for(List<Object> value:values){
-            HumidityDataVo historyData = new HumidityDataVo();
-            historyData.setTime(parseTime(value.get(0).toString()));
-            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
-            historyDataList.add(historyData);
-        }
-        return historyDataList;
-    }
-
-    //解析数据格式
-    public List<List<Object>>  getValues( QueryResult  queryResult){
-        List<List<Object>> values = new ArrayList<>();
-        for(QueryResult.Result result : queryResult.getResults()){
-            if(result.getSeries() !=null){
-                for (QueryResult.Series series : result.getSeries()) {
-                    if(series !=null){
-                        values= series.getValues();
-                    }
-                }
-            }
-        }
-        return values;
-    }
-
-    //将utc时间转换成时间戳
-    public static String dateToStamp(String s) throws ParseException {
-        Date date =null ;
-        if(s.length() !=20 ) {
-            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(s);
-        }else{
-            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(s);
-        }
-        return String.valueOf(date.getTime());
-    }
-
-    //解析时间
-    public String parseTime(String time){
-        String dateResult =null;
-        try {
-            dateResult = dateToStamp(time);
-        } catch (ParseException e) {
-            e.printStackTrace();
-            logger.info(e.toString());
-            fb.setCode(0);
-            fb.setMessage("解析时间异常");
-        }
-        return dateResult;
-    }
-
-    //判断两个时间相差多少
-    public static String getDistanceTime(Long time1, Long time2) {
-        //获取当前时区，将时间戳转化成日期时间格式
-        Date t1 = new Date(time1);
-        Date t2 = new Date(time2);
-        int days = differentDays(t1,t2);
-        if(days>0){
-            return  days +"天";
-        }else{
-            return  "a little minute";
-        }
-    }
-
-    public static int differentDays(Date date1,Date date2) {
-        Calendar cal1 = Calendar.getInstance();
-        cal1.setTime(date1);
-
-        Calendar cal2 = Calendar.getInstance();
-        cal2.setTime(date2);
-        int day1= cal1.get(Calendar.DAY_OF_YEAR);
-        int day2 = cal2.get(Calendar.DAY_OF_YEAR);
-
-        int year1 = cal1.get(Calendar.YEAR);
-        int year2 = cal2.get(Calendar.YEAR);
-        if(year1 != year2) { //不同年
-            int timeDistance = 0 ;
-            for(int i = year1 ; i < year2 ; i ++) {
-                if(i%4==0 && i%100!=0 || i%400==0) {   //闰年
-                    timeDistance += 366;
-                } else{    //不是闰年
-                    timeDistance += 365;
-                }
-            }
-            return timeDistance + (day2-day1) ;
-        } else{
-            return day2-day1;
-        }
-    }
-
-    //将时间戳转成时间
-    public static String timeStamp2Date(Long seconds) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        return sdf.format(new Date(seconds));
-    }
-
-    //解析震动时间
-    public List<String> getTime(QueryResult  queryResult){
-        List<List<Object>> values = getValues(queryResult);
-        List<String> time = new ArrayList<>();
-        for(List<Object> value:values){
-            try {
-                time.add(UTCToCST(value.get(0).toString()));
-            }catch (Exception e){
-                e.printStackTrace();
-                logger.info(e.toString());
-            }
-        }
-        return time;
-    }
-
-    public  String UTCToCST(String UTCStr) throws ParseException {
-        Date date =null ;
-        if(UTCStr.length() !=20 ) {
-            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(UTCStr);
-        }else{
-            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(UTCStr);
-        }
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-        calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) + 8);
-        //calendar.getTime() 返回的是Date类型，也可以使用calendar.getTimeInMillis()获取时间戳
-        //format的格式可以任意
-        return String.valueOf(calendar.getTimeInMillis());
-    }
-
-
-    public List<String>  getShockLocation(QueryResult  queryResult){
-        List<List<Object>> values = new ArrayList<>();
-        for(QueryResult.Result result : queryResult.getResults()){
-            if(result.getSeries() !=null){
-                for (QueryResult.Series series : result.getSeries()) {
-                    if(series !=null){
-                        values.add(series.getValues().get(0));
-                    }
-                }
-            }
-        }
-        List<String> timeList = new ArrayList<>();
-        for(List<Object> value:values){
-            timeList.add(parseTime(value.get(0).toString()));
-        }
-        return timeList;
-    }
+//            shockEnergy.setShockEnergyVoList(shockEnergyVos);
+//            shockEnergies.add(shockEnergy);
+//        }
+////        String sql = "SELECT \"a0\"  FROM \"tdl_policy\".\""+devcie+"\" ORDER BY time ";
+////        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+////        List<ShockEnergyVo>  shockEnergyVos = new ArrayList<>();
+////        if(queryResult.getResults().get(0).getSeries() != null){
+////            //解析数据
+////            shockEnergyVos = getShockEnergy(queryResult);
+////        }
+//        return  gson.toJson(shockEnergies);
+//    }
+//
+//
+//    //根据运输编号获取所有的报警数据
+//    @ApiOperation(value = "根据运输编号获取所有的报警数据????",notes = "根据运输编号获取所有的报警数据")
+//    @PostMapping("/getAlarmData")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public  Object  getAlarmData(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        //根据运输编号获取报警信息
+//        List<ResultAlarmLog> alarmLogVoList = alarmLogService.getByTransportationNo(transportationNo);
+//        return  gson.toJson(alarmLogVoList);
+//    }
+//
+//
+//    //根据时间获取经纬度信息
+//    @ApiOperation(value = "根据时间获取经纬度信息",notes = "根据时间获取经纬度信息" +
+//            "transportationNo:运输编号" +
+//            "TDLSN:tdl编号" +
+//            "gatewaySN:网关编号" +
+//            "startCity:出发城市" +
+//            "endCity:目的城市" +
+//            "startTime:出发时间" +
+//            "endTime:到达时间" +
+//            "alarmTime:报警时间" +
+//            "alarmType:报警类型" +
+//            "alarmValue:报警值" +
+//            "lng:经度" +
+//            "lat:纬度")
+//    @PostMapping("/getLocationByTime")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getLocationByTime(@RequestBody LocationVo locationVo ){
+//        //获取线路信息
+//        //获取网关以及tdl信息
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(locationVo.getTransportationNo());
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(locationVo.getTransportationNo());
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(locationVo.getTransportationNo());
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        //根据时间获取坐标信息
+//        String sql ="SELECT \"lng\",\"lat\" FROM \"tdl_policy\".\""+devcie+"\" where time = "+locationVo.getTime() *1000000l;
+//        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//        List<LocationMessageVo>  locationDataVos = new ArrayList<>();
+//        if(queryResult.getResults().get(0).getSeries() != null){
+//            List<List<Object>> values = getValues(queryResult);
+//            for(List<Object> value:values){
+//                LocationMessageVo messageVo = new LocationMessageVo();
+//                messageVo.setTransportationNo(locationVo.getTransportationNo());
+//                messageVo.setGatewaySN(gatewayVo.getSN());
+//                messageVo.setTDLSN(devList);
+//                messageVo.setStartCity(resultCircuitVo.getStartCity());
+//                messageVo.setEndCity(resultCircuitVo.getEndCity());
+//                messageVo.setStartTime(resultCircuitVo.getStartTime());
+//                messageVo.setEndTime(resultCircuitVo.getEndTime());
+//                messageVo.setAlarmTime(Long.valueOf(parseTime(value.get(0).toString())));
+//                messageVo.setAlarmType(locationVo.getAlarmType());
+//                messageVo.setAlarmValue(locationVo.getVlaue());
+//                messageVo.setLng(value.get(1)==null ?  "" : value.get(1).toString());
+//                messageVo.setLat(value.get(2)==null ?  "" : value.get(2).toString());
+//                locationDataVos.add(messageVo);
+//            }
+//        }
+//        return  gson.toJson(locationDataVos);
+//    }
+//
+//
+//    //获取温度、湿度、震动强度、震动能量、倾斜度
+//    @PostMapping("/getDeviceData")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getDeviceData(@RequestBody String transportationNo){
+//        JSONObject jsonObject= JSON.parseObject(transportationNo);
+//        transportationNo=jsonObject.getString("transportationNo");
+//        //获取网关以及tdl信息
+//        ResultCircuitVo resultCircuitVo = circuitService.getByTransportationNo(transportationNo);
+//        ResultGatewayVo gatewayVo = new ResultGatewayVo();
+//        if(resultCircuitVo.getEndTime() == 0){
+//            gatewayVo = circuitService.getByNo(transportationNo);
+//        }else{
+//            gatewayVo = tdlLogService.getByNo(transportationNo);
+//        }
+//        String device = gatewayVo.getType() +"_" +gatewayVo.getSN();
+//        Long startTime = resultCircuitVo.getStartTime() *1000000l;
+//        //获取tdl信息
+//        List<String> devList = tdlDeviceService.getByGatewaySN(gatewayVo.getSN(),gatewayVo.getType());
+//        String devcie=gatewayVo.getType()+"_"+gatewayVo.getSN() ;
+//        //SELECT "h" FROM "tdl_policy"."WTD93LG_20180314" WHERE "tdl" = 'tdl-0A0B0C0D0F' ORDER BY time DESC
+//        String sql = "SELECT \"t\",\"h\",\"p\",\"a0\",\"ta\" FROM \"tdl_policy\".\""+devcie+"\" where \"tdl\" = \'"+devList.get(0)+"\' and  time>="+startTime+"  ORDER BY time ";
+//        QueryResult  queryResult  = influxDBTemplate.query(new Query(sql,database));
+//        //解析经纬度数据
+//        List<DeviceDataVo>  deviceDataVos = new ArrayList<>();
+//        if(queryResult.getResults().get(0).getSeries() != null){
+//            deviceDataVos= getDeviceData(queryResult);
+//        }
+//        return gson.toJson(deviceDataVos);
+//    }
+//
+//
+//    //解析数据
+//    public List<LocationDataVo> getLocation(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<LocationDataVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            LocationDataVo historyData = new LocationDataVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setLng(Double.parseDouble(value.get(1).toString()));
+//            historyData.setLat(Double.parseDouble(value.get(2).toString()));
+//            historyData.setError(0);
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    public List<DeviceDataVo> getDeviceData(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<DeviceDataVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            DeviceDataVo historyData = new DeviceDataVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setTemperature(value.get(1)==null ? "" :value.get(1).toString());
+//            historyData.setHumidity(value.get(2)==null  ? "" :value.get(2).toString());
+//            historyData.setPressure(value.get(3)==null  ? "" :value.get(3).toString());
+//            historyData.setShockEnergy(value.get(4)==null  ? "" :value.get(4).toString());
+//            historyData.setTiltAngle(value.get(5)==null  ? "" :value.get(5).toString());
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    public List<TemperatureDataVo> getTemperature(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<TemperatureDataVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            TemperatureDataVo historyData = new TemperatureDataVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    public List<TiltAngleVo> getTiltAngle(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<TiltAngleVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            TiltAngleVo historyData = new TiltAngleVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    public List<ShockEnergyVo> getShockEnergy(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<ShockEnergyVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            ShockEnergyVo historyData = new ShockEnergyVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    public List<HumidityDataVo> getHumidity(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<HumidityDataVo> historyDataList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            HumidityDataVo historyData = new HumidityDataVo();
+//            historyData.setTime(parseTime(value.get(0).toString()));
+//            historyData.setValue(value.get(1)==null  ? "" :value.get(1).toString());
+//            historyDataList.add(historyData);
+//        }
+//        return historyDataList;
+//    }
+//
+//    //解析数据格式
+//    public List<List<Object>>  getValues( QueryResult  queryResult){
+//        List<List<Object>> values = new ArrayList<>();
+//        for(QueryResult.Result result : queryResult.getResults()){
+//            if(result.getSeries() !=null){
+//                for (QueryResult.Series series : result.getSeries()) {
+//                    if(series !=null){
+//                        values= series.getValues();
+//                    }
+//                }
+//            }
+//        }
+//        return values;
+//    }
+//
+//    //将utc时间转换成时间戳
+//    public static String dateToStamp(String s) throws ParseException {
+//        Date date =null ;
+//        if(s.length() !=20 ) {
+//            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(s);
+//        }else{
+//            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(s);
+//        }
+//        return String.valueOf(date.getTime());
+//    }
+//
+//    //解析时间
+//    public String parseTime(String time){
+//        String dateResult =null;
+//        try {
+//            dateResult = dateToStamp(time);
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//            logger.info(e.toString());
+//            fb.setCode(0);
+//            fb.setMessage("解析时间异常");
+//        }
+//        return dateResult;
+//    }
+//
+//    //判断两个时间相差多少
+//    public static String getDistanceTime(Long time1, Long time2) {
+//        //获取当前时区，将时间戳转化成日期时间格式
+//        Date t1 = new Date(time1);
+//        Date t2 = new Date(time2);
+//        int days = differentDays(t1,t2);
+//        if(days>0){
+//            return  days +"天";
+//        }else{
+//            return  "a little minute";
+//        }
+//    }
+//
+//    public static int differentDays(Date date1,Date date2) {
+//        Calendar cal1 = Calendar.getInstance();
+//        cal1.setTime(date1);
+//
+//        Calendar cal2 = Calendar.getInstance();
+//        cal2.setTime(date2);
+//        int day1= cal1.get(Calendar.DAY_OF_YEAR);
+//        int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+//
+//        int year1 = cal1.get(Calendar.YEAR);
+//        int year2 = cal2.get(Calendar.YEAR);
+//        if(year1 != year2) { //不同年
+//            int timeDistance = 0 ;
+//            for(int i = year1 ; i < year2 ; i ++) {
+//                if(i%4==0 && i%100!=0 || i%400==0) {   //闰年
+//                    timeDistance += 366;
+//                } else{    //不是闰年
+//                    timeDistance += 365;
+//                }
+//            }
+//            return timeDistance + (day2-day1) ;
+//        } else{
+//            return day2-day1;
+//        }
+//    }
+//
+//    //将时间戳转成时间
+//    public static String timeStamp2Date(Long seconds) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        return sdf.format(new Date(seconds));
+//    }
+//
+//    //解析震动时间
+//    public List<String> getTime(QueryResult  queryResult){
+//        List<List<Object>> values = getValues(queryResult);
+//        List<String> time = new ArrayList<>();
+//        for(List<Object> value:values){
+//            try {
+//                time.add(UTCToCST(value.get(0).toString()));
+//            }catch (Exception e){
+//                e.printStackTrace();
+//                logger.info(e.toString());
+//            }
+//        }
+//        return time;
+//    }
+//
+//    public  String UTCToCST(String UTCStr) throws ParseException {
+//        Date date =null ;
+//        if(UTCStr.length() !=20 ) {
+//            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").parse(UTCStr);
+//        }else{
+//            date = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(UTCStr);
+//        }
+//        Calendar calendar = Calendar.getInstance();
+//        calendar.setTime(date);
+//        calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) + 8);
+//        //calendar.getTime() 返回的是Date类型，也可以使用calendar.getTimeInMillis()获取时间戳
+//        //format的格式可以任意
+//        return String.valueOf(calendar.getTimeInMillis());
+//    }
+//
+//
+//    public List<String>  getShockLocation(QueryResult  queryResult){
+//        List<List<Object>> values = new ArrayList<>();
+//        for(QueryResult.Result result : queryResult.getResults()){
+//            if(result.getSeries() !=null){
+//                for (QueryResult.Series series : result.getSeries()) {
+//                    if(series !=null){
+//                        values.add(series.getValues().get(0));
+//                    }
+//                }
+//            }
+//        }
+//        List<String> timeList = new ArrayList<>();
+//        for(List<Object> value:values){
+//            timeList.add(parseTime(value.get(0).toString()));
+//        }
+//        return timeList;
+//    }
 
 }
\ No newline at end of file

src/main/java/com/example/tdl/web/EquipmentBindingController.java

@@ -35,116 +35,116 @@ public class EquipmentBindingController {
 
     Gson gson = new Gson();
 
-    @Autowired
-    private ConfigService configService;
-
-    @Autowired
-    private GatewayService gatewayService;
-
-    @Autowired
-    private TDLDeviceService tdlDeviceService;
-
-    @ApiOperation(value = "绑定gateWay和tdl",notes = "绑定gateWay和tdl" +
-            "   SN：gateWay编号，" +
-            "   type：gateWay类型，" +
-            "   mode：1--运输/2--仓库，" +
-            "   TDLSN：tdl编号，" +
-            "   transportationNo：运输编号，" +
-            "   warehouseNo：仓库编号" )
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @PostMapping("/binding")
-    public Object binding(@RequestBody BindingVo bindingVo){
-        //获取gateWay的信息
-        ResultGatewayVo resultGatewayVo =  gatewayService.getBySNAndType(bindingVo.getSN(),bindingVo.getType());
-        if(resultGatewayVo.getUseScene() !=0 && resultGatewayVo.getUseScene() !=bindingVo.getMode()){
-            fb.setCode(0);
-            fb.setMessage("该网关所属环境与当前不符");
-            return gson.toJson(fb);
-        }
-        //判断当前tdl是否有网关在使用
-        ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(bindingVo.getTDLSN());
-        if(!StringUtils.isEmpty(resultTDLDeviceVo.getGatewaySN())){
-            fb.setCode(0);
-            fb.setMessage("该TDL已经被使用");
-            return gson.toJson(fb);
-        }
-        if(StringUtils.isEmpty(bindingVo.getTransportationNo()) && !StringUtils.isEmpty(bindingVo.getWarehouseNo())){
-            bindingVo.setTransportationNo("");
-        }else if(StringUtils.isEmpty(bindingVo.getWarehouseNo()) && !StringUtils.isEmpty(bindingVo.getTransportationNo())){
-            bindingVo.setWarehouseNo("");
-        }
-        //开始绑定
-        //获取gateway下的所有tdl的编号
-        List<String> devList = tdlDeviceService.getByGatewaySN(bindingVo.getSN(),bindingVo.getType());
-        devList.add(bindingVo.getTDLSN());
-        ConfigCMDVo configCMDVo = new ConfigCMDVo("config",5,15,devList,bindingVo.getMode(),System.currentTimeMillis()/1000l);
-        Map<Object,Object> map=new HashMap<>();
-        map.put("transportationNo",bindingVo.getTransportationNo());
-        map.put("warehouseNo",bindingVo.getWarehouseNo());
-        map.put("useScene",bindingVo.getMode());
-        map.put("gSN",bindingVo.getSN());
-        map.put("gType",bindingVo.getType());
-        map.put("message",gson.toJson(configCMDVo));
-        map.put("flag",false);
-        map.put("resp",null);
-        map.put("state",1);
-        map.put("untie",false);
-        map.put("TDLSN",bindingVo.getTDLSN());
-        map.put("createTime",System.currentTimeMillis());
-        configService.addConfig(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("配置网关成功")){
-            fb.setCode(1);
-            fb.setMessage(msg.get("msg").toString());
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    @ApiOperation(value = "重置tdl",notes = "重置tdl")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @PostMapping("/untie")
-    public Object untie(@RequestBody String TDLSN){
-        JSONObject jsonObject= JSON.parseObject(TDLSN);
-        TDLSN=(String)jsonObject.get("TDLSN");
-        //判断当前tdl是否有网关在使用
-        ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(TDLSN);
-        List<String> devList = tdlDeviceService.getByGatewaySN(resultTDLDeviceVo.getGatewaySN(),resultTDLDeviceVo.getGatewayType());
-        ConfigVo configVo =configService.getConfig(resultTDLDeviceVo.getGatewaySN(),resultTDLDeviceVo.getGatewayType());
-        ConfigCMDVo config = gson.fromJson(configVo.getMessage(),ConfigCMDVo.class);
-        ConfigCMDVo configCMDVo ;
-        Boolean untie = false;
-        if(devList.size()>1){
-            devList.remove(TDLSN);
-            configCMDVo = new ConfigCMDVo("config",config.getGpsPeriod(),config.getGprsPeriod(),devList,config.getMode(),System.currentTimeMillis()/1000l);
-        }else{
-            configCMDVo = config;
-            untie = true;
-        }
-        Map<Object,Object> map=new HashMap<>();
-        map.put("gSN",resultTDLDeviceVo.getGatewaySN());
-        map.put("gType",resultTDLDeviceVo.getGatewayType());
-        map.put("message",gson.toJson(configCMDVo));
-        map.put("untie",untie);
-        map.put("TDLSN",TDLSN);
-        map.put("endTime",System.currentTimeMillis());
-        configService.updateConfig(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("解除网关成功")){
-            fb.setCode(1);
-            fb.setMessage(msg.get("msg").toString());
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return  gson.toJson(fb);
-    }
+//    @Autowired
+//    private ConfigService configService;
+//
+//    @Autowired
+//    private GatewayService gatewayService;
+//
+//    @Autowired
+//    private TDLDeviceService tdlDeviceService;
+//
+//    @ApiOperation(value = "绑定gateWay和tdl",notes = "绑定gateWay和tdl" +
+//            "   SN：gateWay编号，" +
+//            "   type：gateWay类型，" +
+//            "   mode：1--运输/2--仓库，" +
+//            "   TDLSN：tdl编号，" +
+//            "   transportationNo：运输编号，" +
+//            "   warehouseNo：仓库编号" )
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @PostMapping("/binding")
+//    public Object binding(@RequestBody BindingVo bindingVo){
+//        //获取gateWay的信息
+//        ResultGatewayVo resultGatewayVo =  gatewayService.getBySNAndType(bindingVo.getSN(),bindingVo.getType());
+//        if(resultGatewayVo.getUseScene() !=0 && resultGatewayVo.getUseScene() !=bindingVo.getMode()){
+//            fb.setCode(0);
+//            fb.setMessage("该网关所属环境与当前不符");
+//            return gson.toJson(fb);
+//        }
+//        //判断当前tdl是否有网关在使用
+//        ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(bindingVo.getTDLSN());
+//        if(!StringUtils.isEmpty(resultTDLDeviceVo.getGatewaySN())){
+//            fb.setCode(0);
+//            fb.setMessage("该TDL已经被使用");
+//            return gson.toJson(fb);
+//        }
+//        if(StringUtils.isEmpty(bindingVo.getTransportationNo()) && !StringUtils.isEmpty(bindingVo.getWarehouseNo())){
+//            bindingVo.setTransportationNo("");
+//        }else if(StringUtils.isEmpty(bindingVo.getWarehouseNo()) && !StringUtils.isEmpty(bindingVo.getTransportationNo())){
+//            bindingVo.setWarehouseNo("");
+//        }
+//        //开始绑定
+//        //获取gateway下的所有tdl的编号
+//        List<String> devList = tdlDeviceService.getByGatewaySN(bindingVo.getSN(),bindingVo.getType());
+//        devList.add(bindingVo.getTDLSN());
+//        ConfigCMDVo configCMDVo = new ConfigCMDVo("config",5,15,devList,bindingVo.getMode(),System.currentTimeMillis()/1000l);
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("transportationNo",bindingVo.getTransportationNo());
+//        map.put("warehouseNo",bindingVo.getWarehouseNo());
+//        map.put("useScene",bindingVo.getMode());
+//        map.put("gSN",bindingVo.getSN());
+//        map.put("gType",bindingVo.getType());
+//        map.put("message",gson.toJson(configCMDVo));
+//        map.put("flag",false);
+//        map.put("resp",null);
+//        map.put("state",1);
+//        map.put("untie",false);
+//        map.put("TDLSN",bindingVo.getTDLSN());
+//        map.put("createTime",System.currentTimeMillis());
+//        configService.addConfig(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("配置网关成功")){
+//            fb.setCode(1);
+//            fb.setMessage(msg.get("msg").toString());
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    @ApiOperation(value = "重置tdl",notes = "重置tdl")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @PostMapping("/untie")
+//    public Object untie(@RequestBody String TDLSN){
+//        JSONObject jsonObject= JSON.parseObject(TDLSN);
+//        TDLSN=(String)jsonObject.get("TDLSN");
+//        //判断当前tdl是否有网关在使用
+//        ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(TDLSN);
+//        List<String> devList = tdlDeviceService.getByGatewaySN(resultTDLDeviceVo.getGatewaySN(),resultTDLDeviceVo.getGatewayType());
+//        ConfigVo configVo =configService.getConfig(resultTDLDeviceVo.getGatewaySN(),resultTDLDeviceVo.getGatewayType());
+//        ConfigCMDVo config = gson.fromJson(configVo.getMessage(),ConfigCMDVo.class);
+//        ConfigCMDVo configCMDVo ;
+//        Boolean untie = false;
+//        if(devList.size()>1){
+//            devList.remove(TDLSN);
+//            configCMDVo = new ConfigCMDVo("config",config.getGpsPeriod(),config.getGprsPeriod(),devList,config.getMode(),System.currentTimeMillis()/1000l);
+//        }else{
+//            configCMDVo = config;
+//            untie = true;
+//        }
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("gSN",resultTDLDeviceVo.getGatewaySN());
+//        map.put("gType",resultTDLDeviceVo.getGatewayType());
+//        map.put("message",gson.toJson(configCMDVo));
+//        map.put("untie",untie);
+//        map.put("TDLSN",TDLSN);
+//        map.put("endTime",System.currentTimeMillis());
+//        configService.updateConfig(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("解除网关成功")){
+//            fb.setCode(1);
+//            fb.setMessage(msg.get("msg").toString());
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return  gson.toJson(fb);
+//    }
 }

src/main/java/com/example/tdl/web/HomePageController.java

@@ -9,7 +9,6 @@ import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,92 +25,92 @@ public class HomePageController {
 
     CommFeedback fb = new CommFeedback();
 
-    @Autowired
-    private CircuitService circuitService;
-
-    @Autowired
-    private AlarmLogService alarmLogServcie;
-
-    //获取当天所有的设备数据
-    @ApiOperation(value = "获取所有的运输数据",notes = "获取运输设备数据：" +
-            "sum:总数量" +
-            "onRoute:在途数量" +
-            "complted:已完成数量" +
-            "alarmed: 报警数量" +
-            "routeVoList: " +
-                "transportationNo:线路编号（R+TyyyyMMdd+运输方式+四位随机数）"+
-                "routeName:路由名称（出发地-启运地）"+
-                "startLongitude:启运经度"+
-                "startLatitude:启运纬度"+
-                "startCity:启运市"+
-                "startTime:开始时间"+
-                "endLongitude:目的经度"+
-                "endLatitude:目的纬度"+
-                "endCity:目的市"+
-                "endTime:结束时间"+
-                "transport:运输方式（T铁路，G汽运，H海运，K空运，D快递）"+
-                "boxNo:箱单号" +
-                "containerNo:集装箱号/车牌号" +
-                "deliveryAddress:交付地点" +
-                "transportationType:运输类型" +
-                "circuitState:线路状态"+
-                "remark:备注" +
-            "alarmLogVoList :"+
-                "routeName:线路名称"+
-                "description:报警描述" +
-                "data:数据"+
-                "alarmTime:报警时间")
-    @GetMapping("/getAll")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getAll(){
-        HomePageDataVo dataVo = new HomePageDataVo();
-        //获取所有的线路信息
-        List<CircuitVo> resultCircuitVos = circuitService.getDistinct();
-        //获取所有的报警
-        List<AlarmLogVo> alarmLogVos = alarmLogServcie.getAll();
-        // 获取所有的路线数量
-        dataVo.setRouteVoList(resultCircuitVos);//路线列表
-        dataVo.setAlarmLogVoList(alarmLogVos);//报警列表
-        Integer sum = circuitService.getCount();
-        dataVo.setSum(sum);//总数量
-        Integer onRoute = circuitService.getOnRoute();
-        dataVo.setOnRoute(onRoute);//在途数量
-        //获取已经完成的数量
-        Integer finished = circuitService.getComplted();
-        dataVo.setComplted(finished);//已完成数量
-        Integer alarmed = alarmLogServcie.getCount();
-        dataVo.setAlarmed(alarmed);//报警数量
-        return gson.toJson(dataVo);
-    }
-
-
-    //根据条件获取路线数据(所有的)
-    @ApiOperation(value = "根据条件获取运输数据",notes = "传值：" +
-            "time:时间(1,3,7,30...)" +
-            "evaluation:评价" )
-    @PostMapping("/getByTerm")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object getByTerm(@RequestBody TermVo termVo){
-        HomePageDataVo dataVo = new HomePageDataVo();
-        List<CircuitVo> resultCircuitVoList = circuitService.getByTime(termVo.getTime());//所有的路线
-        List<AlarmLogVo> alarmLogVos = alarmLogServcie.getAlarmLog(termVo.getTime());
-        dataVo.setRouteVoList(resultCircuitVoList);//路线列表
-        dataVo.setAlarmLogVoList(alarmLogVos);//报警列表
-        Integer sum = circuitService.getCount();
-        dataVo.setSum(sum);//总数量
-        //获取已经完成的数量
-        Integer onRoute = circuitService.getOnRoute();
-        dataVo.setOnRoute(onRoute);//在途数量
-        //获取已经完成的数量
-        Integer finished = circuitService.getComplted();
-        dataVo.setComplted(finished);//已完成数量
-        Integer alarmed = alarmLogServcie.getCount();
-        dataVo.setAlarmed(alarmed);//报警数量
-        return gson.toJson(dataVo);
-    }
+//    @Autowired
+//    private CircuitService circuitService;
+//
+//    @Autowired
+//    private AlarmLogService alarmLogServcie;
+//
+//    //获取当天所有的设备数据
+//    @ApiOperation(value = "获取所有的运输数据",notes = "获取运输设备数据：" +
+//            "sum:总数量" +
+//            "onRoute:在途数量" +
+//            "complted:已完成数量" +
+//            "alarmed: 报警数量" +
+//            "routeVoList: " +
+//                "transportationNo:线路编号（R+TyyyyMMdd+运输方式+四位随机数）"+
+//                "routeName:路由名称（出发地-启运地）"+
+//                "startLongitude:启运经度"+
+//                "startLatitude:启运纬度"+
+//                "startCity:启运市"+
+//                "startTime:开始时间"+
+//                "endLongitude:目的经度"+
+//                "endLatitude:目的纬度"+
+//                "endCity:目的市"+
+//                "endTime:结束时间"+
+//                "transport:运输方式（T铁路，G汽运，H海运，K空运，D快递）"+
+//                "boxNo:箱单号" +
+//                "containerNo:集装箱号/车牌号" +
+//                "deliveryAddress:交付地点" +
+//                "transportationType:运输类型" +
+//                "circuitState:线路状态"+
+//                "remark:备注" +
+//            "alarmLogVoList :"+
+//                "routeName:线路名称"+
+//                "description:报警描述" +
+//                "data:数据"+
+//                "alarmTime:报警时间")
+//    @GetMapping("/getAll")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getAll(){
+//        HomePageDataVo dataVo = new HomePageDataVo();
+//        //获取所有的线路信息
+//        List<CircuitVo> resultCircuitVos = circuitService.getDistinct();
+//        //获取所有的报警
+//        List<AlarmLogVo> alarmLogVos = alarmLogServcie.getAll();
+//        // 获取所有的路线数量
+//        dataVo.setRouteVoList(resultCircuitVos);//路线列表
+//        dataVo.setAlarmLogVoList(alarmLogVos);//报警列表
+//        Integer sum = circuitService.getCount();
+//        dataVo.setSum(sum);//总数量
+//        Integer onRoute = circuitService.getOnRoute();
+//        dataVo.setOnRoute(onRoute);//在途数量
+//        //获取已经完成的数量
+//        Integer finished = circuitService.getComplted();
+//        dataVo.setComplted(finished);//已完成数量
+//        Integer alarmed = alarmLogServcie.getCount();
+//        dataVo.setAlarmed(alarmed);//报警数量
+//        return gson.toJson(dataVo);
+//    }
+//
+//
+//    //根据条件获取路线数据(所有的)
+//    @ApiOperation(value = "根据条件获取运输数据",notes = "传值：" +
+//            "time:时间(1,3,7,30...)" +
+//            "evaluation:评价" )
+//    @PostMapping("/getByTerm")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object getByTerm(@RequestBody TermVo termVo){
+//        HomePageDataVo dataVo = new HomePageDataVo();
+//        List<CircuitVo> resultCircuitVoList = circuitService.getByTime(termVo.getTime());//所有的路线
+//        List<AlarmLogVo> alarmLogVos = alarmLogServcie.getAlarmLog(termVo.getTime());
+//        dataVo.setRouteVoList(resultCircuitVoList);//路线列表
+//        dataVo.setAlarmLogVoList(alarmLogVos);//报警列表
+//        Integer sum = circuitService.getCount();
+//        dataVo.setSum(sum);//总数量
+//        //获取已经完成的数量
+//        Integer onRoute = circuitService.getOnRoute();
+//        dataVo.setOnRoute(onRoute);//在途数量
+//        //获取已经完成的数量
+//        Integer finished = circuitService.getComplted();
+//        dataVo.setComplted(finished);//已完成数量
+//        Integer alarmed = alarmLogServcie.getCount();
+//        dataVo.setAlarmed(alarmed);//报警数量
+//        return gson.toJson(dataVo);
+//    }
 
 }

src/main/java/com/example/tdl/web/RouteController.java

@@ -39,344 +39,344 @@ public class RouteController {
 
     Gson gson=new Gson();
 
-    @Autowired
-    private RouteService routeService=new RouteService();
-
-    @Autowired
-    private TokenRedisService tokenRedisService;
-
-
-    //查询所有路由信息
-    @ApiOperation(value = "查询所有路由信息",notes = "查询所有路由信息，返回值说明：" +
-            "   routeNumber：路由编号，" +
-            "   routeName：路由名称，" +
-            "   startCountry： 启运国家，" +
-            "   startProvince：启运省，" +
-            "   startCity：启运市，" +
-            "   endCountry：目的国家，" +
-            "   endProvince：目的省，" +
-            "   endCity：目的市，" +
-            "   transport：运输方式，" +
-            "   remark：路由备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getAll",method = RequestMethod.GET)
-    public Object getAll(){
-        return routeService.getAll();
-    }
-
-    //根据条件查询路由信息
-    @ApiOperation(value = "根据条件查询路由信息",notes = "根据条件查询路由信息，传值说明：" +
-            "   routeNumber：路由编号，" +
-            "   routeName：路由名称，" +
-            "   startCity：启运市，" +
-            "   endCity：目的市，" +
-            "   transport：运输方式。" +
-            "--------------------" +
-            "返回值说明：" +
-            "   routeNumber：路由编号，" +
-            "   routeName：路由名称，" +
-            "   startCountry： 启运国家，" +
-            "   startProvince：启运省，" +
-            "   startCity：启运市，" +
-            "   endCountry：目的国家，" +
-            "   endProvince：目的省，" +
-            "   endCity：目的市，" +
-            "   transport：运输方式，" +
-            "   remark：路由备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getRouteByTerm",method = RequestMethod.POST)
-    public Object getRouteByTerm(@RequestBody RouteTermVo routeTermVo){
-        return routeService.getRouteByTerm(routeTermVo);
-    }
-
-    @ApiOperation(value = "添加路由信息",notes = "添加路由信息，都要传，说明：" +
-            "   startCountry： 启运国家，" +
-            "   startProvince：启运省，" +
-            "   startCity：启运市，" +
-            "   endCountry：目的国家，" +
-            "   endProvince：目的省，" +
-            "   endCity：目的市，" +
-            "   transport：运输方式，" +
-            "   remark：路由备注")
-    @ApiImplicitParams({
-        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/addRoute",method = RequestMethod.POST)
-    public Object addRoute(@RequestBody AddRouteVo addRouteVo){
-        if (StringUtils.isEmpty(addRouteVo.getStartCountry())){
-            fb.setCode(0);
-            fb.setMessage("启运国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addRouteVo.getStartCity())){
-            fb.setCode(0);
-            fb.setMessage("启运市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addRouteVo.getEndCountry())){
-            fb.setCode(0);
-            fb.setMessage("目的国不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addRouteVo.getEndCity())){
-            fb.setCode(0);
-            fb.setMessage("目的市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addRouteVo.getTransport())){
-            fb.setCode(0);
-            fb.setMessage("运输方式不能为空");
-            return gson.toJson(fb);
-        }
-        if (!addRouteVo.getTransport().equals("铁路")&&
-                !addRouteVo.getTransport().equals("汽运")&&
-                !addRouteVo.getTransport().equals("海运")&&
-                !addRouteVo.getTransport().equals("空运")&&
-                !addRouteVo.getTransport().equals("快递")){
-            fb.setCode(0);
-            fb.setMessage("请选择正确的运输方式");
-            return gson.toJson(fb);
-        }
-        String routeName=addRouteVo.getStartCountry()+addRouteVo.getStartCity()+"_"+addRouteVo.getEndCountry()+addRouteVo.getEndCity();
-        Date day=new Date();
-        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
-        String routeNumbers="RT"+df.format(day);
-        if (addRouteVo.getTransport().equals("汽运")){
-            routeNumbers=routeNumbers+"G";
-            routeName=routeName+"_汽运";
-        }
-        if (addRouteVo.getTransport().equals("铁路")){
-            routeNumbers=routeNumbers+"T";
-            routeName=routeName+"_铁路";
-        }
-        if (addRouteVo.getTransport().equals("空运")){
-            routeNumbers=routeNumbers+"K";
-            routeName=routeName+"_空运";
-        }
-        if (addRouteVo.getTransport().equals("快递")){
-            routeNumbers=routeNumbers+"D";
-            routeName=routeName+"_快递";
-        }
-        if (addRouteVo.getTransport().equals("海运")){
-            routeNumbers=routeNumbers+"H";
-            routeName=routeName+"_海运";
-        }
-        String routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
-        if (routeService.getByRouteNumber(routeNumber)>0){
-            while (routeService.getByRouteNumber(routeNumber)>0){
-                routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
-            }
-        }
-        if (routeService.getInfoByRouteName(routeName)!=null){
-            fb.setCode(0);
-            fb.setMessage("该路由已存在");
-            return gson.toJson(fb);
-        }
-        Map<Object,Object> map=new HashMap<>();
-        map.put("routeNumber",routeNumber);
-        map.put("routeName",routeName);
-        map.put("startCountry",addRouteVo.getStartCountry());
-        map.put("startProvince",addRouteVo.getStartProvince());
-        map.put("startCity",addRouteVo.getStartCity());
-        map.put("endCountry",addRouteVo.getEndCountry());
-        map.put("endProvince",addRouteVo.getEndProvince());
-        map.put("endCity",addRouteVo.getEndCity());
-        map.put("transport",addRouteVo.getTransport());
-        map.put("createTime",System.currentTimeMillis());
-        map.put("updateTime",System.currentTimeMillis());
-        map.put("remark",addRouteVo.getRemark());
-        routeService.addRoute(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("添加路由成功")){
-            fb.setCode(1);
-            fb.setMessage("添加路由成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    //删除路由信息
-    @ApiOperation(value = "删除路由信息",notes = "删除路由信息，传递参数：{\"routeNumber\":\"需要删除的路由编号\"}")
-    @RequestMapping(value="/delRoute",method = RequestMethod.POST)
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    public Object delRoute(@RequestBody String routeNumber){
-        JSONObject jsonObject= JSON.parseObject(routeNumber);
-        routeNumber=(String)jsonObject.get("routeNumber");
-        if (StringUtils.isEmpty(routeNumber)){
-            fb.setCode(0);
-            fb.setMessage("需要删除的路由编号不能为空");
-            return gson.toJson(fb);
-        }
-        int a=routeService.delRoute(routeNumber);
-        if (a>0){
-            fb.setCode(1);
-            fb.setMessage("删除路由信息成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage("删除路由信息失败");
-        }
-        return gson.toJson(fb);
-    }
-
-
-
-
-
-//    @ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" +
+//    @Autowired
+//    private RouteService routeService=new RouteService();
+//
+//    @Autowired
+//    private TokenRedisService tokenRedisService;
+//
+//
+//    //查询所有路由信息
+//    @ApiOperation(value = "查询所有路由信息",notes = "查询所有路由信息，返回值说明：" +
 //            "   routeNumber：路由编号，" +
 //            "   routeName：路由名称，" +
-//            "   abbreviation：名称缩写，" +
-//            "   startLongitude：启运经度，" +
-//            "   startLatitude：启运纬度，" +
 //            "   startCountry： 启运国家，" +
 //            "   startProvince：启运省，" +
 //            "   startCity：启运市，" +
-//            "   startAddress：启运地址，" +
-//            "   endLongitude：目的经度，" +
-//            "   endLatitude：目的纬度，" +
 //            "   endCountry：目的国家，" +
 //            "   endProvince：目的省，" +
 //            "   endCity：目的市，" +
-//            "   endAddress：目的地址，" +
 //            "   transport：运输方式，" +
-//            "   transportRemark：运输方式备注，" +
 //            "   remark：路由备注")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
 //    })
-//    @RequestMapping(value="/updateRoute",method = RequestMethod.POST)
-//    public Object updateRoute(@RequestBody UpdateRouteVo updateRouteVo){
-//        if (StringUtils.isEmpty(updateRouteVo.getStartLatitude())){
-//            fb.setCode(0);
-//            fb.setMessage("启运纬度不能为空");
-//            return gson.toJson(fb);
+//    @RequestMapping(value="/getAll",method = RequestMethod.GET)
+//    public Object getAll(){
+//        return routeService.getAll();
 //    }
-//        if (StringUtils.isEmpty(updateRouteVo.getStartLongitude())){
-//            fb.setCode(0);
-//            fb.setMessage("启运经度不能为空");
-//            return gson.toJson(fb);
+//
+//    //根据条件查询路由信息
+//    @ApiOperation(value = "根据条件查询路由信息",notes = "根据条件查询路由信息，传值说明：" +
+//            "   routeNumber：路由编号，" +
+//            "   routeName：路由名称，" +
+//            "   startCity：启运市，" +
+//            "   endCity：目的市，" +
+//            "   transport：运输方式。" +
+//            "--------------------" +
+//            "返回值说明：" +
+//            "   routeNumber：路由编号，" +
+//            "   routeName：路由名称，" +
+//            "   startCountry： 启运国家，" +
+//            "   startProvince：启运省，" +
+//            "   startCity：启运市，" +
+//            "   endCountry：目的国家，" +
+//            "   endProvince：目的省，" +
+//            "   endCity：目的市，" +
+//            "   transport：运输方式，" +
+//            "   remark：路由备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getRouteByTerm",method = RequestMethod.POST)
+//    public Object getRouteByTerm(@RequestBody RouteTermVo routeTermVo){
+//        return routeService.getRouteByTerm(routeTermVo);
 //    }
-//        if(!updateRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//
+//    @ApiOperation(value = "添加路由信息",notes = "添加路由信息，都要传，说明：" +
+//            "   startCountry： 启运国家，" +
+//            "   startProvince：启运省，" +
+//            "   startCity：启运市，" +
+//            "   endCountry：目的国家，" +
+//            "   endProvince：目的省，" +
+//            "   endCity：目的市，" +
+//            "   transport：运输方式，" +
+//            "   remark：路由备注")
+//    @ApiImplicitParams({
+//        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/addRoute",method = RequestMethod.POST)
+//    public Object addRoute(@RequestBody AddRouteVo addRouteVo){
+//        if (StringUtils.isEmpty(addRouteVo.getStartCountry())){
 //            fb.setCode(0);
-//            fb.setMessage("启运纬度的范围为-90~90");
+//            fb.setMessage("启运国不能为空");
 //            return gson.toJson(fb);
 //        }
-//        if(!updateRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//        if (StringUtils.isEmpty(addRouteVo.getStartCity())){
 //            fb.setCode(0);
-//            fb.setMessage("启运经度的范围为-180~180");
+//            fb.setMessage("启运市不能为空");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getStartCountry())){
+//        if (StringUtils.isEmpty(addRouteVo.getEndCountry())){
 //            fb.setCode(0);
-//            fb.setMessage("启运国不能为空");
+//            fb.setMessage("目的国不能为空");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getStartProvince())){
+//        if (StringUtils.isEmpty(addRouteVo.getEndCity())){
 //            fb.setCode(0);
-//            fb.setMessage("启运省不能为空");
+//            fb.setMessage("目的市不能为空");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getStartCity())){
+//        if (StringUtils.isEmpty(addRouteVo.getTransport())){
 //            fb.setCode(0);
-//            fb.setMessage("启运市不能为空");
+//            fb.setMessage("运输方式不能为空");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getStartAddress())){
+//        if (!addRouteVo.getTransport().equals("铁路")&&
+//                !addRouteVo.getTransport().equals("汽运")&&
+//                !addRouteVo.getTransport().equals("海运")&&
+//                !addRouteVo.getTransport().equals("空运")&&
+//                !addRouteVo.getTransport().equals("快递")){
 //            fb.setCode(0);
-//            fb.setMessage("启运地址不能为空");
+//            fb.setMessage("请选择正确的运输方式");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndLatitude())){
-//            fb.setCode(0);
-//            fb.setMessage("目的纬度不能为空");
-//            return gson.toJson(fb);
+//        String routeName=addRouteVo.getStartCountry()+addRouteVo.getStartCity()+"_"+addRouteVo.getEndCountry()+addRouteVo.getEndCity();
+//        Date day=new Date();
+//        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
+//        String routeNumbers="RT"+df.format(day);
+//        if (addRouteVo.getTransport().equals("汽运")){
+//            routeNumbers=routeNumbers+"G";
+//            routeName=routeName+"_汽运";
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndLongitude())){
-//            fb.setCode(0);
-//            fb.setMessage("目的经度不能为空");
-//            return gson.toJson(fb);
+//        if (addRouteVo.getTransport().equals("铁路")){
+//            routeNumbers=routeNumbers+"T";
+//            routeName=routeName+"_铁路";
 //        }
-//        if(!updateRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-//            fb.setCode(0);
-//            fb.setMessage("目的纬度的范围为-90~90");
-//            return gson.toJson(fb);
+//        if (addRouteVo.getTransport().equals("空运")){
+//            routeNumbers=routeNumbers+"K";
+//            routeName=routeName+"_空运";
 //        }
-//        if(!updateRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-//            fb.setCode(0);
-//            fb.setMessage("目的经度的范围为-180~180");
-//            return gson.toJson(fb);
+//        if (addRouteVo.getTransport().equals("快递")){
+//            routeNumbers=routeNumbers+"D";
+//            routeName=routeName+"_快递";
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndCountry())){
-//            fb.setCode(0);
-//            fb.setMessage("目的国不能为空");
-//            return gson.toJson(fb);
+//        if (addRouteVo.getTransport().equals("海运")){
+//            routeNumbers=routeNumbers+"H";
+//            routeName=routeName+"_海运";
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndProvince())){
-//            fb.setCode(0);
-//            fb.setMessage("目的省不能为空");
-//            return gson.toJson(fb);
+//        String routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
+//        if (routeService.getByRouteNumber(routeNumber)>0){
+//            while (routeService.getByRouteNumber(routeNumber)>0){
+//                routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
 //            }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndCity())){
-//            fb.setCode(0);
-//            fb.setMessage("目的市不能为空");
-//            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getEndAddress())){
+//        if (routeService.getInfoByRouteName(routeName)!=null){
 //            fb.setCode(0);
-//            fb.setMessage("目的地址不能为空");
+//            fb.setMessage("该路由已存在");
 //            return gson.toJson(fb);
 //        }
-//        if (StringUtils.isEmpty(updateRouteVo.getTransport())){
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("routeNumber",routeNumber);
+//        map.put("routeName",routeName);
+//        map.put("startCountry",addRouteVo.getStartCountry());
+//        map.put("startProvince",addRouteVo.getStartProvince());
+//        map.put("startCity",addRouteVo.getStartCity());
+//        map.put("endCountry",addRouteVo.getEndCountry());
+//        map.put("endProvince",addRouteVo.getEndProvince());
+//        map.put("endCity",addRouteVo.getEndCity());
+//        map.put("transport",addRouteVo.getTransport());
+//        map.put("createTime",System.currentTimeMillis());
+//        map.put("updateTime",System.currentTimeMillis());
+//        map.put("remark",addRouteVo.getRemark());
+//        routeService.addRoute(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("添加路由成功")){
+//            fb.setCode(1);
+//            fb.setMessage("添加路由成功");
+//        }else{
 //            fb.setCode(0);
-//            fb.setMessage("运输方式不能为空");
+//            fb.setMessage(msg.get("msg").toString());
+//        }
 //        return gson.toJson(fb);
 //    }
-//        if (!updateRouteVo.getTransport().equals("铁路")&&!updateRouteVo.getTransport().equals("汽运")&&!updateRouteVo.getTransport().equals("海运")&&
-//                !updateRouteVo.getTransport().equals("空运")&&!updateRouteVo.getTransport().equals("快递")){
+//
+//    //删除路由信息
+//    @ApiOperation(value = "删除路由信息",notes = "删除路由信息，传递参数：{\"routeNumber\":\"需要删除的路由编号\"}")
+//    @RequestMapping(value="/delRoute",method = RequestMethod.POST)
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    public Object delRoute(@RequestBody String routeNumber){
+//        JSONObject jsonObject= JSON.parseObject(routeNumber);
+//        routeNumber=(String)jsonObject.get("routeNumber");
+//        if (StringUtils.isEmpty(routeNumber)){
 //            fb.setCode(0);
-//            fb.setMessage("请选择正确的运输方式");
+//            fb.setMessage("需要删除的路由编号不能为空");
 //            return gson.toJson(fb);
 //        }
-//        String routeName=updateRouteVo.getStartCity()+"-"+updateRouteVo.getEndCity();
-//        String abbreviation=routeName;
-//        if (updateRouteVo.getTransport().equals("汽运")){
-//            abbreviation=abbreviation+"-G";
-//        }
-//        if (updateRouteVo.getTransport().equals("铁路")){
-//            abbreviation=abbreviation+"-T";
-//        }
-//        if (updateRouteVo.getTransport().equals("空运")){
-//            abbreviation=abbreviation+"-K";
-//        }
-//        if (updateRouteVo.getTransport().equals("快递")){
-//            abbreviation=abbreviation+"-D";
-//        }
-//        if (updateRouteVo.getTransport().equals("海运")){
-//            abbreviation=abbreviation+"-H";
-//        }
-//        int a=routeService.updateRoute(new Route(updateRouteVo.getRouteNumber(),routeName,abbreviation,updateRouteVo.getStartLongitude(),updateRouteVo.getStartLatitude(),
-//                updateRouteVo.getStartCountry(),updateRouteVo.getStartProvince(),updateRouteVo.getStartCity(),updateRouteVo.getStartAddress(),
-//                updateRouteVo.getEndLongitude(),updateRouteVo.getEndLatitude(),updateRouteVo.getEndCountry(),updateRouteVo.getEndProvince(),updateRouteVo.getEndCity(),
-//                updateRouteVo.getEndAddress(),updateRouteVo.getTransport(),updateRouteVo.getTransportRemark(),System.currentTimeMillis(),updateRouteVo.getRemark()));
+//        int a=routeService.delRoute(routeNumber);
 //        if (a>0){
 //            fb.setCode(1);
-//            fb.setMessage("修改路由成功");
+//            fb.setMessage("删除路由信息成功");
 //        }else{
 //            fb.setCode(0);
-//            fb.setMessage("修改路由失败");
+//            fb.setMessage("删除路由信息失败");
 //        }
 //        return gson.toJson(fb);
-//
 //    }
+//
+//
+//
+//
+//
+////    @ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" +
+////            "   routeNumber：路由编号，" +
+////            "   routeName：路由名称，" +
+////            "   abbreviation：名称缩写，" +
+////            "   startLongitude：启运经度，" +
+////            "   startLatitude：启运纬度，" +
+////            "   startCountry： 启运国家，" +
+////            "   startProvince：启运省，" +
+////            "   startCity：启运市，" +
+////            "   startAddress：启运地址，" +
+////            "   endLongitude：目的经度，" +
+////            "   endLatitude：目的纬度，" +
+////            "   endCountry：目的国家，" +
+////            "   endProvince：目的省，" +
+////            "   endCity：目的市，" +
+////            "   endAddress：目的地址，" +
+////            "   transport：运输方式，" +
+////            "   transportRemark：运输方式备注，" +
+////            "   remark：路由备注")
+////    @ApiImplicitParams({
+////            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+////    })
+////    @RequestMapping(value="/updateRoute",method = RequestMethod.POST)
+////    public Object updateRoute(@RequestBody UpdateRouteVo updateRouteVo){
+////        if (StringUtils.isEmpty(updateRouteVo.getStartLatitude())){
+////            fb.setCode(0);
+////            fb.setMessage("启运纬度不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getStartLongitude())){
+////            fb.setCode(0);
+////            fb.setMessage("启运经度不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if(!updateRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+////            fb.setCode(0);
+////            fb.setMessage("启运纬度的范围为-90~90");
+////            return gson.toJson(fb);
+////        }
+////        if(!updateRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+////            fb.setCode(0);
+////            fb.setMessage("启运经度的范围为-180~180");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getStartCountry())){
+////            fb.setCode(0);
+////            fb.setMessage("启运国不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getStartProvince())){
+////            fb.setCode(0);
+////            fb.setMessage("启运省不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getStartCity())){
+////            fb.setCode(0);
+////            fb.setMessage("启运市不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getStartAddress())){
+////            fb.setCode(0);
+////            fb.setMessage("启运地址不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndLatitude())){
+////            fb.setCode(0);
+////            fb.setMessage("目的纬度不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndLongitude())){
+////            fb.setCode(0);
+////            fb.setMessage("目的经度不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if(!updateRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+////            fb.setCode(0);
+////            fb.setMessage("目的纬度的范围为-90~90");
+////            return gson.toJson(fb);
+////        }
+////        if(!updateRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+////            fb.setCode(0);
+////            fb.setMessage("目的经度的范围为-180~180");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndCountry())){
+////            fb.setCode(0);
+////            fb.setMessage("目的国不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndProvince())){
+////            fb.setCode(0);
+////            fb.setMessage("目的省不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndCity())){
+////            fb.setCode(0);
+////            fb.setMessage("目的市不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getEndAddress())){
+////            fb.setCode(0);
+////            fb.setMessage("目的地址不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (StringUtils.isEmpty(updateRouteVo.getTransport())){
+////            fb.setCode(0);
+////            fb.setMessage("运输方式不能为空");
+////            return gson.toJson(fb);
+////        }
+////        if (!updateRouteVo.getTransport().equals("铁路")&&!updateRouteVo.getTransport().equals("汽运")&&!updateRouteVo.getTransport().equals("海运")&&
+////                !updateRouteVo.getTransport().equals("空运")&&!updateRouteVo.getTransport().equals("快递")){
+////            fb.setCode(0);
+////            fb.setMessage("请选择正确的运输方式");
+////            return gson.toJson(fb);
+////        }
+////        String routeName=updateRouteVo.getStartCity()+"-"+updateRouteVo.getEndCity();
+////        String abbreviation=routeName;
+////        if (updateRouteVo.getTransport().equals("汽运")){
+////            abbreviation=abbreviation+"-G";
+////        }
+////        if (updateRouteVo.getTransport().equals("铁路")){
+////            abbreviation=abbreviation+"-T";
+////        }
+////        if (updateRouteVo.getTransport().equals("空运")){
+////            abbreviation=abbreviation+"-K";
+////        }
+////        if (updateRouteVo.getTransport().equals("快递")){
+////            abbreviation=abbreviation+"-D";
+////        }
+////        if (updateRouteVo.getTransport().equals("海运")){
+////            abbreviation=abbreviation+"-H";
+////        }
+////        int a=routeService.updateRoute(new Route(updateRouteVo.getRouteNumber(),routeName,abbreviation,updateRouteVo.getStartLongitude(),updateRouteVo.getStartLatitude(),
+////                updateRouteVo.getStartCountry(),updateRouteVo.getStartProvince(),updateRouteVo.getStartCity(),updateRouteVo.getStartAddress(),
+////                updateRouteVo.getEndLongitude(),updateRouteVo.getEndLatitude(),updateRouteVo.getEndCountry(),updateRouteVo.getEndProvince(),updateRouteVo.getEndCity(),
+////                updateRouteVo.getEndAddress(),updateRouteVo.getTransport(),updateRouteVo.getTransportRemark(),System.currentTimeMillis(),updateRouteVo.getRemark()));
+////        if (a>0){
+////            fb.setCode(1);
+////            fb.setMessage("修改路由成功");
+////        }else{
+////            fb.setCode(0);
+////            fb.setMessage("修改路由失败");
+////        }
+////        return gson.toJson(fb);
+////
+////    }
 
 
 

src/main/java/com/example/tdl/web/UserRouteController.java

@@ -37,242 +37,242 @@ public class UserRouteController {
 
     Gson gson=new Gson();
 
-    @Autowired
-    private UserRouteService userRouteService;
-
-    @Autowired
-    private TokenRedisService tokenRedisService;
-
-
-    //根据用户编号查询用户常用地址
-    @ApiOperation(value = "根据用户编号查询用户常用地址",notes = "根据用户编号查询用户常用地址")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/getByUserNumber",method = RequestMethod.GET)
-    public Object getByUserNumber(HttpServletRequest request){
-        String token = request.getHeader("Account_token");
-        String datum = tokenRedisService.get("TOKEN_" +token);
-        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        return userRouteService.getByUserNumber(user.getUserNumber());
-    }
-
-    //添加用户常用地址
-    @ApiOperation(value = "添加用户常用地址",notes = "添加用户常用地址，需要传的参数：" +
-            "   name:地址名," +
-            "   country:国家," +
-            "   province:省," +
-            "   city:城市," +
-            "   address:具体地址," +
-            "   longitude:经度," +
-            "   latitude:纬度," +
-            "   remark:备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/addUserRoute",method = RequestMethod.POST)
-    public Object addUserRoute(@RequestBody AddUserRouteVo addUserRouteVo, HttpServletRequest request){
-        String token = request.getHeader("Account_token");
-        String datum = tokenRedisService.get("TOKEN_" +token);
-        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        if (StringUtils.isEmpty(addUserRouteVo.getName())){
-            fb.setCode(0);
-            fb.setMessage("添加的别名不能为空");
-            return gson.toJson(fb);
-        }
-        if(StringUtils.isEmpty(addUserRouteVo.getCountry())){
-            fb.setCode(0);
-            fb.setMessage("国家不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addUserRouteVo.getProvince())){
-            fb.setCode(0);
-            fb.setMessage("省不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addUserRouteVo.getCity())){
-            fb.setCode(0);
-            fb.setMessage("城市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(addUserRouteVo.getAddress())){
-            fb.setCode(0);
-            fb.setMessage("添加的详细地址不能为空");
-            return gson.toJson(fb);
-        }
-        if(!addUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!addUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if(!addUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!addUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if (userRouteService.getByUserNumberAndName(user.getUserNumber(),addUserRouteVo.getName())!=null){
-            fb.setCode(0);
-            fb.setMessage("添加的常用地址别名不能重复");
-            return gson.toJson(fb);
-        }
-        Map<Object,Object> map=new HashMap<>();
-        map.put("userNumber",user.getUserNumber());
-        map.put("name",addUserRouteVo.getName());
-        map.put("country",addUserRouteVo.getCountry());
-        map.put("province",addUserRouteVo.getProvince());
-        map.put("city",addUserRouteVo.getCity());
-        map.put("address",addUserRouteVo.getAddress());
-        map.put("longitude",addUserRouteVo.getLongitude());
-        map.put("latitude",addUserRouteVo.getLatitude());
-        map.put("remark",addUserRouteVo.getRemark());
-        userRouteService.addUserRoute(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("添加用户常用地址成功")){
-            fb.setCode(1);
-            fb.setMessage("添加用户常用地址成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    //修改用户常用地址
-    @ApiOperation(value = "修改用户常用地址",notes = "修改用户常用地址，需要传的参数：" +
-            "   oldName:修改之前的地址名," +
-            "   name:地址名," +
-            "   country:国家," +
-            "   province:省," +
-            "   city:城市," +
-            "   address:具体地址," +
-            "   longitude:经度," +
-            "   latitude:纬度," +
-            "   remark:备注")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/updateUserRoute",method = RequestMethod.POST)
-    public Object updateUserRoute(@RequestBody UpdateUserRouteVo updateUserRouteVo, HttpServletRequest request){
-        String token = request.getHeader("Account_token");
-        String datum = tokenRedisService.get("TOKEN_" +token);
-        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        if (StringUtils.isEmpty(updateUserRouteVo.getOldName())){
-            fb.setCode(0);
-            fb.setMessage("需要修改的常用地址别名不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateUserRouteVo.getName())){
-            fb.setCode(0);
-            fb.setMessage("添加的别名不能为空");
-            return gson.toJson(fb);
-        }
-        if(StringUtils.isEmpty(updateUserRouteVo.getCountry())){
-            fb.setCode(0);
-            fb.setMessage("国家不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateUserRouteVo.getProvince())){
-            fb.setCode(0);
-            fb.setMessage("省不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateUserRouteVo.getCity())){
-            fb.setCode(0);
-            fb.setMessage("城市不能为空");
-            return gson.toJson(fb);
-        }
-        if (StringUtils.isEmpty(updateUserRouteVo.getAddress())){
-            fb.setCode(0);
-            fb.setMessage("添加的详细地址不能为空");
-            return gson.toJson(fb);
-        }
-        if(!updateUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!updateUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if(!updateUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
-            fb.setCode(0);
-            fb.setMessage("纬度的范围为-90~90");
-            return gson.toJson(fb);
-        }
-        if(!updateUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
-            fb.setCode(0);
-            fb.setMessage("经度的范围为-180~180");
-            return gson.toJson(fb);
-        }
-        if (userRouteService.getByUserNumberAndName(user.getUserNumber(),updateUserRouteVo.getName())!=null&&!updateUserRouteVo.getOldName().equals(updateUserRouteVo.getName())){
-            fb.setCode(0);
-            fb.setMessage("添加的常用地址别名不能重复");
-            return gson.toJson(fb);
-        }
-        Map<Object,Object> map=new HashMap<>();
-        map.put("userNumber",user.getUserNumber());
-        map.put("oldName",updateUserRouteVo.getOldName());
-        map.put("name",updateUserRouteVo.getName());
-        map.put("country",updateUserRouteVo.getCountry());
-        map.put("province",updateUserRouteVo.getProvince());
-        map.put("city",updateUserRouteVo.getCity());
-        map.put("address",updateUserRouteVo.getAddress());
-        map.put("longitude",updateUserRouteVo.getLongitude());
-        map.put("latitude",updateUserRouteVo.getLatitude());
-        map.put("remark",updateUserRouteVo.getRemark());
-        userRouteService.updateUserRoute(map);
-        Map<Object,Object> msg=new HashMap<>();
-        msg.put("msg",map.get("msg"));
-        if (msg.get("msg").equals("修改用户常用地址成功")){
-            fb.setCode(1);
-            fb.setMessage("修改用户常用地址成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage(msg.get("msg").toString());
-        }
-        return gson.toJson(fb);
-    }
-
-    //删除用户常用地址
-    @ApiOperation(value = "删除用户常用地址",notes = "删除用户常用地址,只用传需要删除的地址名")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
-    })
-    @RequestMapping(value="/delUserRoute",method = RequestMethod.POST)
-    public Object delUserRoute(@RequestBody String name, HttpServletRequest request){
-        JSONObject jsonObject= JSON.parseObject(name);
-        name=(String)jsonObject.get("name");
-        String token = request.getHeader("Account_token");
-        String datum = tokenRedisService.get("TOKEN_" +token);
-        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
-        if (StringUtils.isEmpty(name)){
-            fb.setCode(0);
-            fb.setMessage("需要删除的别名不能为空");
-            return gson.toJson(fb);
-        }
-        int a = userRouteService.delUserRoute(user.getUserNumber(),name);
-
-        if (a>0){
-            fb.setCode(1);
-            fb.setMessage("删除用户常用地址成功");
-        }else{
-            fb.setCode(0);
-            fb.setMessage("删除用户常用地址失败");
-        }
-        return gson.toJson(fb);
-    }
+//    @Autowired
+//    private UserRouteService userRouteService;
+//
+//    @Autowired
+//    private TokenRedisService tokenRedisService;
+//
+//
+//    //根据用户编号查询用户常用地址
+//    @ApiOperation(value = "根据用户编号查询用户常用地址",notes = "根据用户编号查询用户常用地址")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/getByUserNumber",method = RequestMethod.GET)
+//    public Object getByUserNumber(HttpServletRequest request){
+//        String token = request.getHeader("Account_token");
+//        String datum = tokenRedisService.get("TOKEN_" +token);
+//        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        return userRouteService.getByUserNumber(user.getUserNumber());
+//    }
+//
+//    //添加用户常用地址
+//    @ApiOperation(value = "添加用户常用地址",notes = "添加用户常用地址，需要传的参数：" +
+//            "   name:地址名," +
+//            "   country:国家," +
+//            "   province:省," +
+//            "   city:城市," +
+//            "   address:具体地址," +
+//            "   longitude:经度," +
+//            "   latitude:纬度," +
+//            "   remark:备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/addUserRoute",method = RequestMethod.POST)
+//    public Object addUserRoute(@RequestBody AddUserRouteVo addUserRouteVo, HttpServletRequest request){
+//        String token = request.getHeader("Account_token");
+//        String datum = tokenRedisService.get("TOKEN_" +token);
+//        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        if (StringUtils.isEmpty(addUserRouteVo.getName())){
+//            fb.setCode(0);
+//            fb.setMessage("添加的别名不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(StringUtils.isEmpty(addUserRouteVo.getCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("国家不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addUserRouteVo.getProvince())){
+//            fb.setCode(0);
+//            fb.setMessage("省不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addUserRouteVo.getCity())){
+//            fb.setCode(0);
+//            fb.setMessage("城市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(addUserRouteVo.getAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("添加的详细地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(!addUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!addUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if(!addUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!addUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if (userRouteService.getByUserNumberAndName(user.getUserNumber(),addUserRouteVo.getName())!=null){
+//            fb.setCode(0);
+//            fb.setMessage("添加的常用地址别名不能重复");
+//            return gson.toJson(fb);
+//        }
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("userNumber",user.getUserNumber());
+//        map.put("name",addUserRouteVo.getName());
+//        map.put("country",addUserRouteVo.getCountry());
+//        map.put("province",addUserRouteVo.getProvince());
+//        map.put("city",addUserRouteVo.getCity());
+//        map.put("address",addUserRouteVo.getAddress());
+//        map.put("longitude",addUserRouteVo.getLongitude());
+//        map.put("latitude",addUserRouteVo.getLatitude());
+//        map.put("remark",addUserRouteVo.getRemark());
+//        userRouteService.addUserRoute(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("添加用户常用地址成功")){
+//            fb.setCode(1);
+//            fb.setMessage("添加用户常用地址成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //修改用户常用地址
+//    @ApiOperation(value = "修改用户常用地址",notes = "修改用户常用地址，需要传的参数：" +
+//            "   oldName:修改之前的地址名," +
+//            "   name:地址名," +
+//            "   country:国家," +
+//            "   province:省," +
+//            "   city:城市," +
+//            "   address:具体地址," +
+//            "   longitude:经度," +
+//            "   latitude:纬度," +
+//            "   remark:备注")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/updateUserRoute",method = RequestMethod.POST)
+//    public Object updateUserRoute(@RequestBody UpdateUserRouteVo updateUserRouteVo, HttpServletRequest request){
+//        String token = request.getHeader("Account_token");
+//        String datum = tokenRedisService.get("TOKEN_" +token);
+//        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        if (StringUtils.isEmpty(updateUserRouteVo.getOldName())){
+//            fb.setCode(0);
+//            fb.setMessage("需要修改的常用地址别名不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateUserRouteVo.getName())){
+//            fb.setCode(0);
+//            fb.setMessage("添加的别名不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(StringUtils.isEmpty(updateUserRouteVo.getCountry())){
+//            fb.setCode(0);
+//            fb.setMessage("国家不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateUserRouteVo.getProvince())){
+//            fb.setCode(0);
+//            fb.setMessage("省不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateUserRouteVo.getCity())){
+//            fb.setCode(0);
+//            fb.setMessage("城市不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if (StringUtils.isEmpty(updateUserRouteVo.getAddress())){
+//            fb.setCode(0);
+//            fb.setMessage("添加的详细地址不能为空");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateUserRouteVo.getLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
+//            fb.setCode(0);
+//            fb.setMessage("纬度的范围为-90~90");
+//            return gson.toJson(fb);
+//        }
+//        if(!updateUserRouteVo.getLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
+//            fb.setCode(0);
+//            fb.setMessage("经度的范围为-180~180");
+//            return gson.toJson(fb);
+//        }
+//        if (userRouteService.getByUserNumberAndName(user.getUserNumber(),updateUserRouteVo.getName())!=null&&!updateUserRouteVo.getOldName().equals(updateUserRouteVo.getName())){
+//            fb.setCode(0);
+//            fb.setMessage("添加的常用地址别名不能重复");
+//            return gson.toJson(fb);
+//        }
+//        Map<Object,Object> map=new HashMap<>();
+//        map.put("userNumber",user.getUserNumber());
+//        map.put("oldName",updateUserRouteVo.getOldName());
+//        map.put("name",updateUserRouteVo.getName());
+//        map.put("country",updateUserRouteVo.getCountry());
+//        map.put("province",updateUserRouteVo.getProvince());
+//        map.put("city",updateUserRouteVo.getCity());
+//        map.put("address",updateUserRouteVo.getAddress());
+//        map.put("longitude",updateUserRouteVo.getLongitude());
+//        map.put("latitude",updateUserRouteVo.getLatitude());
+//        map.put("remark",updateUserRouteVo.getRemark());
+//        userRouteService.updateUserRoute(map);
+//        Map<Object,Object> msg=new HashMap<>();
+//        msg.put("msg",map.get("msg"));
+//        if (msg.get("msg").equals("修改用户常用地址成功")){
+//            fb.setCode(1);
+//            fb.setMessage("修改用户常用地址成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage(msg.get("msg").toString());
+//        }
+//        return gson.toJson(fb);
+//    }
+//
+//    //删除用户常用地址
+//    @ApiOperation(value = "删除用户常用地址",notes = "删除用户常用地址,只用传需要删除的地址名")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+//    })
+//    @RequestMapping(value="/delUserRoute",method = RequestMethod.POST)
+//    public Object delUserRoute(@RequestBody String name, HttpServletRequest request){
+//        JSONObject jsonObject= JSON.parseObject(name);
+//        name=(String)jsonObject.get("name");
+//        String token = request.getHeader("Account_token");
+//        String datum = tokenRedisService.get("TOKEN_" +token);
+//        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+//        if (StringUtils.isEmpty(name)){
+//            fb.setCode(0);
+//            fb.setMessage("需要删除的别名不能为空");
+//            return gson.toJson(fb);
+//        }
+//        int a = userRouteService.delUserRoute(user.getUserNumber(),name);
+//
+//        if (a>0){
+//            fb.setCode(1);
+//            fb.setMessage("删除用户常用地址成功");
+//        }else{
+//            fb.setCode(0);
+//            fb.setMessage("删除用户常用地址失败");
+//        }
+//        return gson.toJson(fb);
+//    }
 
 }

src/main/resources/mapper/CircuitMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.CircuitMapper">
-    <select id="getAll" resultType="com.example.tdl.domain.vo.ResultCircuitVo">
+   <!-- <select id="getAll" resultType="com.example.tdl.domain.vo.ResultCircuitVo">
         SELECT transportationNo,routeNumber,routeName,startLongitude,startLatitude,(select city from city_config where id=r.start_id) startCity,
         startAddress,startTime,endLongitude,endLatitude,(select city from city_config where id=r.end_id) endCity,endAddress,endTime,transport,
         IFNULL((SELECT alarmType FROM alarm WHERE id=c.alarm_id),"正常") alarmType,boxNo,containerNo,deliveryAddress,transportationType,
@@ -202,5 +202,5 @@
         circuitState,c.remark,c.createTime,c.evaluate,c.evaluateRemark
         from circuit c,route r WHERE c.route_id=r.id AND r.state=1 AND c.state=1
         AND circuitState=#{circuitState,jdbcType=INTEGER}
-    </select>
+    </select>-->
 </mapper>
\ No newline at end of file

src/main/resources/mapper/ConfigMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.ConfigMapper">
-    <!--绑定getway和tdl-->
+   <!-- &lt;!&ndash;绑定getway和tdl&ndash;&gt;
     <insert id="addConfig" parameterType="java.util.Map" statementType="CALLABLE">
         <![CDATA[
         {
@@ -24,12 +24,12 @@
       ]]>
     </insert>
 
-    <!--获取绑定消息-->
+    &lt;!&ndash;获取绑定消息&ndash;&gt;
     <select id="getConfig" parameterType="String" resultType="com.example.tdl.domain.vo.ConfigVo">
         select gSN,gType,message,flag,resp,state,untie from config where gSN= #{gSN,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR} and state = 1;
     </select>
 
-   <!-- 绑定回复-->
+   &lt;!&ndash; 绑定回复&ndash;&gt;
     <update id="bindiSuccess">
         update config set resp=#{resp,jdbcType=INTEGER},flag=true
         where gSN= #{gSN,jdbcType=VARCHAR}
@@ -37,7 +37,7 @@
         and state = 1;
     </update>
 
-    <!--重置tdl-->
+    &lt;!&ndash;重置tdl&ndash;&gt;
     <update id="updateConfig" parameterType="java.util.Map" statementType="CALLABLE">
         <![CDATA[
         {
@@ -54,10 +54,10 @@
       ]]>
     </update>
 
-    <!--解绑成功-->
+    &lt;!&ndash;解绑成功&ndash;&gt;
     <update id="delConfig" parameterType="String">
         update config set state = 0 where gSN= #{gSN,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR} and state = 1;
-    </update>
+    </update>-->
 
     <!-- <insert id="addConfig" parameterType="com.example.tdl.domain.vo.ConfigVo">
       insert into config

src/main/resources/mapper/RouteMapper.xml

@@ -2,14 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.RouteMapper">
     <!--查询所有路由信息-->
-    <select id="getAll" resultType="com.example.tdl.domain.vo.ResultRouteVo">
+   <!-- <select id="getAll" resultType="com.example.tdl.domain.vo.ResultRouteVo">
         SELECT routeNumber,routeName,c.country startCountry,IFNULL(c.province,"") startProvince,c.city startCity,
         f.country endCountry,IFNULL(f.province,"") endProvince,f.city endCity,transport,remark
         FROM city_config f,route r INNER JOIN city_config c ON r.start_id=c.id
         WHERE r.end_id=f.id AND state=1
     </select>
 
-    <!--根据条件查询路由信息-->
+    &lt;!&ndash;根据条件查询路由信息&ndash;&gt;
     <select id="getRouteByTerm" resultType="com.example.tdl.domain.vo.ResultRouteVo" parameterType="com.example.tdl.domain.vo.RouteTermVo">
         SELECT routeNumber,routeName,c.country startCountry,IFNULL(c.province,"") startProvince,c.city startCity,
         f.country endCountry,IFNULL(f.province,"") endProvince,f.city endCity,transport,remark
@@ -32,7 +32,7 @@
         </if>
     </select>
 
-    <!--添加路由信息-->
+    &lt;!&ndash;添加路由信息&ndash;&gt;
     <insert id="addRoute" parameterType="java.util.Map" statementType="CALLABLE">
         <![CDATA[
         {
@@ -75,7 +75,7 @@
         f.country endCountry,IFNULL(f.province,"") endProvince,f.city endCity,transport,remark
         FROM city_config f,route r INNER JOIN city_config c ON r.start_id=c.id
         WHERE r.end_id=f.id AND routeName=#{routeName,jdbcType=VARCHAR} AND state=1
-    </select>
+    </select>-->
 
 
     <!--    <select id="getAllRoute" resultType="com.example.tdl.domain.vo.ResultRouteVo">

src/main/resources/mapper/TDLLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.TDLLogMapper">
-    <select id="getByNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
+   <!-- <select id="getByNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultGatewayVo">
         select  gatewaySN  SN,gatewayType  type from tdl_gateway_log
         where transportationNo = #{transportationNo,jdbcType=VARCHAR}
         GROUP BY gatewaySN
-    </select>
+    </select>-->
 </mapper>
\ No newline at end of file

src/main/resources/mapper/UserRouteMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.tdl.mapper.UserRouteMapper">
-    <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserRouteVo">
+<!--    <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserRouteVo">
       SELECT userNumber,userName,name,country,province,city,address,longitude,latitude,remark
       from city_config c,user_route r INNER JOIN `user` u ON r.user_id=u.id
       WHERE r.cityConfig_id=c.id AND userNumber=#{userNumber,jdbcType=VARCHAR}
@@ -58,5 +58,5 @@
         WHERE r.cityConfig_id=c.id
         AND userNumber=#{userNumber,jdbcType=VARCHAR}
         AND name=#{name,jdbcType=VARCHAR}
-    </select>
+    </select>-->
 </mapper>
\ No newline at end of file