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/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