Skip to content

T
TDLCloud
Commit aef092bd authored by chenying's avatar chenying
Browse files
Options

3.15线路的增删改查和路由的修改

parent 26c69007
Hide whitespace changes
Inline Side-by-side
Showing with 41738 additions and 4553 deletions
logback.log
View file @ aef092bd
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/java/com/example/tdl/domain/vo/AddCircuitVo.java 0 → 100644
View file @ aef092bd
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;
private String startLongitude;
private String startLatitude;
private String startAddress;
private String endLongitude;
private String endLatitude;
private String endAddress;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private String remark;
public String getrRemark() {
return rRemark;
}
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) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
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 String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/domain/vo/AddRouteVo.java
View file @ aef092bd
......@@ -2,52 +2,22 @@ package com.example.tdl.domain.vo;
public class AddRouteVo {
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 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;
}
......@@ -72,30 +42,6 @@ public class AddRouteVo {
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;
}
......@@ -120,14 +66,6 @@ public class AddRouteVo {
this.endCity = endCity;
}
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
public String getTransport() {
return transport;
}
......@@ -136,14 +74,6 @@ public class AddRouteVo {
this.transport = transport;
}
public String getTransportRemark() {
return transportRemark;
}
public void setTransportRemark(String transportRemark) {
this.transportRemark = transportRemark;
}
public String getRemark() {
return remark;
}
......
src/main/java/com/example/tdl/domain/vo/CircuitTermVo.java 0 → 100644
View file @ aef092bd
package com.example.tdl.domain.vo;
public class CircuitTermVo {
private String transportationNo;
private String routeNumber;
private Integer alarmType;
private Integer circuitState;
private String startCity;
private String endCity;
private Long startTimeMin;
private Long startTimeMax;
private Long endTimeMin;
private Long endTimeMax;
public String getTransportationNo() {
return transportationNo;
}
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) {
this.alarmType = alarmType;
}
public Integer getCircuitState() {
return circuitState;
}
public void setCircuitState(Integer circuitState) {
this.circuitState = circuitState;
}
public String getStartCity() {
return startCity;
}
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) {
this.endTimeMin = endTimeMin;
}
public Long getEndTimeMax() {
return endTimeMax;
}
public void setEndTimeMax(Long endTimeMax) {
this.endTimeMax = endTimeMax;
}
}
src/main/java/com/example/tdl/domain/vo/ResultCircuitVo.java 0 → 100644
View file @ aef092bd
package com.example.tdl.domain.vo;
public class ResultCircuitVo {
private String transportationNo;
private String routeNumber;
private String routeName;
private String startLongitude;
private String startLatitude;
private String startCity;
private String startAddress;
private String startTime;
private String endLongitude;
private String endLatitude;
private String endCity;
private String endAddress;
private String endTime;
private String transport;
private String alarmType;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private int circuitState;
private String remark;
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) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
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 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 String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getTransportationNo() {
return transportationNo;
}
public void setTransportationNo(String transportationNo) {
this.transportationNo = transportationNo;
}
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 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 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 getAlarmType() {
return alarmType;
}
public void setAlarmType(String alarmType) {
this.alarmType = alarmType;
}
public int getCircuitState() {
return circuitState;
}
public void setCircuitState(int circuitState) {
this.circuitState = circuitState;
}
}
src/main/java/com/example/tdl/domain/vo/ResultRouteVo.java
View file @ aef092bd
......@@ -5,36 +5,20 @@ public class ResultRouteVo {
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() {
......@@ -53,30 +37,6 @@ public class ResultRouteVo {
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;
}
......@@ -101,30 +61,6 @@ public class ResultRouteVo {
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;
}
......@@ -149,14 +85,6 @@ public class ResultRouteVo {
this.endCity = endCity;
}
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
public String getTransport() {
return transport;
}
......@@ -165,14 +93,6 @@ public class ResultRouteVo {
this.transport = transport;
}
public String getTransportRemark() {
return transportRemark;
}
public void setTransportRemark(String transportRemark) {
this.transportRemark = transportRemark;
}
public String getRemark() {
return remark;
}
......
src/main/java/com/example/tdl/domain/vo/UpdateCircuitInfo.java 0 → 100644
View file @ aef092bd
package com.example.tdl.domain.vo;
public class UpdateCircuitInfo {
private String transportationNo;
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;
private String startLongitude;
private String startLatitude;
private String startAddress;
private String endLongitude;
private String endLatitude;
private String endAddress;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private String remark;
public String getTransportationNo() {
return transportationNo;
}
public void setTransportationNo(String transportationNo) {
this.transportationNo = transportationNo;
}
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 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) {
this.endLongitude = endLongitude;
}
public String getEndLatitude() {
return endLatitude;
}
public void setEndLatitude(String endLatitude) {
this.endLatitude = endLatitude;
}
public String getEndAddress() {
return endAddress;
}
public void setEndAddress(String endAddress) {
this.endAddress = endAddress;
}
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 String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
src/main/java/com/example/tdl/domain/vo/UpdateCircuitVo.java 0 → 100644
View file @ aef092bd
package com.example.tdl.domain.vo;
public class UpdateCircuitVo {
private Long endTime;
private String transportationNo;
public Long getEndTime() {
return endTime;
}
public void setEndTime(Long endTime) {
this.endTime = endTime;
}
public String getTransportationNo() {
return transportationNo;
}
public void setTransportationNo(String transportationNo) {
this.transportationNo = transportationNo;
}
}
src/main/java/com/example/tdl/domain/vo/UpdatePasswordVo.java 0 → 100644
View file @ aef092bd
package com.example.tdl.domain.vo;
public class UpdatePasswordVo {
private String userNumber;
private String password;
public String getUserNumber() {
return userNumber;
}
public void setUserNumber(String userNumber) {
this.userNumber = userNumber;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
}
src/main/java/com/example/tdl/entity/Circuit.java
View file @ aef092bd
......@@ -21,10 +21,78 @@ public class Circuit implements Serializable {
private Long endTime;
private Alarm alarm;
private String boxNo;
private String containerNo;
private String deliveryAddress;
private String transportationType;
private boolean circuitState;//线路完成状态
private String routeNumber;
private String remark;
public Serializable getSerializable() {
return serializable;
}
public void setSerializable(Serializable serializable) {
this.serializable = serializable;
}
public Alarm getAlarm() {
return alarm;
}
public void setAlarm(Alarm alarm) {
this.alarm = alarm;
}
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 String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public Integer getId() {
return id;
}
......
src/main/java/com/example/tdl/entity/Gateway.java
View file @ aef092bd
......@@ -5,16 +5,36 @@ public class Gateway {
private String SN;
private String name;
private String type;
private boolean state;
private boolean bConfig;
private int useScene;
private Long createTime;
private Long updateTime;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getUseScene() {
return useScene;
}
public void setUseScene(int useScene) {
this.useScene = useScene;
}
public int getId() {
return id;
}
......
src/main/java/com/example/tdl/entity/UserRoute.java 0 → 100644
View file @ aef092bd
package com.example.tdl.entity;
public class UserRoute {
private Integer id;
private String userNumber;
private String routeNumber;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserNumber() {
return userNumber;
}
public void setUserNumber(String userNumber) {
this.userNumber = userNumber;
}
public String getRouteNumber() {
return routeNumber;
}
public void setRouteNumber(String routeNumber) {
this.routeNumber = routeNumber;
}
}
src/main/java/com/example/tdl/mapper/CircuitMapper.java
View file @ aef092bd
package com.example.tdl.mapper;
import com.example.tdl.domain.vo.CircuitTermVo;
import com.example.tdl.domain.vo.ResultCircuitVo;
import com.example.tdl.domain.vo.ResultRouteVo;
import com.example.tdl.domain.vo.UpdateCircuitVo;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
public interface CircuitMapper {
List<ResultCircuitVo> getAll();
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);
}
src/main/java/com/example/tdl/mapper/CityConfigMapper.java 0 → 100644
View file @ aef092bd
package com.example.tdl.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface CityConfigMapper {
Integer getIdByCountryAndCity(@Param("country") String country,@Param("city") String city);
}
src/main/java/com/example/tdl/mapper/RouteMapper.java
View file @ aef092bd
......@@ -7,6 +7,7 @@ import com.example.tdl.entity.Route;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
@Mapper
......@@ -14,15 +15,19 @@ public interface RouteMapper {
List<ResultRouteVo> getAll();
List<ResultRouteVo> getAllRoute(String time);
List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo);
int addRoute(Route route);
int updateRoute(Route route);
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);
// int updateRoute(Route route);
}
src/main/java/com/example/tdl/mapper/UserMapper.java
View file @ aef092bd
......@@ -30,4 +30,6 @@ public interface UserMapper {
int delUser(String userNumber);
int resetPassword(@Param("userNumber") String userNumber,@Param("password") String password);
int updatePassword(UpdatePasswordVo updatePasswordVo);
}
src/main/java/com/example/tdl/service/CircuitService.java
View file @ aef092bd
package com.example.tdl.service;
import com.example.tdl.domain.vo.AddCircuitVo;
import com.example.tdl.domain.vo.CircuitTermVo;
import com.example.tdl.domain.vo.ResultCircuitVo;
import com.example.tdl.domain.vo.UpdateCircuitVo;
import com.example.tdl.mapper.CircuitMapper;
import com.example.tdl.mapper.RoleMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class CircuitService {
@Autowired
private CircuitMapper circuitMapper;
public List<ResultCircuitVo> getAll(){
return circuitMapper.getAll();
}
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);
}
}
src/main/java/com/example/tdl/service/CityConfigService.java 0 → 100644
View file @ aef092bd
package com.example.tdl.service;
import com.example.tdl.mapper.CityConfigMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Service
public class CityConfigService {
@Autowired
private CityConfigMapper cityConfigMapper;
public Integer getIdByCountryAndCity(String country ,String city){
return cityConfigMapper.getIdByCountryAndCity(country, city);
}
}
src/main/java/com/example/tdl/service/RouteService.java
View file @ aef092bd
......@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
@Service
public class RouteService {
......@@ -21,20 +22,12 @@ public class RouteService {
return routeMapper.getAll();
}
public List<ResultRouteVo> getAllRoute(String time){
return routeMapper.getAllRoute(time);
}
public List<ResultRouteVo> getRouteByTerm(RouteTermVo routeTermVo){
return routeMapper.getRouteByTerm(routeTermVo);
}
public int addRoute(Route route){
return routeMapper.addRoute(route);
}
public int updateRoute(Route route){
return routeMapper.updateRoute(route);
public int addRoute(Map<Object,Object> map){
return routeMapper.addRoute(map);
}
public int delRoute(String routeNumber){
......@@ -44,4 +37,20 @@ public class RouteService {
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);
// }
// public int updateRoute(Route route){
// return routeMapper.updateRoute(route);
// }
}
src/main/java/com/example/tdl/service/UserService.java
View file @ aef092bd
......@@ -66,6 +66,10 @@ public class UserService {
return userMapper.resetPassword(userNumber,password);
}
public int updatePassword(UpdatePasswordVo updatePasswordVo){
return userMapper.updatePassword(updatePasswordVo);
}
//登录
public String getUser(LoginUserVo loginUserVo) {
......
src/main/java/com/example/tdl/web/CircuitController.java 0 → 100644
View file @ aef092bd
package com.example.tdl.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.example.tdl.domain.dto.CommFeedback;
import com.example.tdl.domain.vo.*;
import com.example.tdl.service.CircuitService;
import com.example.tdl.service.RouteService;
import com.example.tdl.service.redis.TokenRedisService;
import com.google.gson.Gson;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@RestController
@RequestMapping("/circuit")
public class CircuitController {
private Logger logger = LoggerFactory.getLogger(CircuitController.class);
CommFeedback fb=new CommFeedback();
Gson gson=new Gson();
@Autowired
private CircuitService circuitService;
@Autowired
private RouteService routeService;
@Autowired
private TokenRedisService tokenRedisService;
//获取线路信息
@ApiOperation(value = "获取线路信息",notes = "获取线路信息，返回值说明：" +
" transportationNo:运输编号," +
" routeNumber:路由编号," +
" routeName:路由名" +
" startLongitude:起运经度," +
" startLatitude:起运纬度," +
" startCity:起运城市," +
" startAddress:起运具体地址," +
" startTime:起运时间," +
" endLongitude:目的经度," +
" endLatitude:目的纬度," +
" endCity:目的城市," +
" endAddress:目的具体地址," +
" endTime:目的时间," +
" transport:运输方式," +
" alarmType:预警类型," +
" boxNo:箱单号," +
" containerNo:集装箱号," +
" deliveryAddress:交付地址," +
" transportationType:运输类型" +
" circuitState:线路状态（0未开始，1运输中，2完成）," +
" remark:备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/getAll",method = RequestMethod.GET)
public Object getAll(){
return circuitService.getAll();
}
//根据条件查询
@ApiOperation(value = "根据条件查询",notes = "根据条件查询:" +
" transportationNo:运输编号," +
" routeNumber:路由编号," +
" alarmType:预警情况（正常传0，预警传1）" +
" circuitState:线路状态（0未开始，1运输中，2完成）," +
" startCity:起运城市," +
" endCity:目的城市," +
" startTimeMin:起运时间的最小值," +
" startTimeMax:起运时间的最大值," +
" endTimeMin:到达时间的最小值," +
" endTimeMax:到达时间的最大值。" +
"返回值说明：" +
" transportationNo:运输编号," +
" routeNumber:路由编号," +
" routeName:路由名" +
" startLongitude:起运经度," +
" startLatitude:起运纬度," +
" startCity:起运城市," +
" startAddress:起运具体地址," +
" startTime:起运时间," +
" endLongitude:目的经度," +
" endLatitude:目的纬度," +
" endCity:目的城市," +
" endAddress:目的具体地址," +
" endTime:目的时间," +
" transport:运输方式," +
" alarmType:预警类型," +
" boxNo:箱单号," +
" containerNo:集装箱号," +
" deliveryAddress:交付地址," +
" transportationType:运输类型" +
" circuitState:线路状态（0未开始，1运输中，2完成）," +
" remark:备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/getByTerm",method = RequestMethod.POST)
public Object getByTerm(@RequestBody CircuitTermVo circuitTermVo){
if(circuitTermVo.getStartTimeMin()!=null&&circuitTermVo.getStartTimeMax()==null){
fb.setCode(0);
fb.setMessage("起运时间的最大值不能为空");
return gson.toJson(fb);
}
if(circuitTermVo.getEndTimeMin()!=null&&circuitTermVo.getEndTimeMax()==null){
fb.setCode(0);
fb.setMessage("到达时间的最大值不能为空");
return gson.toJson(fb);
}
return circuitService.getByTerm(circuitTermVo);
}
//添加线路信息
@ApiOperation(value = "添加线路信息",notes = "添加线路信息，如果是选择一条之前的已经建立的线路，" +
"则只用传routeNumber,startLongitude,startLatitude,startAddress,startTime,endLongitude,endLatitude,endAddress,endTime,boxNo,containerNo,deliveryAddress,transportationType,remark," +
"如果是新建线路，则除了routeNumber都要传，传值说明：" +
" routeNumber:路由编号," +
" startCountry:起运国," +
" startProvince:起运省," +
" startCity:起运市," +
" endCountry:目的国," +
" endProvince:目的省," +
" endCity:目的市," +
" transport:运输方式," +
" createTime:创建时间," +
" updateTime:修改时间," +
" rRemark:路由备注," +
" startLongitude:起运经度," +
" startLatitude:起运纬度," +
" startAddress:起运具体地址," +
" startTime:起运时间," +
" endLongitude:目的经度," +
" endLatitude:目的纬度," +
" endAddress:目的具体地址," +
" endTime:目的时间," +
" boxNo:箱单号," +
" containerNo:集装箱号," +
" deliveryAddress:交付地址," +
" transportationType:运输类型," +
" remark:备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/addCircuit",method = RequestMethod.POST)
public Object addCircuit(@RequestBody AddCircuitVo addCircuitVo){
if(StringUtils.isEmpty(addCircuitVo.getStartCountry())){
fb.setCode(0);
fb.setMessage("起运国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getStartCity())){
fb.setCode(0);
fb.setMessage("起运市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getEndCountry())){
fb.setCode(0);
fb.setMessage("目的国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getEndCity())){
fb.setCode(0);
fb.setMessage("目的市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getTransport())){
fb.setCode(0);
fb.setMessage("运输方式不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getStartLongitude())){
fb.setCode(0);
fb.setMessage("起运经度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getStartLatitude())){
fb.setCode(0);
fb.setMessage("起运纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getStartAddress())){
fb.setCode(0);
fb.setMessage("起运具体地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getEndLongitude())){
fb.setCode(0);
fb.setMessage("目的经度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getEndLatitude())){
fb.setCode(0);
fb.setMessage("目的纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getEndAddress())){
fb.setCode(0);
fb.setMessage("目的具体地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getBoxNo())){
fb.setCode(0);
fb.setMessage("箱单号不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getContainerNo())){
fb.setCode(0);
fb.setMessage("集装箱号不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getDeliveryAddress())){
fb.setCode(0);
fb.setMessage("交付地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addCircuitVo.getTransportationType())){
fb.setCode(0);
fb.setMessage("运输类型不能为空");
return gson.toJson(fb);
}
if(!addCircuitVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!addCircuitVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("经度的范围为-180~180");
return gson.toJson(fb);
}
if(!addCircuitVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!addCircuitVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("经度的范围为-180~180");
return gson.toJson(fb);
}
if (!addCircuitVo.getTransport().equals("铁路")&&
!addCircuitVo.getTransport().equals("汽运")&&
!addCircuitVo.getTransport().equals("海运")&&
!addCircuitVo.getTransport().equals("空运")&&
!addCircuitVo.getTransport().equals("快递")){
fb.setCode(0);
fb.setMessage("请选择正确的运输方式");
return gson.toJson(fb);
}
if (!addCircuitVo.getDeliveryAddress().equals("港口")&&
!addCircuitVo.getDeliveryAddress().equals("仓库")&&
!addCircuitVo.getDeliveryAddress().equals("站点")){
fb.setCode(0);
fb.setMessage("请输入正确的交付地址");
return gson.toJson(fb);
}
if (!addCircuitVo.getTransportationType().equals("本地运输")&&
!addCircuitVo.getTransportationType().equals("国际运输")){
fb.setCode(0);
fb.setMessage("请输入正确的运输类型");
return gson.toJson(fb);
}
Date day=new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
Map<Object,Object> map=new HashMap<>();
map.put("startCountry",addCircuitVo.getStartCountry());
map.put("startProvince",addCircuitVo.getStartProvince());
map.put("startCity",addCircuitVo.getStartCity());
map.put("endCountry",addCircuitVo.getEndCountry());
map.put("endProvince",addCircuitVo.getEndProvince());
map.put("endCity",addCircuitVo.getEndCity());
map.put("transport",addCircuitVo.getTransport());
map.put("createTime",System.currentTimeMillis());
map.put("updateTime",System.currentTimeMillis());
map.put("rRemark",addCircuitVo.getrRemark());
map.put("startLongitude",addCircuitVo.getStartLongitude());
map.put("startLatitude",addCircuitVo.getStartLatitude());
map.put("startAddress",addCircuitVo.getStartAddress());
map.put("startTime",System.currentTimeMillis());
map.put("endLongitude",addCircuitVo.getEndLongitude());
map.put("endLatitude",addCircuitVo.getEndLatitude());
map.put("endAddress",addCircuitVo.getEndAddress());
map.put("endTime",0);
map.put("boxNo",addCircuitVo.getBoxNo());
map.put("containerNo",addCircuitVo.getContainerNo());
map.put("deliveryAddress",addCircuitVo.getDeliveryAddress());
map.put("transportationType",addCircuitVo.getTransportationType());
map.put("remark",addCircuitVo.getRemark());
String transportationNo = "";
if (addCircuitVo.getTransportationType().equals("国际运输")){
transportationNo="HUN"+df.format(day);
}
if (addCircuitVo.getTransportationType().equals("本地运输")){
transportationNo="CHN"+df.format(day);
}
String routeNumber="RT"+df.format(day);
String routeName=addCircuitVo.getStartCountry()+addCircuitVo.getStartCity()+"_"+addCircuitVo.getEndCountry()+addCircuitVo.getEndCity();
if (addCircuitVo.getTransport().equals("汽运")){
routeName=routeName+"_汽运";
routeNumber=routeNumber+"G";
transportationNo=transportationNo+"G";
}
if (addCircuitVo.getTransport().equals("铁路")){
routeName=routeName+"_铁路";
routeNumber=routeNumber+"T";
transportationNo=transportationNo+"T";
}
if (addCircuitVo.getTransport().equals("空运")){
routeName=routeName+"_空运";
routeNumber=routeNumber+"K";
transportationNo=transportationNo+"K";
}
if (addCircuitVo.getTransport().equals("快递")){
routeName=routeName+"_快递";
routeNumber=routeNumber+"D";
transportationNo=transportationNo+"D";
}
if (addCircuitVo.getTransport().equals("海运")){
routeName=routeName+"_海运";
routeNumber=routeNumber+"H";
transportationNo=transportationNo+"H";
}
routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
if (routeService.getByRouteNumber(routeNumber)>0){
while (routeService.getByRouteNumber(routeNumber)>0){
routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
}
}
transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
if (circuitService.getByTransportationNo(transportationNo)!=null){
while (routeService.getByRouteNumber(transportationNo)>0){
transportationNo=transportationNo+((int)(Math.random()*(9999-1000+1))+1000);
}
}
map.put("routeName",routeName);
map.put("routeNumber",routeNumber);
map.put("transportationNo",transportationNo);
circuitService.addCircuit(map);
Map<Object,Object> msg=new HashMap<>();
msg.put("msg",map.get("msg"));
if (msg.get("msg").equals("添加线路成功")){
fb.setCode(1);
fb.setMessage("添加线路成功");
}else {
fb.setCode(0);
fb.setMessage(msg.get("msg").toString());
}
return gson.toJson(fb);
}
//修改线路结束时间
@ApiOperation(value = "修改线路结束时间",notes = "修改线路结束时间，传值说明：" +
" transportationNo:运输编号," +
" endTime:目的时间 " )
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/updateEndTime",method = RequestMethod.POST)
public Object updateEndTime(@RequestBody UpdateCircuitVo updateCircuitVo){
if (StringUtils.isEmpty(updateCircuitVo.getTransportationNo())){
fb.setCode(0);
fb.setMessage("需要修改的运输编号不能为空");
return gson.toJson(fb);
}
if (updateCircuitVo.getEndTime()==null){
fb.setCode(0);
fb.setMessage("线路结束时间不能为空");
return gson.toJson(fb);
}
int a = circuitService.updateEndTime(updateCircuitVo);
if (a>0){
fb.setCode(1);
fb.setMessage("修改线路结束时间成功");
}else{
fb.setCode(0);
fb.setMessage("修改线路结束时间失败");
}
return gson.toJson(fb);
}
//修改线路信息
@ApiOperation(value = "修改线路信息",notes = "修改线路信息，传值说明：" +
" transportationNo:需要修改的运输编号," +
" routeNumber:修改之后的路由编号（如果没有就是空）," +
" startCountry:起运国," +
" startProvince:起运省," +
" startCity:起运市," +
" endCountry:目的国," +
" endProvince:目的省," +
" endCity:目的市," +
" transport:运输方式," +
" createTime:创建时间," +
" updateTime:修改时间," +
" startLongitude:起运经度," +
" startLatitude:起运纬度," +
" startAddress:起运具体地址," +
" startTime:起运时间," +
" endLongitude:目的经度," +
" endLatitude:目的纬度," +
" endAddress:目的具体地址," +
" endTime:目的时间," +
" boxNo:箱单号," +
" containerNo:集装箱号," +
" deliveryAddress:交付地址," +
" transportationType:运输类型," +
" remark:备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/updateCircuit",method = RequestMethod.POST)
public Object updateCircuit(@RequestBody UpdateCircuitInfo updateCircuitInfo){
if (StringUtils.isEmpty(updateCircuitInfo.getTransportationNo())){
fb.setCode(0);
fb.setMessage("需要修改的运输编号不能为空");
return gson.toJson(fb);
}
if(StringUtils.isEmpty(updateCircuitInfo.getStartCountry())){
fb.setCode(0);
fb.setMessage("起运国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getStartCity())){
fb.setCode(0);
fb.setMessage("起运市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getEndCountry())){
fb.setCode(0);
fb.setMessage("目的国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getEndCity())){
fb.setCode(0);
fb.setMessage("目的市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getTransport())){
fb.setCode(0);
fb.setMessage("运输方式不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getStartLongitude())){
fb.setCode(0);
fb.setMessage("起运经度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getStartLatitude())){
fb.setCode(0);
fb.setMessage("起运纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getStartAddress())){
fb.setCode(0);
fb.setMessage("起运具体地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getEndLongitude())){
fb.setCode(0);
fb.setMessage("目的经度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getEndLatitude())){
fb.setCode(0);
fb.setMessage("目的纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getEndAddress())){
fb.setCode(0);
fb.setMessage("目的具体地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getBoxNo())){
fb.setCode(0);
fb.setMessage("箱单号不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getContainerNo())){
fb.setCode(0);
fb.setMessage("集装箱号不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getDeliveryAddress())){
fb.setCode(0);
fb.setMessage("交付地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateCircuitInfo.getTransportationType())){
fb.setCode(0);
fb.setMessage("运输类型不能为空");
return gson.toJson(fb);
}
if(!updateCircuitInfo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!updateCircuitInfo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("经度的范围为-180~180");
return gson.toJson(fb);
}
if(!updateCircuitInfo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!updateCircuitInfo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("经度的范围为-180~180");
return gson.toJson(fb);
}
if (!updateCircuitInfo.getTransport().equals("铁路")&&
!updateCircuitInfo.getTransport().equals("汽运")&&
!updateCircuitInfo.getTransport().equals("海运")&&
!updateCircuitInfo.getTransport().equals("空运")&&
!updateCircuitInfo.getTransport().equals("快递")){
fb.setCode(0);
fb.setMessage("请选择正确的运输方式");
return gson.toJson(fb);
}
if (!updateCircuitInfo.getDeliveryAddress().equals("港口")&&
!updateCircuitInfo.getDeliveryAddress().equals("仓库")&&
!updateCircuitInfo.getDeliveryAddress().equals("站点")){
fb.setCode(0);
fb.setMessage("请输入正确的交付地址");
return gson.toJson(fb);
}
if (!updateCircuitInfo.getTransportationType().equals("本地运输")&&
!updateCircuitInfo.getTransportationType().equals("国际运输")){
fb.setCode(0);
fb.setMessage("请输入正确的运输类型");
return gson.toJson(fb);
}
String routeNumber="";
Date day=new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
Map<Object,Object> map=new HashMap<>();
map.put("routeNumber",updateCircuitInfo.getRouteNumber());
map.put("startCountry",updateCircuitInfo.getStartCountry());
map.put("startProvince",updateCircuitInfo.getStartProvince());
map.put("startCity",updateCircuitInfo.getStartCity());
map.put("endCountry",updateCircuitInfo.getEndCountry());
map.put("endProvince",updateCircuitInfo.getEndProvince());
map.put("endCity",updateCircuitInfo.getEndCity());
map.put("transport",updateCircuitInfo.getTransport());
map.put("createTime",System.currentTimeMillis());
map.put("updateTime",System.currentTimeMillis());
map.put("transportationNo",updateCircuitInfo.getTransportationNo());
map.put("startLongitude",updateCircuitInfo.getStartLongitude());
map.put("startLatitude",updateCircuitInfo.getStartLatitude());
map.put("startAddress",updateCircuitInfo.getStartAddress());
map.put("startTime",System.currentTimeMillis());
map.put("endLongitude",updateCircuitInfo.getEndLongitude());
map.put("endLatitude",updateCircuitInfo.getEndLatitude());
map.put("endAddress",updateCircuitInfo.getEndAddress());
map.put("endTime",0);
map.put("boxNo",updateCircuitInfo.getBoxNo());
map.put("containerNo",updateCircuitInfo.getContainerNo());
map.put("deliveryAddress",updateCircuitInfo.getDeliveryAddress());
map.put("transportationType",updateCircuitInfo.getTransportationType());
map.put("remark",updateCircuitInfo.getRemark());
if (StringUtils.isEmpty(updateCircuitInfo.getRouteNumber())){
routeNumber="RT"+df.format(day);
String routeName=updateCircuitInfo.getStartCountry()+updateCircuitInfo.getStartCity()+"_"+updateCircuitInfo.getEndCountry()+updateCircuitInfo.getEndCity();
if (updateCircuitInfo.getTransport().equals("汽运")){
routeName=routeName+"_汽运";
routeNumber=routeNumber+"G";
}
if (updateCircuitInfo.getTransport().equals("铁路")){
routeName=routeName+"_铁路";
routeNumber=routeNumber+"T";
}
if (updateCircuitInfo.getTransport().equals("空运")){
routeName=routeName+"_空运";
routeNumber=routeNumber+"K";
}
if (updateCircuitInfo.getTransport().equals("快递")){
routeName=routeName+"_快递";
routeNumber=routeNumber+"D";
}
if (updateCircuitInfo.getTransport().equals("海运")){
routeName=routeName+"_海运";
routeNumber=routeNumber+"H";
}
routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
if (routeService.getByRouteNumber(routeNumber)>0){
while (routeService.getByRouteNumber(routeNumber)>0){
routeNumber=routeNumber+((int)(Math.random()*(9999-1000+1))+1000);
}
}
map.put("routeName",routeName);
map.put("routeNumber",routeNumber);
}
circuitService.updateCircuit(map);
Map<Object,Object> msg=new HashMap<>();
msg.put("msg",map.get("msg"));
if (msg.get("msg").equals("修改线路成功")){
fb.setCode(1);
fb.setMessage("修改线路成功");
}else{
fb.setCode(0);
fb.setMessage(msg.get("msg").toString());
}
return gson.toJson(fb);
}
//删除线路
@ApiOperation(value = "删除线路",notes = "删除线路，传值说明：" +
" transportationNo:运输编号" )
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/delCircuit",method = RequestMethod.POST)
public Object delCircuit(@RequestBody String transportationNo){
JSONObject jsonObject= JSON.parseObject(transportationNo);
transportationNo=(String)jsonObject.get("transportationNo");
if (StringUtils.isEmpty(transportationNo)){
fb.setCode(0);
fb.setMessage("需要删除的运输编号不能为空");
return gson.toJson(fb);
}
int a = circuitService.delCircuit(transportationNo);
if (a>0){
fb.setCode(1);
fb.setMessage("删除线路成功");
}else{
fb.setCode(0);
fb.setMessage("删除线路失败");
}
return gson.toJson(fb);
}
}
src/main/java/com/example/tdl/web/HomePageController.java
View file @ aef092bd
......@@ -93,7 +93,7 @@ public class HomePageController {
public Object getByTerm(@RequestBody TermVo termVo){
HomePageDataVo dataVo = new HomePageDataVo();
List<ResultRouteVo> routeVos = routeService.getAll();//所有的路线
List<ResultRouteVo> routeVoList = routeService.getAllRoute(termVo.getTime());//根据条件获取数据
// List<ResultRouteVo> routeVoList = routeService.getAllRoute(termVo.getTime());//根据条件获取数据
List<AlarmLogVo> alarmLogVos = alarmLogServcie.getAlarmLog(termVo.getTime());
dataVo.setRouteVoList(routeVos);//路线列表
dataVo.setAlarmLogVoList(alarmLogVos);//报警列表
......
src/main/java/com/example/tdl/web/RouteController.java
View file @ aef092bd
......@@ -26,6 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@RestController
@RequestMapping("/route")
......@@ -48,21 +50,13 @@ public class RouteController {
@ApiOperation(value = "查询所有路由信息",notes = "查询所有路由信息，返回值说明：" +
" routeNumber：路由编号，" +
" routeName：路由名称，" +
" abbreviation：名称缩写，" +
" startLongitude：启运经度，" +
" startLatitude：启运纬度，" +
" startCountry： 启运国家，" +
" startProvince：启运省，" +
" startCity：启运市，" +
" startAddress：启运地址，" +
" endLongitude：目的经度，" +
" endLatitude：目的纬度，" +
" endCountry：目的国家，" +
" endProvince：目的省，" +
" endCity：目的市，" +
" endAddress：目的地址，" +
" transport：运输方式，" +
" transportRemark：运输方式备注，" +
" remark：路由备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
......@@ -83,21 +77,13 @@ public class RouteController {
"返回值说明：" +
" routeNumber：路由编号，" +
" routeName：路由名称，" +
" abbreviation：名称缩写，" +
" startLongitude：启运经度，" +
" startLatitude：启运纬度，" +
" startCountry： 启运国家，" +
" startProvince：启运省，" +
" startCity：启运市，" +
" startAddress：启运地址，" +
" endLongitude：目的经度，" +
" endLatitude：目的纬度，" +
" endCountry：目的国家，" +
" endProvince：目的省，" +
" endCity：目的市，" +
" endAddress：目的地址，" +
" transport：运输方式，" +
" transportRemark：运输方式备注，" +
" remark：路由备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
......@@ -108,141 +94,76 @@ public class RouteController {
}
@ApiOperation(value = "添加路由信息",notes = "添加路由信息，都要传，说明：" +
" startLongitude：启运经度，" +
" startLatitude：启运纬度，" +
" startCountry： 启运国家，" +
" startProvince：启运省，" +
" startCity：启运市，" +
" startAddress：启运地址，" +
" endLongitude：目的经度，" +
" endLatitude：目的纬度，" +
" endCountry：目的国家，" +
" endProvince：目的省，" +
" endCity：目的市，" +
" endAddress：目的地址，" +
" transport：运输方式，" +
" transportRemark：运输方式备注，" +
" remark：路由备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/addRoute",method = RequestMethod.POST)
public Object addRoute(@RequestBody AddRouteVo addRouteVo){
if (StringUtils.isEmpty(addRouteVo.getStartLatitude())){
fb.setCode(0);
fb.setMessage("启运纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getStartLongitude())){
fb.setCode(0);
fb.setMessage("启运经度不能为空");
return gson.toJson(fb);
}
if(!addRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("启运纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!addRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("启运经度的范围为-180~180");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getStartCountry())){
fb.setCode(0);
fb.setMessage("启运国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getStartProvince())){
fb.setCode(0);
fb.setMessage("启运省不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getStartCity())){
fb.setCode(0);
fb.setMessage("启运市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getStartAddress())){
fb.setCode(0);
fb.setMessage("启运地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndLatitude())){
fb.setCode(0);
fb.setMessage("目的纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndLongitude())){
fb.setCode(0);
fb.setMessage("目的经度不能为空");
return gson.toJson(fb);
}
if(!addRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("目的纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!addRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("目的经度的范围为-180~180");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndCountry())){
fb.setCode(0);
fb.setMessage("目的国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndProvince())){
fb.setCode(0);
fb.setMessage("目的省不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndCity())){
fb.setCode(0);
fb.setMessage("目的市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getEndAddress())){
fb.setCode(0);
fb.setMessage("目的地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(addRouteVo.getTransport())){
fb.setCode(0);
fb.setMessage("运输方式不能为空");
return gson.toJson(fb);
}else if (!addRouteVo.getTransport().equals("铁路")&&!addRouteVo.getTransport().equals("汽运")&&!addRouteVo.getTransport().equals("海运")&&
!addRouteVo.getTransport().equals("空运")&&!addRouteVo.getTransport().equals("快递")){
}
if (!addRouteVo.getTransport().equals("铁路")&&
!addRouteVo.getTransport().equals("汽运")&&
!addRouteVo.getTransport().equals("海运")&&
!addRouteVo.getTransport().equals("空运")&&
!addRouteVo.getTransport().equals("快递")){
fb.setCode(0);
fb.setMessage("请选择正确的运输方式");
return gson.toJson(fb);
}
String routeName=addRouteVo.getStartCity()+"-"+addRouteVo.getEndCity();
String routeName=addRouteVo.getStartCountry()+addRouteVo.getStartCity()+"_"+addRouteVo.getEndCountry()+addRouteVo.getEndCity();
Date day=new Date();
SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
String routeNumbers="RT"+df.format(day);
String abbreviation=routeName;
if (addRouteVo.getTransport().equals("汽运")){
routeNumbers=routeNumbers+"G";
abbreviation=abbreviation+"-G";
routeName=routeName+"_汽运";
}
if (addRouteVo.getTransport().equals("铁路")){
routeNumbers=routeNumbers+"T";
abbreviation=abbreviation+"-T";
routeName=routeName+"_铁路";
}
if (addRouteVo.getTransport().equals("空运")){
routeNumbers=routeNumbers+"K";
abbreviation=abbreviation+"-K";
routeName=routeName+"_空运";
}
if (addRouteVo.getTransport().equals("快递")){
routeNumbers=routeNumbers+"D";
abbreviation=abbreviation+"-D";
routeName=routeName+"_快递";
}
if (addRouteVo.getTransport().equals("海运")){
routeNumbers=routeNumbers+"H";
abbreviation=abbreviation+"-H";
routeName=routeName+"_海运";
}
String routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
if (routeService.getByRouteNumber(routeNumber)>0){
......@@ -250,166 +171,35 @@ public class RouteController {
routeNumber=routeNumbers+((int)(Math.random()*(9999-1000+1))+1000);
}
}
int a=routeService.addRoute(new Route(routeNumber,routeName,abbreviation,addRouteVo.getStartLongitude(),addRouteVo.getStartLatitude(),
addRouteVo.getStartCountry(),addRouteVo.getStartProvince(),addRouteVo.getStartCity(),addRouteVo.getStartAddress(),
addRouteVo.getEndLongitude(),addRouteVo.getEndLatitude(),addRouteVo.getEndCountry(),addRouteVo.getEndProvince(),
addRouteVo.getEndCity(), addRouteVo.getEndAddress(),addRouteVo.getTransport(),addRouteVo.getTransportRemark(),
System.currentTimeMillis(),System.currentTimeMillis(),addRouteVo.getRemark()));
if (a>0){
if (routeService.getInfoByRouteName(routeName)!=null){
fb.setCode(0);
fb.setMessage("该路由已存在");
return gson.toJson(fb);
}
Map<Object,Object> map=new HashMap<>();
map.put("routeNumber",routeNumber);
map.put("routeName",routeName);
map.put("startCountry",addRouteVo.getStartCountry());
map.put("startProvince",addRouteVo.getStartProvince());
map.put("startCity",addRouteVo.getStartCity());
map.put("endCountry",addRouteVo.getEndCountry());
map.put("endProvince",addRouteVo.getEndProvince());
map.put("endCity",addRouteVo.getEndCity());
map.put("transport",addRouteVo.getTransport());
map.put("createTime",System.currentTimeMillis());
map.put("updateTime",System.currentTimeMillis());
map.put("remark",addRouteVo.getRemark());
routeService.addRoute(map);
Map<Object,Object> msg=new HashMap<>();
msg.put("msg",map.get("msg"));
if (msg.get("msg").equals("添加路由成功")){
fb.setCode(1);
fb.setMessage("添加路由成功");
}else{
fb.setCode(0);
fb.setMessage("添加路由失败");
}
return gson.toJson(fb);
}
@ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" +
" routeNumber：路由编号，" +
" routeName：路由名称，" +
" abbreviation：名称缩写，" +
" startLongitude：启运经度，" +
" startLatitude：启运纬度，" +
" startCountry： 启运国家，" +
" startProvince：启运省，" +
" startCity：启运市，" +
" startAddress：启运地址，" +
" endLongitude：目的经度，" +
" endLatitude：目的纬度，" +
" endCountry：目的国家，" +
" endProvince：目的省，" +
" endCity：目的市，" +
" endAddress：目的地址，" +
" transport：运输方式，" +
" transportRemark：运输方式备注，" +
" remark：路由备注")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/updateRoute",method = RequestMethod.POST)
public Object updateRoute(@RequestBody UpdateRouteVo updateRouteVo){
if (StringUtils.isEmpty(updateRouteVo.getStartLatitude())){
fb.setCode(0);
fb.setMessage("启运纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getStartLongitude())){
fb.setCode(0);
fb.setMessage("启运经度不能为空");
return gson.toJson(fb);
}
if(!updateRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("启运纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!updateRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("启运经度的范围为-180~180");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getStartCountry())){
fb.setCode(0);
fb.setMessage("启运国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getStartProvince())){
fb.setCode(0);
fb.setMessage("启运省不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getStartCity())){
fb.setCode(0);
fb.setMessage("启运市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getStartAddress())){
fb.setCode(0);
fb.setMessage("启运地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndLatitude())){
fb.setCode(0);
fb.setMessage("目的纬度不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndLongitude())){
fb.setCode(0);
fb.setMessage("目的经度不能为空");
return gson.toJson(fb);
}
if(!updateRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
fb.setCode(0);
fb.setMessage("目的纬度的范围为-90~90");
return gson.toJson(fb);
}
if(!updateRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
fb.setCode(0);
fb.setMessage("目的经度的范围为-180~180");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndCountry())){
fb.setCode(0);
fb.setMessage("目的国不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndProvince())){
fb.setCode(0);
fb.setMessage("目的省不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndCity())){
fb.setCode(0);
fb.setMessage("目的市不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getEndAddress())){
fb.setCode(0);
fb.setMessage("目的地址不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updateRouteVo.getTransport())){
fb.setCode(0);
fb.setMessage("运输方式不能为空");
return gson.toJson(fb);
}
if (!updateRouteVo.getTransport().equals("铁路")&&!updateRouteVo.getTransport().equals("汽运")&&!updateRouteVo.getTransport().equals("海运")&&
!updateRouteVo.getTransport().equals("空运")&&!updateRouteVo.getTransport().equals("快递")){
fb.setCode(0);
fb.setMessage("请选择正确的运输方式");
return gson.toJson(fb);
}
String routeName=updateRouteVo.getStartCity()+"-"+updateRouteVo.getEndCity();
String abbreviation=routeName;
if (updateRouteVo.getTransport().equals("汽运")){
abbreviation=abbreviation+"-G";
}
if (updateRouteVo.getTransport().equals("铁路")){
abbreviation=abbreviation+"-T";
}
if (updateRouteVo.getTransport().equals("空运")){
abbreviation=abbreviation+"-K";
}
if (updateRouteVo.getTransport().equals("快递")){
abbreviation=abbreviation+"-D";
}
if (updateRouteVo.getTransport().equals("海运")){
abbreviation=abbreviation+"-H";
}
int a=routeService.updateRoute(new Route(updateRouteVo.getRouteNumber(),routeName,abbreviation,updateRouteVo.getStartLongitude(),updateRouteVo.getStartLatitude(),
updateRouteVo.getStartCountry(),updateRouteVo.getStartProvince(),updateRouteVo.getStartCity(),updateRouteVo.getStartAddress(),
updateRouteVo.getEndLongitude(),updateRouteVo.getEndLatitude(),updateRouteVo.getEndCountry(),updateRouteVo.getEndProvince(),updateRouteVo.getEndCity(),
updateRouteVo.getEndAddress(),updateRouteVo.getTransport(),updateRouteVo.getTransportRemark(),System.currentTimeMillis(),updateRouteVo.getRemark()));
if (a>0){
fb.setCode(1);
fb.setMessage("修改路由成功");
}else{
fb.setCode(0);
fb.setMessage("修改路由失败");
fb.setMessage(msg.get("msg").toString());
}
return gson.toJson(fb);
}
//删除路由信息
......@@ -437,4 +227,157 @@ public class RouteController {
return gson.toJson(fb);
}
// @ApiOperation(value = "修改路由信息",notes = "修改路由信息，都要传，路由编号是需要修改的路由编号，不能改，说明：" +
// " routeNumber：路由编号，" +
// " routeName：路由名称，" +
// " abbreviation：名称缩写，" +
// " startLongitude：启运经度，" +
// " startLatitude：启运纬度，" +
// " startCountry： 启运国家，" +
// " startProvince：启运省，" +
// " startCity：启运市，" +
// " startAddress：启运地址，" +
// " endLongitude：目的经度，" +
// " endLatitude：目的纬度，" +
// " endCountry：目的国家，" +
// " endProvince：目的省，" +
// " endCity：目的市，" +
// " endAddress：目的地址，" +
// " transport：运输方式，" +
// " transportRemark：运输方式备注，" +
// " remark：路由备注")
// @ApiImplicitParams({
// @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
// })
// @RequestMapping(value="/updateRoute",method = RequestMethod.POST)
// public Object updateRoute(@RequestBody UpdateRouteVo updateRouteVo){
// if (StringUtils.isEmpty(updateRouteVo.getStartLatitude())){
// fb.setCode(0);
// fb.setMessage("启运纬度不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getStartLongitude())){
// fb.setCode(0);
// fb.setMessage("启运经度不能为空");
// return gson.toJson(fb);
// }
// if(!updateRouteVo.getStartLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
// fb.setCode(0);
// fb.setMessage("启运纬度的范围为-90~90");
// return gson.toJson(fb);
// }
// if(!updateRouteVo.getStartLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
// fb.setCode(0);
// fb.setMessage("启运经度的范围为-180~180");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getStartCountry())){
// fb.setCode(0);
// fb.setMessage("启运国不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getStartProvince())){
// fb.setCode(0);
// fb.setMessage("启运省不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getStartCity())){
// fb.setCode(0);
// fb.setMessage("启运市不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getStartAddress())){
// fb.setCode(0);
// fb.setMessage("启运地址不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndLatitude())){
// fb.setCode(0);
// fb.setMessage("目的纬度不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndLongitude())){
// fb.setCode(0);
// fb.setMessage("目的经度不能为空");
// return gson.toJson(fb);
// }
// if(!updateRouteVo.getEndLatitude().matches("^-?(([1-9])((\\.\\d{1,6})?)|([1-8]\\d)((\\.\\d{1,6})?)|90)$")){
// fb.setCode(0);
// fb.setMessage("目的纬度的范围为-90~90");
// return gson.toJson(fb);
// }
// if(!updateRouteVo.getEndLongitude().matches("^-?(([1-9]\\d?)((\\.\\d{1,6})?)|(1[1-7]\\d)((\\.\\d{1,6})?)|180)$")) {
// fb.setCode(0);
// fb.setMessage("目的经度的范围为-180~180");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndCountry())){
// fb.setCode(0);
// fb.setMessage("目的国不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndProvince())){
// fb.setCode(0);
// fb.setMessage("目的省不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndCity())){
// fb.setCode(0);
// fb.setMessage("目的市不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getEndAddress())){
// fb.setCode(0);
// fb.setMessage("目的地址不能为空");
// return gson.toJson(fb);
// }
// if (StringUtils.isEmpty(updateRouteVo.getTransport())){
// fb.setCode(0);
// fb.setMessage("运输方式不能为空");
// return gson.toJson(fb);
// }
// if (!updateRouteVo.getTransport().equals("铁路")&&!updateRouteVo.getTransport().equals("汽运")&&!updateRouteVo.getTransport().equals("海运")&&
// !updateRouteVo.getTransport().equals("空运")&&!updateRouteVo.getTransport().equals("快递")){
// fb.setCode(0);
// fb.setMessage("请选择正确的运输方式");
// return gson.toJson(fb);
// }
// String routeName=updateRouteVo.getStartCity()+"-"+updateRouteVo.getEndCity();
// String abbreviation=routeName;
// if (updateRouteVo.getTransport().equals("汽运")){
// abbreviation=abbreviation+"-G";
// }
// if (updateRouteVo.getTransport().equals("铁路")){
// abbreviation=abbreviation+"-T";
// }
// if (updateRouteVo.getTransport().equals("空运")){
// abbreviation=abbreviation+"-K";
// }
// if (updateRouteVo.getTransport().equals("快递")){
// abbreviation=abbreviation+"-D";
// }
// if (updateRouteVo.getTransport().equals("海运")){
// abbreviation=abbreviation+"-H";
// }
// int a=routeService.updateRoute(new Route(updateRouteVo.getRouteNumber(),routeName,abbreviation,updateRouteVo.getStartLongitude(),updateRouteVo.getStartLatitude(),
// updateRouteVo.getStartCountry(),updateRouteVo.getStartProvince(),updateRouteVo.getStartCity(),updateRouteVo.getStartAddress(),
// updateRouteVo.getEndLongitude(),updateRouteVo.getEndLatitude(),updateRouteVo.getEndCountry(),updateRouteVo.getEndProvince(),updateRouteVo.getEndCity(),
// updateRouteVo.getEndAddress(),updateRouteVo.getTransport(),updateRouteVo.getTransportRemark(),System.currentTimeMillis(),updateRouteVo.getRemark()));
// if (a>0){
// fb.setCode(1);
// fb.setMessage("修改路由成功");
// }else{
// fb.setCode(0);
// fb.setMessage("修改路由失败");
// }
// return gson.toJson(fb);
//
// }
}
src/main/java/com/example/tdl/web/UserController.java
View file @ aef092bd
......@@ -282,7 +282,7 @@ public class UserController {
String pwd=DigestUtils.sha256Hex("Witium123");
int a = userService.resetPassword(userNumber,pwd);
if (a>0){
fb.setCode(0);
fb.setCode(1);
fb.setMessage("重置密码成功");
}else{
fb.setCode(0);
......@@ -291,6 +291,36 @@ public class UserController {
return gson.toJson(fb);
}
//修改密码
@ApiOperation(value = "修改密码",notes = "修改密码")
@ApiImplicitParams({
@ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
})
@RequestMapping(value="/updatePassword",method = RequestMethod.POST)
public Object updatePassword(@RequestBody UpdatePasswordVo updatePasswordVo){
if (StringUtils.isEmpty(updatePasswordVo.getUserNumber())) {
fb.setCode(0);
fb.setMessage("需要重置密码的用户编号不能为空");
return gson.toJson(fb);
}
if (StringUtils.isEmpty(updatePasswordVo.getPassword())) {
fb.setCode(0);
fb.setMessage("修改的密码不能为空");
return gson.toJson(fb);
}
String pwd=DigestUtils.sha256Hex(updatePasswordVo.getPassword());
updatePasswordVo.setPassword(pwd);
int a = userService.updatePassword(updatePasswordVo);
if (a>0){
fb.setCode(1);
fb.setMessage("修改密码成功");
}else{
fb.setCode(0);
fb.setMessage("修改密码失败");
}
return gson.toJson(fb);
}
//获取当前的用户名
@ApiOperation(value = "获取当前的用户名",notes = "获取当前的用户名")
@ApiImplicitParams({
......
src/main/resources/application.properties
View file @ aef092bd
spring.datasource.url=jdbc:mysql://192.168.1.200:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.url=jdbc:mysql://192.168.1.16:3306/tdlCloud?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.username=root
spring.datasource.password=37774020
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
......
src/main/resources/mapper/CircuitMapper.xml
View file @ aef092bd
<?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 transportationNo,routeNumber,routeName,startLongitude,startLatitude,(select city from city_config where id=r.start_id) startCity, startAddress,
IFNULL(from_unixtime((startTime/1000),'%Y-%m-%d %T'),"-") startTime,endLongitude,endLatitude,(select city from city_config where id=r.end_id) endCity,
endAddress,IFNULL(from_unixtime((endTime/1000),'%Y-%m-%d %T'),"-") endTime,transport,(SELECT alarmType FROM alarm WHERE id=c.alarm_id) alarmType,
boxNo,containerNo,deliveryAddress,transportationType,circuitState,c.remark
from circuit c,route r WHERE c.route_id=r.id AND r.state=1 AND c.state=1 order BY c.id DESC
</select>
<select id="getByTerm" resultType="com.example.tdl.domain.vo.ResultCircuitVo" parameterType="com.example.tdl.domain.vo.CircuitTermVo">
SELECT transportationNo,routeNumber,routeName,abbreviation,startCity,IFNULL(from_unixtime((startTime/1000),'%Y-%m-%d %T'),"-") startTime,endCity,
IFNULL(from_unixtime((endTime/1000),'%Y-%m-%d %T'),"-") endTime,transport,(SELECT alarmType FROM alarm WHERE id=c.alarm_id) alarmType,
boxNo,containerNo,deliveryAddress,transportationType,circuitState,c.remark
from circuit c,route r WHERE c.route_id=r.id AND r.state=1 AND c.state=1
<if test="transportationNo!=null">
AND transportationNo like CONCAT(CONCAT('%',#{transportationNo,jdbcType=VARCHAR}),'%')
</if>
<if test="routeNumber!=null">
AND routeNumber like CONCAT(CONCAT('%',#{routeNumber,jdbcType=VARCHAR}),'%')
</if>
<if test="alarmType!=null and alarmType==0">
AND alarm_id is NULL
</if>
<if test="alarmType!=null and alarmType==1">
AND alarm_id is NOT NULL
</if>
<if test="circuitState!=null">
AND circuitState=#{circuitState,jdbcType=INTEGER}
</if>
<if test="startCity!=null">
AND startCity like CONCAT(CONCAT('%',#{startCity,jdbcType=VARCHAR}),'%')
</if>
<if test="endCity!=null">
AND endCity like CONCAT(CONCAT('%',#{endCity,jdbcType=VARCHAR}),'%')
</if>
<if test="startTimeMin!=null">
AND startTime BETWEEN #{startTimeMin,jdbcType=BIGINT} AND #{startTimeMax,jdbcType=BIGINT}
</if>
<if test="endTimeMin!=null">
AND endTime BETWEEN #{endTimeMin,jdbcType=BIGINT} AND #{endTimeMax,jdbcType=BIGINT}
</if>
</select>
<insert id="addCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_addCircuit(
#{routeNumber,mode=IN,jdbcType=VARCHAR},
#{routeName,mode=IN,jdbcType=VARCHAR},
#{startCountry,mode=IN,jdbcType=VARCHAR},
#{startProvince,mode=IN,jdbcType=VARCHAR},
#{startCity,mode=IN,jdbcType=VARCHAR},
#{endCountry,mode=IN,jdbcType=VARCHAR},
#{endProvince,mode=IN,jdbcType=VARCHAR},
#{endCity,mode=IN,jdbcType=VARCHAR},
#{transport,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=BIGINT},
#{updateTime,mode=IN,jdbcType=BIGINT},
#{rRemark,mode=IN,jdbcType=BIGINT},
#{transportationNo,mode=IN,jdbcType=VARCHAR},
#{startLongitude,mode=IN,jdbcType=VARCHAR},
#{startLatitude,mode=IN,jdbcType=VARCHAR},
#{startAddress,mode=IN,jdbcType=VARCHAR},
#{startTime,mode=IN,jdbcType=BIGINT},
#{endLongitude,mode=IN,jdbcType=VARCHAR},
#{endLatitude,mode=IN,jdbcType=VARCHAR},
#{endAddress,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=BIGINT},
#{boxNo,mode=IN,jdbcType=VARCHAR},
#{containerNo,mode=IN,jdbcType=VARCHAR},
#{deliveryAddress,mode=IN,jdbcType=VARCHAR},
#{transportationType,mode=IN,jdbcType=VARCHAR},
#{remark,mode=IN,jdbcType=VARCHAR},
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
</insert>
<update id="updateEndTime" parameterType="com.example.tdl.domain.vo.UpdateCircuitVo">
UPDATE circuit set
endTime=#{endTime,jdbcType=BIGINT}
WHERE transportationNo=#{transportationNo,jdbcType=VARCHAR}
</update>
<update id="updateCircuit" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_updateCircuit(
#{routeNumber,mode=IN,jdbcType=VARCHAR},
#{routeName,mode=IN,jdbcType=VARCHAR},
#{startCountry,mode=IN,jdbcType=VARCHAR},
#{startProvince,mode=IN,jdbcType=VARCHAR},
#{startCity,mode=IN,jdbcType=VARCHAR},
#{endCountry,mode=IN,jdbcType=VARCHAR},
#{endProvince,mode=IN,jdbcType=VARCHAR},
#{endCity,mode=IN,jdbcType=VARCHAR},
#{transport,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=BIGINT},
#{updateTime,mode=IN,jdbcType=BIGINT},
#{rRemark,mode=IN,jdbcType=BIGINT},
#{transportationNo,mode=IN,jdbcType=VARCHAR},
#{startLongitude,mode=IN,jdbcType=VARCHAR},
#{startLatitude,mode=IN,jdbcType=VARCHAR},
#{startAddress,mode=IN,jdbcType=VARCHAR},
#{startTime,mode=IN,jdbcType=VARCHAR},
#{endLongitude,mode=IN,jdbcType=VARCHAR},
#{endLatitude,mode=IN,jdbcType=VARCHAR},
#{endAddress,mode=IN,jdbcType=VARCHAR},
#{endTime,mode=IN,jdbcType=VARCHAR},
#{boxNo,mode=IN,jdbcType=VARCHAR},
#{containerNo,mode=IN,jdbcType=VARCHAR},
#{deliveryAddress,mode=IN,jdbcType=VARCHAR},
#{transportationType,mode=IN,jdbcType=VARCHAR},
#{remark,mode=IN,jdbcType=VARCHAR},
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
</update>
<delete id="delCircuit" parameterType="String">
UPDATE circuit set state=0
WHERE transportationNo=#{transportationNo,jdbcType=VARCHAR}
</delete>
<select id="getByTransportationNo" resultType="com.example.tdl.domain.vo.ResultCircuitVo" parameterType="String">
SELECT transportationNo,routeNumber,routeName,startLongitude,startLatitude,(select city from city_config where id=r.start_id) startCity, startAddress,
IFNULL(from_unixtime((startTime/1000),'%Y-%m-%d %T'),"-") startTime,endLongitude,endLatitude,(select city from city_config where id=r.end_id) endCity,
endAddress,IFNULL(from_unixtime((endTime/1000),'%Y-%m-%d %T'),"-") endTime,transport,(SELECT alarmType FROM alarm WHERE id=c.alarm_id) alarmType,
boxNo,containerNo,deliveryAddress,transportationType,circuitState,c.remark
from circuit c,route r WHERE c.route_id=r.id AND r.state=1 AND c.state=1 AND transportationNo=#{transportationNo,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/CityConfigMapper.xml 0 → 100644
View file @ aef092bd
<?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.CityConfigMapper">
<select id="getIdByCountryAndCity" parameterType="String" resultType="java.lang.Integer">
SELECT id from city_config WHERE country=#{country,jdbcType=VARCHAR}
AND city=#{city,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/RouteMapper.xml
View file @ aef092bd
......@@ -3,15 +3,18 @@
<mapper namespace="com.example.tdl.mapper.RouteMapper">
<!--查询所有路由信息-->
<select id="getAll" resultType="com.example.tdl.domain.vo.ResultRouteVo">
SELECT routeNumber,routeName,abbreviation,startLongitude,startLatitude,startCountry,startProvince,startCity,startAddress,
endLongitude,endLatitude,endCountry,endProvince,endCity,endAddress,transport,transportRemark,remark FROM route
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>
<!--根据条件查询路由信息-->
<select id="getRouteByTerm" resultType="com.example.tdl.domain.vo.ResultRouteVo" parameterType="com.example.tdl.domain.vo.RouteTermVo">
SELECT routeNumber,routeName,abbreviation,startLongitude,startLatitude,startCountry,startProvince,startCity,startAddress,
endLongitude,endLatitude,endCountry,endProvince,endCity,endAddress,transport,transportRemark,remark FROM route
WHERE 1=1
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
<if test="routeNumber!=null">
AND routeNumber like CONCAT(CONCAT('%',#{routeNumber,jdbcType=VARCHAR}), '%')
</if>
......@@ -30,34 +33,60 @@
</select>
<!--添加路由信息-->
<insert id="addRoute" parameterType="com.example.tdl.entity.Route">
INSERT INTO route VALUES (
NULL ,
#{routeNumber,jdbcType=VARCHAR},
#{routeName,jdbcType=VARCHAR},
#{abbreviation,jdbcType=VARCHAR},
#{startLongitude,jdbcType=VARCHAR},
#{startLatitude,jdbcType=VARCHAR},
#{startCountry,jdbcType=VARCHAR},
#{startProvince,jdbcType=VARCHAR},
#{startCity,jdbcType=VARCHAR},
#{startAddress,jdbcType=VARCHAR},
#{endLongitude,jdbcType=VARCHAR},
#{endLatitude,jdbcType=VARCHAR},
#{endCountry,jdbcType=VARCHAR},
#{endProvince,jdbcType=VARCHAR},
#{endCity,jdbcType=VARCHAR},
#{endAddress,jdbcType=VARCHAR},
#{transport,jdbcType=VARCHAR},
#{transportRemark,jdbcType=VARCHAR},
#{createTime,jdbcType=BIGINT},
#{updateTime,jdbcType=BIGINT},
#{remark,jdbcType=VARCHAR}
)
<insert id="addRoute" parameterType="java.util.Map" statementType="CALLABLE">
<![CDATA[
{
call pro_addRoute(
#{routeNumber,mode=IN,jdbcType=VARCHAR},
#{routeName,mode=IN,jdbcType=VARCHAR},
#{startCountry,mode=IN,jdbcType=VARCHAR},
#{startProvince,mode=IN,jdbcType=VARCHAR},
#{startCity,mode=IN,jdbcType=VARCHAR},
#{endCountry,mode=IN,jdbcType=VARCHAR},
#{endProvince,mode=IN,jdbcType=VARCHAR},
#{endCity,mode=IN,jdbcType=VARCHAR},
#{transport,mode=IN,jdbcType=VARCHAR},
#{createTime,mode=IN,jdbcType=BIGINT},
#{updateTime,mode=IN,jdbcType=BIGINT},
#{remark,mode=IN,jdbcType=VARCHAR},
#{msg,mode=OUT,jdbcType=VARCHAR}
)
}
]]>
</insert>
<delete id="delRoute" parameterType="String">
UPDATE route set state=0 WHERE routeNumber=#{routeNumber,jdbcType=VARCHAR}
</delete>
<select id="getByRouteNumber" resultType="java.lang.Integer" parameterType="String">
SELECT COUNT(routeNumber) FROM route WHERE routeNumber=#{routeNumber,jdbcType=VARCHAR} AND state=1
</select>
<select id="getInfoByRouteNumber" resultType="com.example.tdl.domain.vo.ResultRouteVo" parameterType="String">
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 routeNumber=#{routeNumber,jdbcType=VARCHAR} AND state=1
</select>
<select id="getInfoByRouteName" resultType="com.example.tdl.domain.vo.ResultRouteVo" parameterType="String">
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 routeName=#{routeName,jdbcType=VARCHAR} AND state=1
</select>
<!-- <select id="getAllRoute" resultType="com.example.tdl.domain.vo.ResultRouteVo">
SELECT routeNumber,routeName,abbreviation,startLongitude,startLatitude,startCountry,startProvince,startCity,startAddress,
endLongitude,endLatitude,endCountry,endProvince,endCity,endAddress,transport,transportRemark,remark FROM route
where DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(createTime/1000,'%Y-%m-%d %H:%i:%s'))
AND state=1 order by createTime desc limit 10;
</select>-->
<!--修改路由信息-->
<update id="updateRoute" parameterType="com.example.tdl.entity.Route">
<!-- <update id="updateRoute" parameterType="com.example.tdl.entity.Route">
UPDATE route SET
routeName=#{routeName,jdbcType=VARCHAR},
abbreviation=#{abbreviation,jdbcType=VARCHAR},
......@@ -78,21 +107,8 @@
updateTime=#{updateTime,jdbcType=BIGINT},
remark=#{remark,jdbcType=VARCHAR}
WHERE routeNumber=#{routeNumber,jdbcType=VARCHAR}
</update>
</update>-->
<delete id="delRoute" parameterType="String">
DELETE from route WHERE routeNumber=#{routeNumber,jdbcType=VARCHAR}
</delete>
<!--根据条件查询路由信息-->
<select id="getByRouteNumber" resultType="java.lang.Integer" parameterType="String">
SELECT COUNT(routeNumber) FROM route WHERE routeNumber=#{routeNumber,jdbcType=VARCHAR}
</select>
<select id="getAllRoute" resultType="com.example.tdl.domain.vo.ResultRouteVo">
SELECT routeNumber,routeName,abbreviation,startLongitude,startLatitude,startCountry,startProvince,startCity,startAddress,
endLongitude,endLatitude,endCountry,endProvince,endCity,endAddress,transport,transportRemark,remark FROM route
where DATE_SUB(CURDATE(), INTERVAL #{time,jdbcType=VARCHAR} DAY) &lt;= date(FROM_UNIXTIME(createTime/1000,'%Y-%m-%d %H:%i:%s'))
order by createTime desc limit 10;
</select>
</mapper>
\ No newline at end of file
src/main/resources/mapper/UserMapper.xml
View file @ aef092bd
......@@ -100,6 +100,14 @@
DELETE FROM `user` WHERE userNumber=#{userNumber}
</delete>
<!--修改密码-->
<update id="updatePassword" parameterType="String">
update `user` SET
password=#{password,jdbcType=VARCHAR},
updateTime=(unix_timestamp(now())*1000)
WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
</update>
<!--重置密码-->
<update id="resetPassword" parameterType="String">
update `user` SET
......
src/main/resources/mybatis-config.xml
View file @ aef092bd
......@@ -46,5 +46,6 @@
<mapper resource="mapper/ProbesMapper.xml"/>
<mapper resource="mapper/TopicMapper.xml"/>
<mapper resource="mapper/TopicConfigMapper.xml"/>
<mapper resource="mapper/CityConfigMapper.xml"/>
</mappers>
</configuration>
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