Skip to content

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

3.27--线路增删改查

parent 65f8c992
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2221 additions and 3156 deletions
src/main/java/com/example/tdl/domain/vo/AddAlarmLogVo.java
View file @ 2d27b404
...@@ -4,7 +4,7 @@ public class AddAlarmLogVo { ...@@ -4,7 +4,7 @@ public class AddAlarmLogVo {
private String transportationNo; private String transportationNo;
private String routeName; private String TDLSN;
private String description; private String description;
...@@ -15,9 +15,9 @@ public class AddAlarmLogVo { ...@@ -15,9 +15,9 @@ public class AddAlarmLogVo {
public AddAlarmLogVo() { public AddAlarmLogVo() {
} }
public AddAlarmLogVo(String transportationNo, String routeName, String description, Float data, Long alarmTime) { public AddAlarmLogVo(String transportationNo, String TDLSN, String description, Float data, Long alarmTime) {
this.transportationNo = transportationNo; this.transportationNo = transportationNo;
this.routeName = routeName; this.TDLSN = TDLSN;
this.description = description; this.description = description;
this.data = data; this.data = data;
this.alarmTime = alarmTime; this.alarmTime = alarmTime;
...@@ -31,12 +31,12 @@ public class AddAlarmLogVo { ...@@ -31,12 +31,12 @@ public class AddAlarmLogVo {
this.transportationNo = transportationNo; this.transportationNo = transportationNo;
} }
public String getRouteName() { public String getTDLSN() {
return routeName; return TDLSN;
} }
public void setRouteName(String routeName) { public void setTDLSN(String TDLSN) {
this.routeName = routeName; this.TDLSN = TDLSN;
} }
public String getDescription() { public String getDescription() {
......
src/main/java/com/example/tdl/domain/vo/AddCircuitVo.java
View file @ 2d27b404
package com.example.tdl.domain.vo; package com.example.tdl.domain.vo;
public class AddCircuitVo {
private String routeNumber;
private String startCountry;
private String startProvince;
private String startCity;
private String endCountry;
private String endProvince;
private String endCity;
private String transport;
private String rRemark; import java.util.List;
private String startLongitude; public class AddCircuitVo {
private String startLatitude;
private String startAddress;
private String endLongitude; private List<AddressVo> addressVoList;
private String endLatitude; private String SN;
private String endAddress; private String TDLSN;
private String boxNo; private String alarmType;
private String containerNo; private String cargoNo;//货物编号
private String deliveryAddress; private String plateNo;//车牌号
private String transportationType; private String cargoName;
private String remark; private String remark;
public String getrRemark() { public List<AddressVo> getAddressVoList() {
return rRemark; return addressVoList;
}
public void setrRemark(String rRemark) {
this.rRemark = rRemark;
}
public String getRouteNumber() {
return routeNumber;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
public String getStartCountry() {
return startCountry;
}
public void setStartCountry(String startCountry) {
this.startCountry = startCountry;
}
public String getStartProvince() {
return startProvince;
}
public void setStartProvince(String startProvince) {
this.startProvince = startProvince;
}
public String getStartCity() {
return startCity;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getEndCountry() {
return endCountry;
}
public void setEndCountry(String endCountry) {
this.endCountry = endCountry;
}
public String getEndProvince() {
return endProvince;
}
public void setEndProvince(String endProvince) {
this.endProvince = endProvince;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public String getTransport() {
return transport;
}
public void setTransport(String transport) {
this.transport = transport;
}
public String getStartLongitude() {
return startLongitude;
}
public void setStartLongitude(String startLongitude) {
this.startLongitude = startLongitude;
}
public String getStartLatitude() {
return startLatitude;
}
public void setStartLatitude(String startLatitude) {
this.startLatitude = startLatitude;
}
public String getStartAddress() {
return startAddress;
}
public void setStartAddress(String startAddress) {
this.startAddress = startAddress;
}
public String getEndLongitude() {
return endLongitude;
} }
public void setEndLongitude(String endLongitude) { public void setAddressVoList(List<AddressVo> addressVoList) {
this.endLongitude = endLongitude; this.addressVoList = addressVoList;
} }
public String getEndLatitude() { public String getSN() {
return endLatitude; return SN;
} }
public void setEndLatitude(String endLatitude) { public void setSN(String SN) {
this.endLatitude = endLatitude; this.SN = SN;
} }
public String getEndAddress() { public String getTDLSN() {
return endAddress; return TDLSN;
} }
public void setEndAddress(String endAddress) { public void setTDLSN(String TDLSN) {
this.endAddress = endAddress; this.TDLSN = TDLSN;
} }
public String getBoxNo() { public String getAlarmType() {
return boxNo; return alarmType;
} }
public void setBoxNo(String boxNo) { public void setAlarmType(String alarmType) {
this.boxNo = boxNo; this.alarmType = alarmType;
} }
public String getContainerNo() { public String getCargoNo() {
return containerNo; return cargoNo;
} }
public void setContainerNo(String containerNo) { public void setCargoNo(String cargoNo) {
this.containerNo = containerNo; this.cargoNo = cargoNo;
} }
public String getDeliveryAddress() { public String getPlateNo() {
return deliveryAddress; return plateNo;
} }
public void setDeliveryAddress(String deliveryAddress) { public void setPlateNo(String plateNo) {
this.deliveryAddress = deliveryAddress; this.plateNo = plateNo;
} }
public String getTransportationType() { public String getCargoName() {
return transportationType; return cargoName;
} }
public void setTransportationType(String transportationType) { public void setCargoName(String cargoName) {
this.transportationType = transportationType; this.cargoName = cargoName;
} }
public String getRemark() { public String getRemark() {
......
src/main/java/com/example/tdl/domain/vo/AddRouteVo.java deleted 100644 → 0
View file @ 65f8c992
package com.example.tdl.domain.vo;
public class AddRouteVo {
private String startCountry;
private String startProvince;
private String startCity;
private String endCountry;
private String endProvince;
private String endCity;
private String transport;
private String remark;
public String getStartCountry() {
return startCountry;
}
public void setStartCountry(String startCountry) {
this.startCountry = startCountry;
}
public String getStartProvince() {
return startProvince;
}
public void setStartProvince(String startProvince) {
this.startProvince = startProvince;
}
public String getStartCity() {
return startCity;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getEndCountry() {
return endCountry;
}
public void setEndCountry(String endCountry) {
this.endCountry = endCountry;
}
public String getEndProvince() {
return endProvince;
}
public void setEndProvince(String endProvince) {
this.endProvince = endProvince;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public String getTransport() {
return transport;
}
public void setTransport(String transport) {
this.transport = transport;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/domain/vo/AddUserRouteVo.java deleted 100644 → 0
View file @ 65f8c992
package com.example.tdl.domain.vo;
public class AddUserRouteVo {
private String name;
private String country;
private String province;
private String city;
private String address;
private String longitude;
private String latitude;
private String remark;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getProvince() {
return province;
}
public void setProvince(String province) {
this.province = province;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
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 String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/domain/vo/AddressVo.java 0 → 100644
View file @ 2d27b404
package com.example.tdl.domain.vo;
public class AddressVo {
private Integer sequence;
private String country;
private String city;
private String addressDetail;
private String lng;
private String lat;
private String postCode;
private Long expTime;
private Long compTime;//预计结束时间
public Integer getSequence() {
return sequence;
}
public void setSequence(Integer sequence) {
this.sequence = sequence;
}
public String getCountry() {
return country;
}
public void setCountry(String country) {
this.country = country;
}
public String getCity() {
return city;
}
public void setCity(String city) {
this.city = city;
}
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 Long getExpTime() {
return expTime;
}
public void setExpTime(Long expTime) {
this.expTime = expTime;
}
public Long getCompTime() {
return compTime;
}
public void setCompTime(Long compTime) {
this.compTime = compTime;
}
}
src/main/java/com/example/tdl/domain/vo/AlarmLogVo.java
View file @ 2d27b404
...@@ -2,7 +2,7 @@ package com.example.tdl.domain.vo; ...@@ -2,7 +2,7 @@ package com.example.tdl.domain.vo;
public class AlarmLogVo { public class AlarmLogVo {
private String routeName; private String TDLSN;
private String description; private String description;
...@@ -10,12 +10,12 @@ public class AlarmLogVo { ...@@ -10,12 +10,12 @@ public class AlarmLogVo {
private Long alarmTime; private Long alarmTime;
public String getRouteName() { public String getTDLSN() {
return routeName; return TDLSN;
} }
public void setRouteName(String routeName) { public void setTDLSN(String TDLSN) {
this.routeName = routeName; this.TDLSN = TDLSN;
} }
public String getDescription() { public String getDescription() {
......
src/main/java/com/example/tdl/domain/vo/CircuitTermVo.java
View file @ 2d27b404
package com.example.tdl.domain.vo; package com.example.tdl.domain.vo;
public class CircuitTermVo { public class CircuitTermVo {
private String transportationNo; private String cargoNo;
private String routeNumber;
private Integer alarmType;
private Integer circuitState; private Integer circuitState;
private String startCity; private Long startTime;
private String endCity;
private Long startTimeMin;
private Long startTimeMax;
private Long endTimeMin;
private Long endTimeMax;
private Long endTime;
public String getTransportationNo() { public String getCargoNo() {
return transportationNo; return cargoNo;
}
public void setTransportationNo(String transportationNo) {
this.transportationNo = transportationNo;
}
public String getRouteNumber() {
return routeNumber;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
public Integer getAlarmType() {
return alarmType;
} }
public void setAlarmType(Integer alarmType) { public void setCargoNo(String cargoNo) {
this.alarmType = alarmType; this.cargoNo = cargoNo;
} }
public Integer getCircuitState() { public Integer getCircuitState() {
...@@ -55,51 +25,19 @@ public class CircuitTermVo { ...@@ -55,51 +25,19 @@ public class CircuitTermVo {
this.circuitState = circuitState; this.circuitState = circuitState;
} }
public String getStartCity() { public Long getStartTime() {
return startCity; return startTime;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public Long getStartTimeMin() {
return startTimeMin;
}
public void setStartTimeMin(Long startTimeMin) {
this.startTimeMin = startTimeMin;
}
public Long getStartTimeMax() {
return startTimeMax;
}
public void setStartTimeMax(Long startTimeMax) {
this.startTimeMax = startTimeMax;
}
public Long getEndTimeMin() {
return endTimeMin;
} }
public void setEndTimeMin(Long endTimeMin) { public void setStartTime(Long startTime) {
this.endTimeMin = endTimeMin; this.startTime = startTime;
} }
public Long getEndTimeMax() { public Long getEndTime() {
return endTimeMax; return endTime;
} }
public void setEndTimeMax(Long endTimeMax) { public void setEndTime(Long endTime) {
this.endTimeMax = endTimeMax; this.endTime = endTime;
} }
} }
src/main/java/com/example/tdl/domain/vo/CircuitVo.java
View file @ 2d27b404
package com.example.tdl.domain.vo; package com.example.tdl.domain.vo;
public class CircuitVo { public class CircuitVo {
private String transportationNo; private String transportationNo;
private String routeName; private String cargoNo;
private String startLongitude;
private String startLatitude;
private String startCity; private String startCity;
private String startTime;
private String endLongitude;
private String endLatitude;
private String endCity; private String endCity;
private String endTime; private Long startTime;
private String transport;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private int circuitState;
private String remark;
public String getTransportationNo() {
return transportationNo;
}
public void setTransportationNo(String transportationNo) {
this.transportationNo = transportationNo;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getStartLongitude() {
return startLongitude;
}
public void setStartLongitude(String startLongitude) {
this.startLongitude = startLongitude;
}
public String getStartLatitude() {
return startLatitude;
}
public void setStartLatitude(String startLatitude) {
this.startLatitude = startLatitude;
}
public String getStartCity() {
return startCity;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
this.startTime = startTime;
}
public String getEndLongitude() {
return endLongitude;
}
public void setEndLongitude(String endLongitude) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public String getEndTime() {
return endTime;
}
public void setEndTime(String endTime) {
this.endTime = endTime;
}
public String getTransport() {
return transport;
}
public void setTransport(String transport) {
this.transport = transport;
}
public String getBoxNo() {
return boxNo;
}
public void setBoxNo(String boxNo) {
this.boxNo = boxNo;
}
public String getContainerNo() {
return containerNo;
}
public void setContainerNo(String containerNo) {
this.containerNo = containerNo;
}
public String getDeliveryAddress() {
return deliveryAddress;
}
public void setDeliveryAddress(String deliveryAddress) {
this.deliveryAddress = deliveryAddress;
}
public String getTransportationType() {
return transportationType;
}
public void setTransportationType(String transportationType) { private Long endTime;
this.transportationType = transportationType;
}
public int getCircuitState() {
return circuitState;
}
public void setCircuitState(int circuitState) {
this.circuitState = circuitState;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
} }
src/main/java/com/example/tdl/domain/vo/HomePageDataVo.java
View file @ 2d27b404
...@@ -8,16 +8,14 @@ public class HomePageDataVo { ...@@ -8,16 +8,14 @@ public class HomePageDataVo {
private Integer onRoute;//在途数量 private Integer onRoute;//在途数量
private Integer complted;//已完成 private Integer alarmed;//报警数量
private Integer alarmed;//报警线路 private Integer delay;
private List<CircuitVo> routeVoList;//线路列表 private Integer bump;//颠簸异常
//报警列表 //报警列表
private List<AlarmLogVo> alarmLogVoList; private List<AlarmLogVo> alarmLogVoList;
//报警原因分析
public Integer getSum() { public Integer getSum() {
return sum; return sum;
...@@ -35,14 +33,6 @@ public class HomePageDataVo { ...@@ -35,14 +33,6 @@ public class HomePageDataVo {
this.onRoute = onRoute; this.onRoute = onRoute;
} }
public Integer getComplted() {
return complted;
}
public void setComplted(Integer complted) {
this.complted = complted;
}
public Integer getAlarmed() { public Integer getAlarmed() {
return alarmed; return alarmed;
} }
...@@ -51,12 +41,20 @@ public class HomePageDataVo { ...@@ -51,12 +41,20 @@ public class HomePageDataVo {
this.alarmed = alarmed; this.alarmed = alarmed;
} }
public List<CircuitVo> getRouteVoList() { public Integer getDelay() {
return routeVoList; return delay;
}
public void setDelay(Integer delay) {
this.delay = delay;
}
public Integer getBump() {
return bump;
} }
public void setRouteVoList(List<CircuitVo> routeVoList) { public void setBump(Integer bump) {
this.routeVoList = routeVoList; this.bump = bump;
} }
public List<AlarmLogVo> getAlarmLogVoList() { public List<AlarmLogVo> getAlarmLogVoList() {
......
src/main/java/com/example/tdl/domain/vo/ResultAlarmLog.java
View file @ 2d27b404
...@@ -4,7 +4,7 @@ public class ResultAlarmLog { ...@@ -4,7 +4,7 @@ public class ResultAlarmLog {
private String transportationNo; private String transportationNo;
private String routeName; private String TDLSN;
private String description; private String description;
...@@ -20,12 +20,12 @@ public class ResultAlarmLog { ...@@ -20,12 +20,12 @@ public class ResultAlarmLog {
this.transportationNo = transportationNo; this.transportationNo = transportationNo;
} }
public String getRouteName() { public String getTDLSN() {
return routeName; return TDLSN;
} }
public void setRouteName(String routeName) { public void setTDLSN(String TDLSN) {
this.routeName = routeName; this.TDLSN = TDLSN;
} }
public String getDescription() { public String getDescription() {
......
src/main/java/com/example/tdl/domain/vo/ResultCircuitVo.java
View file @ 2d27b404
...@@ -3,52 +3,20 @@ package com.example.tdl.domain.vo; ...@@ -3,52 +3,20 @@ package com.example.tdl.domain.vo;
public class ResultCircuitVo { public class ResultCircuitVo {
private String transportationNo; private String transportationNo;
private String routeNumber; private String cargoNo;//货物编号
private String routeName;
private String startLongitude;
private String startLatitude;
private String startCity; private String startCity;
private String startAddress;
private Long startTime; private Long startTime;
private String endLongitude;
private String endLatitude;
private String endCity; private String endCity;
private String endAddress;
private Long endTime; private Long endTime;
private String transport; private Integer circuitState;
private String alarmType; private String alarmType;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private int circuitState;
private String remark;
private Long createTime;
private String evaluate;
private String evaluateRemark;
public String getTransportationNo() { public String getTransportationNo() {
return transportationNo; return transportationNo;
} }
...@@ -57,36 +25,12 @@ public class ResultCircuitVo { ...@@ -57,36 +25,12 @@ public class ResultCircuitVo {
this.transportationNo = transportationNo; this.transportationNo = transportationNo;
} }
public String getRouteNumber() { public String getCargoNo() {
return routeNumber; return cargoNo;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getStartLongitude() {
return startLongitude;
} }
public void setStartLongitude(String startLongitude) { public void setCargoNo(String cargoNo) {
this.startLongitude = startLongitude; this.cargoNo = cargoNo;
}
public String getStartLatitude() {
return startLatitude;
}
public void setStartLatitude(String startLatitude) {
this.startLatitude = startLatitude;
} }
public String getStartCity() { public String getStartCity() {
...@@ -97,14 +41,6 @@ public class ResultCircuitVo { ...@@ -97,14 +41,6 @@ public class ResultCircuitVo {
this.startCity = startCity; this.startCity = startCity;
} }
public String getStartAddress() {
return startAddress;
}
public void setStartAddress(String startAddress) {
this.startAddress = startAddress;
}
public Long getStartTime() { public Long getStartTime() {
return startTime; return startTime;
} }
...@@ -113,22 +49,6 @@ public class ResultCircuitVo { ...@@ -113,22 +49,6 @@ public class ResultCircuitVo {
this.startTime = startTime; this.startTime = startTime;
} }
public String getEndLongitude() {
return endLongitude;
}
public void setEndLongitude(String endLongitude) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
public String getEndCity() { public String getEndCity() {
return endCity; return endCity;
} }
...@@ -137,14 +57,6 @@ public class ResultCircuitVo { ...@@ -137,14 +57,6 @@ public class ResultCircuitVo {
this.endCity = endCity; this.endCity = endCity;
} }
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
public Long getEndTime() { public Long getEndTime() {
return endTime; return endTime;
} }
...@@ -153,12 +65,12 @@ public class ResultCircuitVo { ...@@ -153,12 +65,12 @@ public class ResultCircuitVo {
this.endTime = endTime; this.endTime = endTime;
} }
public String getTransport() { public Integer getCircuitState() {
return transport; return circuitState;
} }
public void setTransport(String transport) { public void setCircuitState(Integer circuitState) {
this.transport = transport; this.circuitState = circuitState;
} }
public String getAlarmType() { public String getAlarmType() {
...@@ -168,76 +80,4 @@ public class ResultCircuitVo { ...@@ -168,76 +80,4 @@ public class ResultCircuitVo {
public void setAlarmType(String alarmType) { public void setAlarmType(String alarmType) {
this.alarmType = alarmType; this.alarmType = alarmType;
} }
public String getBoxNo() {
return boxNo;
}
public void setBoxNo(String boxNo) {
this.boxNo = boxNo;
}
public String getContainerNo() {
return containerNo;
}
public void setContainerNo(String containerNo) {
this.containerNo = containerNo;
}
public String getDeliveryAddress() {
return deliveryAddress;
}
public void setDeliveryAddress(String deliveryAddress) {
this.deliveryAddress = deliveryAddress;
}
public String getTransportationType() {
return transportationType;
}
public void setTransportationType(String transportationType) {
this.transportationType = transportationType;
}
public int getCircuitState() {
return circuitState;
}
public void setCircuitState(int circuitState) {
this.circuitState = circuitState;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Long getCreateTime() {
return createTime;
}
public void setCreateTime(Long createTime) {
this.createTime = createTime;
}
public String getEvaluate() {
return evaluate;
}
public void setEvaluate(String evaluate) {
this.evaluate = evaluate;
}
public String getEvaluateRemark() {
return evaluateRemark;
}
public void setEvaluateRemark(String evaluateRemark) {
this.evaluateRemark = evaluateRemark;
}
} }
\ No newline at end of file
src/main/java/com/example/tdl/domain/vo/UpdateCircuitInfo.java
View file @ 2d27b404
package com.example.tdl.domain.vo; package com.example.tdl.domain.vo;
import java.util.List;
public class UpdateCircuitInfo { public class UpdateCircuitInfo {
private String transportationNo; private String transportationNo;
private String routeNumber; private List<AddressVo> addressVoList;
private String startCountry;
private String startProvince;
private String startCity;
private String endCountry;
private String endProvince;
private String endCity;
private String transport;
private String rRemark; private String SN;
private String startLongitude; private String TDLSN;
private String startLatitude; private String alarmType;
private String startAddress; private String cargoNo;//货物编号
private String endLongitude; private String plateNo;//车牌号
private String endLatitude; private String cargoName;
private String endAddress;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private String remark; private String remark;
...@@ -51,156 +29,60 @@ public class UpdateCircuitInfo { ...@@ -51,156 +29,60 @@ public class UpdateCircuitInfo {
this.transportationNo = transportationNo; this.transportationNo = transportationNo;
} }
public String getRouteNumber() { public List<AddressVo> getAddressVoList() {
return routeNumber; return addressVoList;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
public String getStartCountry() {
return startCountry;
}
public void setStartCountry(String startCountry) {
this.startCountry = startCountry;
}
public String getStartProvince() {
return startProvince;
}
public void setStartProvince(String startProvince) {
this.startProvince = startProvince;
}
public String getStartCity() {
return startCity;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getEndCountry() {
return endCountry;
}
public void setEndCountry(String endCountry) {
this.endCountry = endCountry;
}
public String getEndProvince() {
return endProvince;
}
public void setEndProvince(String endProvince) {
this.endProvince = endProvince;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public String getTransport() {
return transport;
}
public void setTransport(String transport) {
this.transport = transport;
}
public String getrRemark() {
return rRemark;
}
public void setrRemark(String rRemark) {
this.rRemark = rRemark;
}
public String getStartLongitude() {
return startLongitude;
}
public void setStartLongitude(String startLongitude) {
this.startLongitude = startLongitude;
}
public String getStartLatitude() {
return startLatitude;
}
public void setStartLatitude(String startLatitude) {
this.startLatitude = startLatitude;
}
public String getStartAddress() {
return startAddress;
}
public void setStartAddress(String startAddress) {
this.startAddress = startAddress;
}
public String getEndLongitude() {
return endLongitude;
} }
public void setEndLongitude(String endLongitude) { public void setAddressVoList(List<AddressVo> addressVoList) {
this.endLongitude = endLongitude; this.addressVoList = addressVoList;
} }
public String getEndLatitude() { public String getSN() {
return endLatitude; return SN;
} }
public void setEndLatitude(String endLatitude) { public void setSN(String SN) {
this.endLatitude = endLatitude; this.SN = SN;
} }
public String getEndAddress() { public String getTDLSN() {
return endAddress; return TDLSN;
} }
public void setEndAddress(String endAddress) { public void setTDLSN(String TDLSN) {
this.endAddress = endAddress; this.TDLSN = TDLSN;
} }
public String getBoxNo() { public String getAlarmType() {
return boxNo; return alarmType;
} }
public void setBoxNo(String boxNo) { public void setAlarmType(String alarmType) {
this.boxNo = boxNo; this.alarmType = alarmType;
} }
public String getContainerNo() { public String getCargoNo() {
return containerNo; return cargoNo;
} }
public void setContainerNo(String containerNo) { public void setCargoNo(String cargoNo) {
this.containerNo = containerNo; this.cargoNo = cargoNo;
} }
public String getDeliveryAddress() { public String getPlateNo() {
return deliveryAddress; return plateNo;
} }
public void setDeliveryAddress(String deliveryAddress) { public void setPlateNo(String plateNo) {
this.deliveryAddress = deliveryAddress; this.plateNo = plateNo;
} }
public String getTransportationType() { public String getCargoName() {
return transportationType; return cargoName;
} }
public void setTransportationType(String transportationType) { public void setCargoName(String cargoName) {
this.transportationType = transportationType; this.cargoName = cargoName;
} }
public String getRemark() { public String getRemark() {
......
src/main/java/com/example/tdl/domain/vo/UpdateRouteVo.java deleted 100644 → 0
View file @ 65f8c992
package com.example.tdl.domain.vo;
public class UpdateRouteVo {
private String routeNumber;
private String routeName;
private String abbreviation;
private String startLongitude;
private String startLatitude;
private String startCountry;
private String startProvince;
private String startCity;
private String startAddress;
private String endLongitude;
private String endLatitude;
private String endCountry;
private String endProvince;
private String endCity;
private String endAddress;
private String transport;
private String transportRemark;
private String remark;
public String getRouteNumber() {
return routeNumber;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
public String getRouteName() {
return routeName;
}
public void setRouteName(String routeName) {
this.routeName = routeName;
}
public String getAbbreviation() {
return abbreviation;
}
public void setAbbreviation(String abbreviation) {
this.abbreviation = abbreviation;
}
public String getStartLongitude() {
return startLongitude;
}
public void setStartLongitude(String startLongitude) {
this.startLongitude = startLongitude;
}
public String getStartLatitude() {
return startLatitude;
}
public void setStartLatitude(String startLatitude) {
this.startLatitude = startLatitude;
}
public String getStartCountry() {
return startCountry;
}
public void setStartCountry(String startCountry) {
this.startCountry = startCountry;
}
public String getStartProvince() {
return startProvince;
}
public void setStartProvince(String startProvince) {
this.startProvince = startProvince;
}
public String getStartCity() {
return startCity;
}
public void setStartCity(String startCity) {
this.startCity = startCity;
}
public String getStartAddress() {
return startAddress;
}
public void setStartAddress(String startAddress) {
this.startAddress = startAddress;
}
public String getEndLongitude() {
return endLongitude;
}
public void setEndLongitude(String endLongitude) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
public String getEndCountry() {
return endCountry;
}
public void setEndCountry(String endCountry) {
this.endCountry = endCountry;
}
public String getEndProvince() {
return endProvince;
}
public void setEndProvince(String endProvince) {
this.endProvince = endProvince;
}
public String getEndCity() {
return endCity;
}
public void setEndCity(String endCity) {
this.endCity = endCity;
}
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
public String getTransport() {
return transport;
}
public void setTransport(String transport) {
this.transport = transport;
}
public String getTransportRemark() {
return transportRemark;
}
public void setTransportRemark(String transportRemark) {
this.transportRemark = transportRemark;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/entity/Circuit.java
View file @ 2d27b404
...@@ -25,6 +25,8 @@ public class Circuit implements Serializable { ...@@ -25,6 +25,8 @@ public class Circuit implements Serializable {
private String cargoNo;//货物编号 private String cargoNo;//货物编号
private String cargoName;
private String plateNo;//车牌号 private String plateNo;//车牌号
private String deliveryAddress; private String deliveryAddress;
...@@ -101,6 +103,14 @@ public class Circuit implements Serializable { ...@@ -101,6 +103,14 @@ public class Circuit implements Serializable {
this.cargoNo = cargoNo; this.cargoNo = cargoNo;
} }
public String getCargoName() {
return cargoName;
}
public void setCargoName(String cargoName) {
this.cargoName = cargoName;
}
public String getPlateNo() { public String getPlateNo() {
return plateNo; return plateNo;
} }
......
src/main/java/com/example/tdl/mapper/AlarmLogMapper.java
View file @ 2d27b404
...@@ -13,12 +13,14 @@ public interface AlarmLogMapper { ...@@ -13,12 +13,14 @@ public interface AlarmLogMapper {
List<AlarmLogVo> getAll(); List<AlarmLogVo> getAll();
//根据条件获取报警数据 //根据条件获取报警数据
List<AlarmLogVo> getAlarmLog(String time); List<AlarmLogVo> getAlarmLog(Integer time);
//新增报警数据 //新增报警数据
int addAlarmLog(AddAlarmLogVo addAlarmLogVo); int addAlarmLog(AddAlarmLogVo addAlarmLogVo);
List<ResultAlarmLog> getByTransportationNo(String transportationNo); List<ResultAlarmLog> getByTransportationNo(String transportationNo);
Integer getCount(); Integer getCount(Integer time);
Integer getBumpCount(Integer time);
} }
src/main/java/com/example/tdl/mapper/CircuitMapper.java
View file @ 2d27b404
...@@ -8,35 +8,39 @@ import java.util.Map; ...@@ -8,35 +8,39 @@ import java.util.Map;
@Mapper @Mapper
public interface CircuitMapper { public interface CircuitMapper {
// List<ResultCircuitVo> getAll(); List<ResultCircuitVo> getAll();
//
List<ResultCircuitVo> getByTerm(CircuitTermVo circuitTermVo);
// List<CircuitVo> getDistinct(); // List<CircuitVo> getDistinct();
//
// 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); Integer getOnRoute(Integer time);
//
// ResultGatewayVo getByNo(String transportationNo); Integer getDelayCount(Long compTime);
//
// Integer getOnRoute(); Integer getComplted(Integer time);
//
// Integer getComplted(); Integer getCount(Integer time);
//
// Integer getCount(); List<CircuitVo> getByTime(Integer time);
//
// List<CircuitVo> getByTime(String time); List<ResultCircuitVo> getByContainerNo(String cargoNo);
//
// List<ResultCircuitVo> getByContainerNo(String containerNo); int updateEvaluate(UpdateEvaluateVo updateEvaluateVo);
//
// int updateEvaluate(UpdateEvaluateVo updateEvaluateVo); List<ResultCircuitVo> getByCircuitState(Integer circuitState);
//
// List<ResultCircuitVo> getByCircuitState(Integer circuitState); Integer getNo(String transportationNo);
ResultGatewayVo getByNo(String transportationNo);
} }
src/main/java/com/example/tdl/mapper/GatewayMapper.java
View file @ 2d27b404
...@@ -23,4 +23,6 @@ public interface GatewayMapper { ...@@ -23,4 +23,6 @@ public interface GatewayMapper {
int getIdBySNAndType(@Param("SN") String SN,@Param("type") String type); int getIdBySNAndType(@Param("SN") String SN,@Param("type") String type);
int deployGateway(Map<Object,Object> map); int deployGateway(Map<Object,Object> map);
String getBySN(String SN);
} }
src/main/java/com/example/tdl/mapper/TDLLogMapper.java
View file @ 2d27b404
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/service/AlarmLogService.java
View file @ 2d27b404
...@@ -19,7 +19,7 @@ public class AlarmLogService { ...@@ -19,7 +19,7 @@ public class AlarmLogService {
return alarmLogMapper.getAll(); return alarmLogMapper.getAll();
} }
public List<AlarmLogVo> getAlarmLog(String time){ public List<AlarmLogVo> getAlarmLog(Integer time){
return alarmLogMapper.getAlarmLog(time); return alarmLogMapper.getAlarmLog(time);
} }
...@@ -31,8 +31,12 @@ public class AlarmLogService { ...@@ -31,8 +31,12 @@ public class AlarmLogService {
return alarmLogMapper.getByTransportationNo(transportationNo); return alarmLogMapper.getByTransportationNo(transportationNo);
} }
public Integer getCount(){ public Integer getCount(Integer time){
return alarmLogMapper.getCount(); return alarmLogMapper.getCount(time);
}
public Integer getBumpCount(Integer time){
return alarmLogMapper.getBumpCount(time);
} }
......
src/main/java/com/example/tdl/service/CircuitService.java
View file @ 2d27b404
...@@ -3,7 +3,6 @@ package com.example.tdl.service; ...@@ -3,7 +3,6 @@ package com.example.tdl.service;
import com.example.tdl.domain.vo.*; import com.example.tdl.domain.vo.*;
import com.example.tdl.mapper.CircuitMapper; import com.example.tdl.mapper.CircuitMapper;
import com.example.tdl.mapper.RoleMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -12,72 +11,81 @@ import java.util.Map; ...@@ -12,72 +11,81 @@ 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){
// return circuitMapper.updateEndTime(updateCircuitVo); public int updateEndTime(UpdateCircuitVo updateCircuitVo){
// } return circuitMapper.updateEndTime(updateCircuitVo);
// }
// public int delCircuit(String transportationNo){
// return circuitMapper.delCircuit(transportationNo); public int delCircuit(String transportationNo){
// } return circuitMapper.delCircuit(transportationNo);
// }
// public ResultCircuitVo getByTransportationNo(String transportationNo){
// return circuitMapper.getByTransportationNo(transportationNo); public ResultCircuitVo getByTransportationNo(String transportationNo){
// } return circuitMapper.getByTransportationNo(transportationNo);
// }
// public ResultGatewayVo getByNo(String transportationNo){
// return circuitMapper.getByNo(transportationNo); public Integer getOnRoute(Integer time){
// } return circuitMapper.getOnRoute(time);
// }
// public Integer getOnRoute(){
// return circuitMapper.getOnRoute(); public Integer getDelayCount(Long compTime){
// } return circuitMapper.getDelayCount(compTime);
// }
// public Integer getComplted(){
// return circuitMapper.getComplted(); public Integer getComplted(Integer time){
// } return circuitMapper.getComplted(time);
// }
//
// public Integer getCount(){
// return circuitMapper.getCount(); public Integer getCount(Integer time){
// } return circuitMapper.getCount(time);
// }
// public List<CircuitVo> getByTime(String time){
// return circuitMapper.getByTime(time); public List<CircuitVo> getByTime(Integer time){
// } return circuitMapper.getByTime(time);
// }
// public List<ResultCircuitVo> getByContainerNo(String containerNo){
// return circuitMapper.getByContainerNo(containerNo); public List<ResultCircuitVo> getByContainerNo(String cargoNo){
// } return circuitMapper.getByContainerNo(cargoNo);
// }
// public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){
// return circuitMapper.updateEvaluate(updateEvaluateVo); public int updateEvaluate(UpdateEvaluateVo updateEvaluateVo){
// } return circuitMapper.updateEvaluate(updateEvaluateVo);
// }
// public List<ResultCircuitVo> getByCircuitState(Integer circuitState){
// return circuitMapper.getByCircuitState(circuitState); public List<ResultCircuitVo> getByCircuitState(Integer circuitState){
// } return circuitMapper.getByCircuitState(circuitState);
}
public Integer getNo(String transportationNo){
return circuitMapper.getNo(transportationNo);
}
public ResultGatewayVo getByNo(String transportationNo){
return circuitMapper.getByNo(transportationNo);
}
} }
src/main/java/com/example/tdl/service/ConfigService.java
View file @ 2d27b404
...@@ -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 updateConfig(Map<Object,Object> map ){
// public int delConfig(String gSN,String gType){ return configMapper.updateConfig(map);
// return configMapper.delConfig(gSN,gType); }
// }
//解绑成功
public int delConfig(String gSN,String gType){
return configMapper.delConfig(gSN,gType);
}
} }
src/main/java/com/example/tdl/service/GatewayService.java
View file @ 2d27b404
...@@ -45,4 +45,8 @@ public class GatewayService { ...@@ -45,4 +45,8 @@ public class GatewayService {
public int deployGateway(Map<Object,Object> map){ public int deployGateway(Map<Object,Object> map){
return gatewayMapper.deployGateway(map); return gatewayMapper.deployGateway(map);
} }
public String getBySN(String SN){
return gatewayMapper.getBySN(SN);
}
} }
src/main/java/com/example/tdl/service/RouteService.java
View file @ 2d27b404
package com.example.tdl.service; package com.example.tdl.service;
import com.example.tdl.domain.vo.ResultRouteVo;
import com.example.tdl.domain.vo.RouteTermVo;
import com.example.tdl.domain.vo.UpdateRouteVo;
import com.example.tdl.entity.Route;
import com.example.tdl.mapper.RoleMapper;
import com.example.tdl.mapper.RouteMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service @Service
public class RouteService { public class RouteService {
......
src/main/java/com/example/tdl/service/TDLLogService.java
View file @ 2d27b404
...@@ -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/web/AlarmLogController.java
View file @ 2d27b404
...@@ -25,15 +25,6 @@ public class AlarmLogController { ...@@ -25,15 +25,6 @@ public class AlarmLogController {
@Autowired @Autowired
private AlarmLogService alarmLogServcie; private AlarmLogService alarmLogServcie;
//获取所有的报警数据
@GetMapping("/getAll")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
public Object getAll(){
return alarmLogServcie.getAll();
}
//新增报警消息 //新增报警消息
@PostMapping("/addAlarmLog") @PostMapping("/addAlarmLog")
@ApiImplicitParams({ @ApiImplicitParams({
...@@ -45,7 +36,7 @@ public class AlarmLogController { ...@@ -45,7 +36,7 @@ public class AlarmLogController {
fb.setMessage("运输编号不能为空"); fb.setMessage("运输编号不能为空");
return gson.toJson(fb); return gson.toJson(fb);
} }
if(StringUtils.isEmpty(addAlarmLogVo.getRouteName())){ if(StringUtils.isEmpty(addAlarmLogVo.getTDLSN())){
fb.setCode(0); fb.setCode(0);
fb.setMessage("路由名称不能为空"); fb.setMessage("路由名称不能为空");
return gson.toJson(fb); return gson.toJson(fb);
......
src/main/java/com/example/tdl/web/UserRouteController.java
View file @ 2d27b404
...@@ -4,7 +4,6 @@ package com.example.tdl.web; ...@@ -4,7 +4,6 @@ package com.example.tdl.web;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.example.tdl.domain.dto.CommFeedback; import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.AddUserRouteVo;
import com.example.tdl.domain.vo.UpdateUserRouteVo; import com.example.tdl.domain.vo.UpdateUserRouteVo;
import com.example.tdl.domain.vo.UserRedisVo; import com.example.tdl.domain.vo.UserRedisVo;
import com.example.tdl.service.UserRouteService; import com.example.tdl.service.UserRouteService;
......
src/main/resources/mapper/CircuitMapper.xml
View file @ 2d27b404
This diff is collapsed.
src/main/resources/mapper/GatewayMapper.xml
View file @ 2d27b404
This diff is collapsed.
src/main/resources/mapper/TDLLogMapper.xml
View file @ 2d27b404
This diff is collapsed.
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