Skip to content

T
TDLCloud
Commit a3b4786f authored by zhuangzhuang's avatar zhuangzhuang
Browse files
Options

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

parent 85400688
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3154 additions and 2746 deletions
src/main/java/com/example/tdl/callabletask/GWConfigWorker.java
View file @ a3b4786f
...@@ -110,8 +110,8 @@ public class GWConfigWorker implements Callable<String>, MqttCallback { ...@@ -110,8 +110,8 @@ public class GWConfigWorker implements Callable<String>, MqttCallback {
mqttAsyncClient.subscribe(RespTopic, qos);//订阅主题 mqttAsyncClient.subscribe(RespTopic, qos);//订阅主题
} }
//获取数据 //获取数据
ConfigVo configVo = configService.getConfig(SN,Type); //ConfigVo configVo = configService.getConfig(SN,Type);
ConfigCMD = configVo.getMessage(); //ConfigCMD = configVo.getMessage();
//发送数据 //发送数据
publish(ConfigCMD,ConfigTopic); publish(ConfigCMD,ConfigTopic);
} catch (MqttException e){ } catch (MqttException e){
...@@ -175,15 +175,15 @@ public class GWConfigWorker implements Callable<String>, MqttCallback { ...@@ -175,15 +175,15 @@ public class GWConfigWorker implements Callable<String>, MqttCallback {
this.ret_data = Message; this.ret_data = Message;
//解析Message消息 //解析Message消息
RespVo respVo = new Gson().fromJson(Message,RespVo.class); RespVo respVo = new Gson().fromJson(Message,RespVo.class);
if(respVo.getResponse().equals("config")){ // if(respVo.getResponse().equals("config")){
//配置回复 // //配置回复
configService.bindiSuccess(SN,Type,respVo.getStatus()); // configService.bindiSuccess(SN,Type,respVo.getStatus());
}else{ // }else{
//解绑回复 // //解绑回复
if(respVo.getStatus() ==0 || respVo.getStatus() == 1){ // if(respVo.getStatus() ==0 || respVo.getStatus() == 1){
configService.delConfig(SN,Type); // configService.delConfig(SN,Type);
} // }
} // }
if(NeedResp){ if(NeedResp){
mqttAsyncClient.unsubscribe(RespTopic);//不监听回复主题 mqttAsyncClient.unsubscribe(RespTopic);//不监听回复主题
} }
......
src/main/java/com/example/tdl/entity/Circuit.java
View file @ a3b4786f
...@@ -15,137 +15,169 @@ public class Circuit implements Serializable { ...@@ -15,137 +15,169 @@ public class Circuit implements Serializable {
private String transportationNo;//运输编号 private String transportationNo;//运输编号
private Route route;//路由
private Long startTime; private Long startTime;
private Long endTime; 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 deliveryAddress;
private String transportation;
private String transportationType; private String transportationType;
private boolean circuitState;//线路完成状态 private Float evaluate;
private String evaluateRemark;
private String routeNumber; private Integer circuitState;//线路完成状态
private String remark; private String remark;
public Serializable getSerializable() { private Boolean state;
return serializable;
private Alarm alarm;
public Integer getId() {
return id;
} }
public void setSerializable(Serializable serializable) { public void setId(Integer id) {
this.serializable = serializable; this.id = id;
} }
public Alarm getAlarm() { public String getTransportationNo() {
return alarm; return transportationNo;
} }
public void setAlarm(Alarm alarm) { public void setTransportationNo(String transportationNo) {
this.alarm = alarm; this.transportationNo = transportationNo;
} }
public String getBoxNo() { public Long getStartTime() {
return boxNo; return startTime;
} }
public void setBoxNo(String boxNo) { public void setStartTime(Long startTime) {
this.boxNo = boxNo; this.startTime = startTime;
} }
public String getContainerNo() { public Long getEndTime() {
return containerNo; return endTime;
} }
public void setContainerNo(String containerNo) { public void setEndTime(Long endTime) {
this.containerNo = containerNo; this.endTime = endTime;
} }
public String getDeliveryAddress() { public Long getExpTime() {
return deliveryAddress; return expTime;
} }
public void setDeliveryAddress(String deliveryAddress) { public void setExpTime(Long expTime) {
this.deliveryAddress = deliveryAddress; this.expTime = expTime;
} }
public String getTransportationType() { public Long getCompTime() {
return transportationType; return compTime;
} }
public void setTransportationType(String transportationType) { public void setCompTime(Long compTime) {
this.transportationType = transportationType; this.compTime = compTime;
} }
public String getRemark() { public String getCargoNo() {
return remark; return cargoNo;
} }
public void setRemark(String remark) { public void setCargoNo(String cargoNo) {
this.remark = remark; this.cargoNo = cargoNo;
} }
public Integer getId() { public String getPlateNo() {
return id; return plateNo;
} }
public void setId(Integer id) { public void setPlateNo(String plateNo) {
this.id = id; this.plateNo = plateNo;
} }
public String getTransportationNo() { public String getDeliveryAddress() {
return transportationNo; return deliveryAddress;
} }
public void setTransportationNo(String transportationNo) { public void setDeliveryAddress(String deliveryAddress) {
this.transportationNo = transportationNo; this.deliveryAddress = deliveryAddress;
} }
public Route getRoute() { public String getTransportation() {
return route; return transportation;
} }
public void setRoute(Route route) { public void setTransportation(String transportation) {
this.route = route; this.transportation = transportation;
} }
public Long getStartTime() { public String getTransportationType() {
return startTime; return transportationType;
} }
public void setStartTime(Long startTime) { public void setTransportationType(String transportationType) {
this.startTime = startTime; this.transportationType = transportationType;
} }
public Long getEndTime() { public Float getEvaluate() {
return endTime; return evaluate;
} }
public void setEndTime(Long endTime) { public void setEvaluate(Float evaluate) {
this.endTime = endTime; this.evaluate = evaluate;
}
public String getEvaluateRemark() {
return evaluateRemark;
} }
public boolean isCircuitState() { public void setEvaluateRemark(String evaluateRemark) {
this.evaluateRemark = evaluateRemark;
}
public Integer getCircuitState() {
return circuitState; return circuitState;
} }
public void setCircuitState(boolean circuitState) { public void setCircuitState(Integer circuitState) {
this.circuitState = circuitState; this.circuitState = circuitState;
} }
public String getRouteNumber() { public String getRemark() {
return routeNumber; return remark;
}
public void setRemark(String remark) {
this.remark = remark;
} }
public void setRouteNumber(String routeNumber) { public Boolean getState() {
this.routeNumber = routeNumber; 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 0 → 100644
View file @ a3b4786f
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 0 → 100644
View file @ a3b4786f
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 0 → 100644
View file @ a3b4786f
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 0 → 100644
View file @ a3b4786f
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
View file @ a3b4786f
package com.example.tdl.entity; package com.example.tdl.entity;
public class UserRoute { public class UserAddress {
private Integer id; private Integer id;
private String userNumber; private String userNumber;
private String name; 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 postCode;
private String longitude;
private String latitude;
private String remark; private String remark;
private City city;
public Integer getId() { public Integer getId() {
return id; return id;
} }
...@@ -45,52 +43,36 @@ public class UserRoute { ...@@ -45,52 +43,36 @@ public class UserRoute {
this.name = name; this.name = name;
} }
public String getCountry() { public String getAddressDetail() {
return country; return addressDetail;
}
public void setCountry(String country) {
this.country = country;
} }
public String getProvince() { public void setAddressDetail(String addressDetail) {
return province; this.addressDetail = addressDetail;
} }
public void setProvince(String province) { public String getLog() {
this.province = province; return log;
} }
public String getCity() { public void setLog(String log) {
return city; this.log = log;
} }
public void setCity(String city) { public String getLat() {
this.city = city; return lat;
} }
public String getAddress() { public void setLat(String lat) {
return address; this.lat = lat;
} }
public void setAddress(String address) { public String getPostCode() {
this.address = address; return postCode;
} }
public String getLongitude() { public void setPostCode(String postCode) {
return longitude; this.postCode = postCode;
}
public void setLongitude(String longitude) {
this.longitude = longitude;
}
public String getLatitude() {
return latitude;
}
public void setLatitude(String latitude) {
this.latitude = latitude;
} }
public String getRemark() { public String getRemark() {
...@@ -100,4 +82,12 @@ public class UserRoute { ...@@ -100,4 +82,12 @@ public class UserRoute {
public void setRemark(String remark) { public void setRemark(String remark) {
this.remark = 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
View file @ a3b4786f
...@@ -8,35 +8,35 @@ import java.util.Map; ...@@ -8,35 +8,35 @@ import java.util.Map;
@Mapper @Mapper
public interface CircuitMapper { public interface CircuitMapper {
List<ResultCircuitVo> getAll(); // List<ResultCircuitVo> getAll();
//
List<CircuitVo> getDistinct(); // List<CircuitVo> getDistinct();
//
List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo); // List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo);
//
int addCircuit(Map<Object,Object> map); // int addCircuit(Map<Object,Object> map);
//
int updateCircuit(Map<Object,Object> map); // int updateCircuit(Map<Object,Object> map);
//
int updateEndTime(UpdateCircuitVo updateCircuitVo); // int updateEndTime(UpdateCircuitVo updateCircuitVo);
//
int delCircuit(String transportationNo); // int delCircuit(String transportationNo);
//
ResultCircuitVo getByTransportationNo(String transportation); // ResultCircuitVo getByTransportationNo(String transportation);
//
ResultGatewayVo getByNo(String transportationNo); // ResultGatewayVo getByNo(String transportationNo);
//
Integer getOnRoute(); // Integer getOnRoute();
//
Integer getComplted(); // Integer getComplted();
//
Integer getCount(); // Integer getCount();
//
List<CircuitVo> getByTime(String time); // List<CircuitVo> getByTime(String time);
//
List<ResultCircuitVo> getByContainerNo(String containerNo); // List<ResultCircuitVo> getByContainerNo(String containerNo);
//
int updateEvaluate(UpdateEvaluateVo updateEvaluateVo); // int updateEvaluate(UpdateEvaluateVo updateEvaluateVo);
//
List<ResultCircuitVo> getByCircuitState(Integer circuitState); // List<ResultCircuitVo> getByCircuitState(Integer circuitState);
} }
src/main/java/com/example/tdl/mapper/RouteMapper.java
View file @ a3b4786f
...@@ -13,19 +13,19 @@ import java.util.Map; ...@@ -13,19 +13,19 @@ import java.util.Map;
@Mapper @Mapper
public interface RouteMapper { public interface RouteMapper {
List<ResultRouteVo> getAll(); // List<ResultRouteVo> getAll();
//
List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo); // List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo);
//
int addRoute(Map<Object,Object> map); // int addRoute(Map<Object,Object> map);
//
int delRoute(String routeNumber); // int delRoute(String routeNumber);
//
int getByRouteNumber(String routeNumber); // int getByRouteNumber(String routeNumber);
//
ResultRouteVo getInfoByRouteNumber(String routeNumber); // ResultRouteVo getInfoByRouteNumber(String routeNumber);
//
ResultRouteVo getInfoByRouteName(String routeName); // ResultRouteVo getInfoByRouteName(String routeName);
// List<ResultRouteVo> getAllRoute(String time); // List<ResultRouteVo> getAllRoute(String time);
......
src/main/java/com/example/tdl/mapper/TDLLogMapper.java
View file @ a3b4786f
package com.example.tdl.mapper; package com.example.tdl.mapper;
import com.example.tdl.domain.vo.ResultGatewayVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface TDLLogMapper { public interface TDLLogMapper {
ResultGatewayVo getByNo(String transportationNo); // ResultGatewayVo getByNo(String transportationNo);
} }
src/main/java/com/example/tdl/mapper/UserRouteMapper.java
View file @ a3b4786f
...@@ -11,13 +11,13 @@ import java.util.Map; ...@@ -11,13 +11,13 @@ import java.util.Map;
@Mapper @Mapper
public interface UserRouteMapper { public interface UserRouteMapper {
List<ResultUserRouteVo> getByUserNumber(String userNumber); // List<ResultUserRouteVo> getByUserNumber(String userNumber);
//
int addUserRoute(Map<Object,Object> map); // int addUserRoute(Map<Object,Object> map);
//
int updateUserRoute(Map<Object,Object> map); // int updateUserRoute(Map<Object,Object> map);
//
int delUserRoute(@Param("userNumber") String userNumber,@Param("name") String name); // int delUserRoute(@Param("userNumber") String userNumber,@Param("name") String name);
//
ResultUserRouteVo getByUserNumberAndName(@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
View file @ a3b4786f
...@@ -128,26 +128,26 @@ public class MqttListener implements MqttCallback { ...@@ -128,26 +128,26 @@ public class MqttListener implements MqttCallback {
String[] tmparray = topic.split("/"); String[] tmparray = topic.split("/");
String Type = tmparray[1]; String Type = tmparray[1];
String SN = tmparray[2]; String SN = tmparray[2];
Integer flag = parseData(Message,SN,Type); // Integer flag = parseData(Message,SN,Type);
String ConfigData; String ConfigData;
Future<String> result = null; Future<String> result = null;
GWConfigWorker gcconfig = null; GWConfigWorker gcconfig = null;
if(flag == 0){ // if(flag == 0){
ConfigCMDVo configCMDVo = new ConfigCMDVo(); // ConfigCMDVo configCMDVo = new ConfigCMDVo();
configCMDVo.setAction("sleep"); // configCMDVo.setAction("sleep");
configCMDVo.setT(System.currentTimeMillis()/1000l); // configCMDVo.setT(System.currentTimeMillis()/1000l);
ConfigData = new Gson().toJson(configCMDVo); // ConfigData = new Gson().toJson(configCMDVo);
gcconfig = new GWConfigWorker(Type,SN,ConfigData, false); // gcconfig = new GWConfigWorker(Type,SN,ConfigData, false);
}else if(flag == 2){ // }else if(flag == 2){
ConfigCMDVo configCMDVo = new ConfigCMDVo(); // ConfigCMDVo configCMDVo = new ConfigCMDVo();
configCMDVo.setAction("end"); // configCMDVo.setAction("end");
configCMDVo.setT(System.currentTimeMillis()/1000l); // configCMDVo.setT(System.currentTimeMillis()/1000l);
ConfigData = new Gson().toJson(configCMDVo); // ConfigData = new Gson().toJson(configCMDVo);
gcconfig = new GWConfigWorker(Type,SN,ConfigData, true); // gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
}else if(flag == 1){ // }else if(flag == 1){
ConfigData = configService.getConfig(SN,Type).getMessage(); //// ConfigData = configService.getConfig(SN,Type).getMessage();
gcconfig = new GWConfigWorker(Type,SN,ConfigData, true); //// gcconfig = new GWConfigWorker(Type,SN,ConfigData, true);
} // }
// String ConfigData ="{\"action\":\"config\"}"; // String ConfigData ="{\"action\":\"config\"}";
gcconfig.SetMqttConfig(mqttconfig.getUrl(),mqttconfig.getPort(), gcconfig.SetMqttConfig(mqttconfig.getUrl(),mqttconfig.getPort(),
mqttconfig.getUsername(), mqttconfig.getPassword(),mqttconfig.getQos(), mqttconfig.getUsername(), mqttconfig.getPassword(),mqttconfig.getQos(),
...@@ -178,29 +178,29 @@ public class MqttListener implements MqttCallback { ...@@ -178,29 +178,29 @@ public class MqttListener implements MqttCallback {
} }
//checkIn数据解析,true即发送休眠信息；false发送config信息 //checkIn数据解析,true即发送休眠信息；false发送config信息
public Integer parseData(String message,String SN,String Type){ // public Integer parseData(String message,String SN,String Type){
CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class); // CheckInVo checkInVo = new Gson().fromJson(message,CheckInVo.class);
if(StringUtils.isEmpty(checkInVo.getDevList()==null ? "" :checkInVo.getDevList().toString())){ // if(StringUtils.isEmpty(checkInVo.getDevList()==null ? "" :checkInVo.getDevList().toString())){
return 1;//重发 // return 1;//重发
} // }
//有设备信息 //有设备信息
ConfigVo configVo = configService.getConfig(SN,Type); // ConfigVo configVo = configService.getConfig(SN,Type);
ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class); // ConfigCMDVo configCMDVo = new Gson().fromJson(configVo.getMessage(),ConfigCMDVo.class);
if(configVo.getUntie()){ // if(configVo.getUntie()){
//解绑状态 // //解绑状态
return 2;//解绑 // return 2;//解绑
} // }
//判断两者的devList是否一致 // //判断两者的devList是否一致
if (configCMDVo.getDevList().containsAll(checkInVo.getDevList()) // if (configCMDVo.getDevList().containsAll(checkInVo.getDevList())
&& checkInVo.getDevList().containsAll(configCMDVo.getDevList()) // && checkInVo.getDevList().containsAll(configCMDVo.getDevList())
&& checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod()) // && checkInVo.getGprsPeriod().equals(configCMDVo.getGprsPeriod())
&& checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod()) // && checkInVo.getGpsPeriod().equals(configCMDVo.getGpsPeriod())
&& checkInVo.getMode().equals(configCMDVo.getMode())) { // && checkInVo.getMode().equals(configCMDVo.getMode())) {
//一致 // //一致
return 0;//发送休眠信息 // return 0;//发送休眠信息
} else { // } else {
//不一致 // //不一致
return 1;//重发 // return 1;//重发
} // }
} // }
} }
src/main/java/com/example/tdl/service/CircuitService.java
View file @ a3b4786f
...@@ -12,72 +12,72 @@ import java.util.Map; ...@@ -12,72 +12,72 @@ import java.util.Map;
@Service @Service
public class CircuitService { public class CircuitService {
@Autowired // @Autowired
private CircuitMapper circuitMapper; // private CircuitMapper circuitMapper;
//
public List<ResultCircuitVo> getAll(){ // public List<ResultCircuitVo> getAll(){
return circuitMapper.getAll(); // return circuitMapper.getAll();
} // }
//
public List<CircuitVo> getDistinct(){ // public List<CircuitVo> getDistinct(){
return circuitMapper.getDistinct(); // return circuitMapper.getDistinct();
} // }
//
public List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo){ // public List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo){
return circuitMapper.getByTerm(circuitTermVo); // return circuitMapper.getByTerm(circuitTermVo);
} // }
//
public int addCircuit(Map<Object,Object> map){ // public int addCircuit(Map<Object,Object> map){
return circuitMapper.addCircuit(map); // return circuitMapper.addCircuit(map);
} // }
//
public int updateCircuit(Map<Object,Object> map){ // public int updateCircuit(Map<Object,Object> map){
return circuitMapper.updateCircuit(map); // return circuitMapper.updateCircuit(map);
} // }
//
public int updateEndTime(UpdateCircuitVo updateCircuitVo){ // public int updateEndTime(UpdateCircuitVo updateCircuitVo){
return circuitMapper.updateEndTime(updateCircuitVo); // return circuitMapper.updateEndTime(updateCircuitVo);
} // }
//
public int delCircuit(String transportationNo){ // public int delCircuit(String transportationNo){
return circuitMapper.delCircuit(transportationNo); // return circuitMapper.delCircuit(transportationNo);
} // }
//
public ResultCircuitVo getByTransportationNo(String transportationNo){ // public ResultCircuitVo getByTransportationNo(String transportationNo){
return circuitMapper.getByTransportationNo(transportationNo); // return circuitMapper.getByTransportationNo(transportationNo);
} // }
//
public ResultGatewayVo getByNo(String transportationNo){ // public ResultGatewayVo getByNo(String transportationNo){
return circuitMapper.getByNo(transportationNo); // return circuitMapper.getByNo(transportationNo);
} // }
//
public Integer getOnRoute(){ // public Integer getOnRoute(){
return circuitMapper.getOnRoute(); // return circuitMapper.getOnRoute();
} // }
//
public Integer getComplted(){ // public Integer getComplted(){
return circuitMapper.getComplted(); // return circuitMapper.getComplted();
} // }
//
//
public Integer getCount(){ // public Integer getCount(){
return circuitMapper.getCount(); // return circuitMapper.getCount();
} // }
//
public List<CircuitVo> getByTime(String time){ // public List<CircuitVo> getByTime(String time){
return circuitMapper.getByTime(time); // return circuitMapper.getByTime(time);
} // }
//
public List<ResultCircuitVo> getByContainerNo(String containerNo){ // public List<ResultCircuitVo> getByContainerNo(String containerNo){
return circuitMapper.getByContainerNo(containerNo); // return circuitMapper.getByContainerNo(containerNo);
} // }
//
public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){ // public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){
return circuitMapper.updateEvaluate(updateEvaluateVo); // return circuitMapper.updateEvaluate(updateEvaluateVo);
} // }
//
public List<ResultCircuitVo> getByCircuitState(Integer circuitState){ // public List<ResultCircuitVo> getByCircuitState(Integer circuitState){
return circuitMapper.getByCircuitState(circuitState); // return circuitMapper.getByCircuitState(circuitState);
} // }
} }
src/main/java/com/example/tdl/service/ConfigService.java
View file @ a3b4786f
...@@ -10,40 +10,40 @@ import java.util.Map; ...@@ -10,40 +10,40 @@ import java.util.Map;
@Service @Service
public class ConfigService { public class ConfigService {
@Autowired // @Autowired
private ConfigMapper configMapper; // private ConfigMapper configMapper;
//
//绑定getway和tdl // //绑定getway和tdl
/* public int addConfig(ConfigVo configVo){ // /* public int addConfig(ConfigVo configVo){
return configMapper.addConfig(configVo); // return configMapper.addConfig(configVo);
}*/ // }*/
//
public int addConfig(Map<Object,Object> map){ // public int addConfig(Map<Object,Object> map){
return configMapper.addConfig(map); // return configMapper.addConfig(map);
} // }
//
//
//获取绑定的数据信息 // //获取绑定的数据信息
public ConfigVo getConfig(String gSN,String gType){ // public ConfigVo getConfig(String gSN,String gType){
return configMapper.getConfig(gSN,gType); // return configMapper.getConfig(gSN,gType);
} // }
//
//绑定成功 // //绑定成功
public int bindiSuccess(String gSN,String gType,Integer resp){ // public int bindiSuccess(String gSN,String gType,Integer resp){
return configMapper.bindiSuccess(gSN,gType,resp); // return configMapper.bindiSuccess(gSN,gType,resp);
} // }
//
//解绑getWay和tdl // //解绑getWay和tdl
// public int updateConfig(String gSN,String gType,Boolean untie ){ //// public int updateConfig(String gSN,String gType,Boolean untie ){
// return configMapper.updateConfig(gSN,gType,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
View file @ a3b4786f
...@@ -15,36 +15,36 @@ import java.util.Map; ...@@ -15,36 +15,36 @@ import java.util.Map;
@Service @Service
public class RouteService { public class RouteService {
@Autowired // @Autowired
private RouteMapper routeMapper; // private RouteMapper routeMapper;
//
public List<ResultRouteVo> getAll(){ // public List<ResultRouteVo> getAll(){
return routeMapper.getAll(); // return routeMapper.getAll();
} // }
//
public List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo){ // public List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo){
return routeMapper.getRouteByTerm(routeTermVo); // return routeMapper.getRouteByTerm(routeTermVo);
} // }
//
public int addRoute(Map<Object,Object> map){ // public int addRoute(Map<Object,Object> map){
return routeMapper.addRoute(map); // return routeMapper.addRoute(map);
} // }
//
public int delRoute(String routeNumber){ // public int delRoute(String routeNumber){
return routeMapper.delRoute(routeNumber); // return routeMapper.delRoute(routeNumber);
} // }
//
public int getByRouteNumber(String routeNumber){ // public int getByRouteNumber(String routeNumber){
return routeMapper.getByRouteNumber(routeNumber); // return routeMapper.getByRouteNumber(routeNumber);
} // }
//
public ResultRouteVo getInfoByRouteNumber(String routeNumber){ // public ResultRouteVo getInfoByRouteNumber(String routeNumber){
return routeMapper.getInfoByRouteNumber(routeNumber); // return routeMapper.getInfoByRouteNumber(routeNumber);
} // }
//
public ResultRouteVo getInfoByRouteName(String routeName){ // public ResultRouteVo getInfoByRouteName(String routeName){
return routeMapper.getInfoByRouteName(routeName); // return routeMapper.getInfoByRouteName(routeName);
} // }
// public List<ResultRouteVo> getAllRoute(String time){ // public List<ResultRouteVo> getAllRoute(String time){
// return routeMapper.getAllRoute(time); // return routeMapper.getAllRoute(time);
......
src/main/java/com/example/tdl/service/TDLLogService.java
View file @ a3b4786f
...@@ -9,11 +9,11 @@ import org.springframework.stereotype.Service; ...@@ -9,11 +9,11 @@ import org.springframework.stereotype.Service;
@Service @Service
public class TDLLogService { public class TDLLogService {
@Autowired // @Autowired
private TDLLogMapper tdlLogMapper; // private TDLLogMapper tdlLogMapper;
//
public ResultGatewayVo getByNo(String transportationNo){ // public ResultGatewayVo getByNo(String transportationNo){
return tdlLogMapper.getByNo(transportationNo); // return tdlLogMapper.getByNo(transportationNo);
} // }
} }
src/main/java/com/example/tdl/service/UserRouteService.java
View file @ a3b4786f
...@@ -12,26 +12,26 @@ import java.util.Map; ...@@ -12,26 +12,26 @@ import java.util.Map;
@Service @Service
public class UserRouteService { public class UserRouteService {
@Autowired // @Autowired
private UserRouteMapper userRouteMapper; // private UserRouteMapper userRouteMapper;
//
public List<ResultUserRouteVo> getByUserNumber(String userNumber){ // public List<ResultUserRouteVo> getByUserNumber(String userNumber){
return userRouteMapper.getByUserNumber(userNumber); // return userRouteMapper.getByUserNumber(userNumber);
} // }
//
public int addUserRoute(Map<Object,Object> map){ // public int addUserRoute(Map<Object,Object> map){
return userRouteMapper.addUserRoute(map); // return userRouteMapper.addUserRoute(map);
} // }
//
public int updateUserRoute(Map<Object,Object> map){ // public int updateUserRoute(Map<Object,Object> map){
return userRouteMapper.updateUserRoute(map); // return userRouteMapper.updateUserRoute(map);
} // }
//
public int delUserRoute(String userNumber,String name){ // public int delUserRoute(String userNumber,String name){
return userRouteMapper.delUserRoute(userNumber,name); // return userRouteMapper.delUserRoute(userNumber,name);
} // }
//
public ResultUserRouteVo getByUserNumberAndName(String userNumber,String name){ // public ResultUserRouteVo getByUserNumberAndName(String userNumber,String name){
return userRouteMapper.getByUserNumberAndName(userNumber,name); // return userRouteMapper.getByUserNumberAndName(userNumber,name);
} // }
} }
src/main/resources/mapper/CircuitMapper.xml
View file @ a3b4786f
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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, 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, 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, IFNULL((SELECT alarmType FROM alarm WHERE id=c.alarm_id),"正常") alarmType,boxNo,containerNo,deliveryAddress,transportationType,
...@@ -202,5 +202,5 @@ ...@@ -202,5 +202,5 @@
circuitState,c.remark,c.createTime,c.evaluate,c.evaluateRemark 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 from circuit c,route r WHERE c.route_id=r.id AND r.state=1 AND c.state=1
AND circuitState=#{circuitState,jdbcType=INTEGER} AND circuitState=#{circuitState,jdbcType=INTEGER}
</select> </select>-->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/ConfigMapper.xml
View file @ a3b4786f
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <mapper namespace="com.example.tdl.mapper.ConfigMapper">
<!--绑定getway和tdl--> <!-- &lt;!&ndash;绑定getway和tdl&ndash;&gt;
<insert id="addConfig" parameterType="java.util.Map" statementType="CALLABLE"> <insert id="addConfig" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[ <![CDATA[
{ {
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
]]> ]]>
</insert> </insert>
<!--获取绑定消息--> &lt;!&ndash;获取绑定消息&ndash;&gt;
<select id="getConfig" parameterType="String" resultType="com.example.tdl.domain.vo.ConfigVo"> <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 gSN,gType,message,flag,resp,state,untie from config where gSN= #{gSN,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR} and state = 1;
</select> </select>
<!-- 绑定回复--> &lt;!&ndash; 绑定回复&ndash;&gt;
<update id="bindiSuccess"> <update id="bindiSuccess">
update config set resp=#{resp,jdbcType=INTEGER},flag=true update config set resp=#{resp,jdbcType=INTEGER},flag=true
where gSN= #{gSN,jdbcType=VARCHAR} where gSN= #{gSN,jdbcType=VARCHAR}
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
and state = 1; and state = 1;
</update> </update>
<!--重置tdl--> &lt;!&ndash;重置tdl&ndash;&gt;
<update id="updateConfig" parameterType="java.util.Map" statementType="CALLABLE"> <update id="updateConfig" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[ <![CDATA[
{ {
...@@ -54,10 +54,10 @@ ...@@ -54,10 +54,10 @@
]]> ]]>
</update> </update>
<!--解绑成功--> &lt;!&ndash;解绑成功&ndash;&gt;
<update id="delConfig" parameterType="String"> <update id="delConfig" parameterType="String">
update config set state = 0 where gSN= #{gSN,jdbcType=VARCHAR} and gType=#{gType,jdbcType=VARCHAR} and state = 1; 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 id="addConfig" parameterType="com.example.tdl.domain.vo.ConfigVo">
insert into config insert into config
......
src/main/resources/mapper/RouteMapper.xml
View file @ a3b4786f
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <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, 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 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 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 WHERE r.end_id=f.id AND state=1
</select> </select>
<!--根据条件查询路由信息--> &lt;!&ndash;根据条件查询路由信息&ndash;&gt;
<select id="getRouteByTerm" resultType="com.example.tdl.domain.vo.ResultRouteVo" parameterType="com.example.tdl.domain.vo.RouteTermVo"> <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, 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 f.country endCountry,IFNULL(f.province,"") endProvince,f.city endCity,transport,remark
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</if> </if>
</select> </select>
<!--添加路由信息--> &lt;!&ndash;添加路由信息&ndash;&gt;
<insert id="addRoute" parameterType="java.util.Map" statementType="CALLABLE"> <insert id="addRoute" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[ <![CDATA[
{ {
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
f.country endCountry,IFNULL(f.province,"") endProvince,f.city endCity,transport,remark 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 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 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"> <!-- <select id="getAllRoute" resultType="com.example.tdl.domain.vo.ResultRouteVo">
......
src/main/resources/mapper/TDLLogMapper.xml
View file @ a3b4786f
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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 select gatewaySN SN,gatewayType type from tdl_gateway_log
where transportationNo = #{transportationNo,jdbcType=VARCHAR} where transportationNo = #{transportationNo,jdbcType=VARCHAR}
GROUP BY gatewaySN GROUP BY gatewaySN
</select> </select>-->
</mapper> </mapper>
\ No newline at end of file
src/main/resources/mapper/UserRouteMapper.xml
View file @ a3b4786f
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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 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 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} WHERE r.cityConfig_id=c.id AND userNumber=#{userNumber,jdbcType=VARCHAR}
...@@ -58,5 +58,5 @@ ...@@ -58,5 +58,5 @@
WHERE r.cityConfig_id=c.id WHERE r.cityConfig_id=c.id
AND userNumber=#{userNumber,jdbcType=VARCHAR} AND userNumber=#{userNumber,jdbcType=VARCHAR}
AND name=#{name,jdbcType=VARCHAR} AND name=#{name,jdbcType=VARCHAR}
</select> </select>-->
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment