3.28修改用户常用地址的增删改查

src/main/java/com/example/tdl/domain/vo/AddUserAddressVo.java

+package com.example.tdl.domain.vo;
+
+public class AddUserAddressVo {
+    private String name;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String lng;
+
+    private String lat;
+
+    private String postCode;
+
+    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 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 String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/domain/vo/ResultTransferModelConfigVo.java

+package com.example.tdl.domain.vo;
+
+public class ResultTransferModelConfigVo {
+    private String transferNo;
+
+    private String transferModelName;
+
+    private String country;
+
+    private String city;
+
+    private String addressDetail;
+
+    private String lng;
+
+    private String lat;
+
+    private String postCode;
+
+    private Integer sequence;
+
+    private String remark;
+
+    public String getTransferNo() {
+        return transferNo;
+    }
+
+    public void setTransferNo(String transferNo) {
+        this.transferNo = transferNo;
+    }
+
+    public String getTransferModelName() {
+        return transferModelName;
+    }
+
+    public void setTransferModelName(String transferModelName) {
+        this.transferModelName = transferModelName;
+    }
+
+    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 Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/example/tdl/domain/vo/ResultUserRouteVo.java → src/main/java/com/example/tdl/domain/vo/ResultUserAddressVo.java

 package com.example.tdl.domain.vo;
 
-public class ResultUserRouteVo {
+public class ResultUserAddressVo {
     private String userNumber;
 
-    private String userName;
-
     private String name;
 
     private String country;
 
-    private String province;
-
     private String city;
 
-    private String address;
+    private String addressDetail;
 
-    private String longitude;
+    private String lng;
 
-    private String latitude;
+    private String lat;
+
+    private String postCode;
 
     private String remark;
 
@@ -29,14 +27,6 @@ public class ResultUserRouteVo {
         this.userNumber = userNumber;
     }
 
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     public String getName() {
         return name;
     }
@@ -53,14 +43,6 @@ public class ResultUserRouteVo {
         this.country = country;
     }
 
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
     public String getCity() {
         return city;
     }
@@ -69,28 +51,36 @@ public class ResultUserRouteVo {
         this.city = city;
     }
 
-    public String getAddress() {
-        return address;
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getLng() {
+        return lng;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public String getLongitude() {
-        return longitude;
+    public String getLat() {
+        return lat;
     }
 
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public String getLatitude() {
-        return latitude;
+    public String getPostCode() {
+        return postCode;
     }
 
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
     }
 
     public String getRemark() {

src/main/java/com/example/tdl/domain/vo/UpdateTransferModelConfigVo.java

+package com.example.tdl.domain.vo;
+
+import java.util.List;
+
+public class UpdateTransferModelConfigVo {
+    private String transferNo;
+
+    private List<AddTransferModelForConfigVo> info;
+
+    public String getTransferNo() {
+        return transferNo;
+    }
+
+    public void setTransferNo(String transferNo) {
+        this.transferNo = transferNo;
+    }
+
+    public List<AddTransferModelForConfigVo> getInfo() {
+        return info;
+    }
+
+    public void setInfo(List<AddTransferModelForConfigVo> info) {
+        this.info = info;
+    }
+}

src/main/java/com/example/tdl/domain/vo/UpdateUserRouteVo.java → src/main/java/com/example/tdl/domain/vo/UpdateUserAddressVo.java

 package com.example.tdl.domain.vo;
 
-public class UpdateUserRouteVo {
+public class UpdateUserAddressVo {
     private String oldName;
 
     private String name;
 
     private String country;
 
-    private String province;
-
     private String city;
 
-    private String address;
+    private String addressDetail;
+
+    private String lng;
 
-    private String longitude;
+    private String lat;
 
-    private String latitude;
+    private String postCode;
 
     private String remark;
 
@@ -43,14 +43,6 @@ public class UpdateUserRouteVo {
         this.country = country;
     }
 
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
     public String getCity() {
         return city;
     }
@@ -59,28 +51,36 @@ public class UpdateUserRouteVo {
         this.city = city;
     }
 
-    public String getAddress() {
-        return address;
+    public String getAddressDetail() {
+        return addressDetail;
+    }
+
+    public void setAddressDetail(String addressDetail) {
+        this.addressDetail = addressDetail;
+    }
+
+    public String getLng() {
+        return lng;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public void setLng(String lng) {
+        this.lng = lng;
     }
 
-    public String getLongitude() {
-        return longitude;
+    public String getLat() {
+        return lat;
     }
 
-    public void setLongitude(String longitude) {
-        this.longitude = longitude;
+    public void setLat(String lat) {
+        this.lat = lat;
     }
 
-    public String getLatitude() {
-        return latitude;
+    public String getPostCode() {
+        return postCode;
     }
 
-    public void setLatitude(String latitude) {
-        this.latitude = latitude;
+    public void setPostCode(String postCode) {
+        this.postCode = postCode;
     }
 
     public String getRemark() {

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

+package com.example.tdl.mapper;
+
+import com.example.tdl.domain.vo.ResultTransferModelConfigVo;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface TransferModelConfigMapper {
+    List<ResultTransferModelConfigVo> getAll(String transferNo);
+
+    int updateTransferModelConfig(Map<Object,Object> map);
+}

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

 package com.example.tdl.mapper;
 
 
-import com.example.tdl.domain.vo.ResultUserRouteVo;
-import com.example.tdl.domain.vo.RoleNameVo;
+import com.example.tdl.domain.vo.ResultUserAddressVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,14 +9,14 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface UserRouteMapper {
-//    List<ResultUserRouteVo> getByUserNumber(String userNumber);
-//
-//    int addUserRoute(Map<Object,Object> map);
-//
-//    int updateUserRoute(Map<Object,Object> map);
-//
-//    int delUserRoute(@Param("userNumber") String userNumber,@Param("name") String name);
-//
-//    ResultUserRouteVo getByUserNumberAndName(@Param("userNumber") String userNumber,@Param("name") String name);
+public interface UserAddressMapper {
+    List<ResultUserAddressVo> getByUserNumber(String userNumber);
+
+    int addUserAddress(Map<Object,Object> map);
+
+    int updateUserAddress(Map<Object,Object> map);
+
+    int delUserAddress(@Param("userNumber") String userNumber, @Param("name") String name);
+
+    ResultUserAddressVo getByUserNumberAndName(@Param("userNumber") String userNumber,@Param("name") String name);
 }

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

+package com.example.tdl.service;
+
+
+import com.example.tdl.domain.vo.ResultTransferModelConfigVo;
+import com.example.tdl.mapper.TransferModelConfigMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class TransferModelConfigService {
+
+    @Autowired
+    private TransferModelConfigMapper transferModelConfigMapper;
+
+    public List<ResultTransferModelConfigVo> getAll(String transferNo){
+        return transferModelConfigMapper.getAll(transferNo);
+    }
+
+    public int updateTransferModelConfig(Map<Object,Object> map){
+        return transferModelConfigMapper.updateTransferModelConfig(map);
+    }
+
+}

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

+package com.example.tdl.service;
+
+
+import com.example.tdl.domain.vo.ResultUserAddressVo;
+import com.example.tdl.mapper.UserAddressMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class UserAddressService {
+    @Autowired
+    private UserAddressMapper userAddressMapper;
+
+    public List<ResultUserAddressVo> getByUserNumber(String userNumber){
+        return userAddressMapper.getByUserNumber(userNumber);
+    }
+
+    public int addUserAddress(Map<Object,Object> map){
+        return userAddressMapper.addUserAddress(map);
+    }
+
+    public int updateUserAddress(Map<Object,Object> map){
+        return userAddressMapper.updateUserAddress(map);
+    }
+
+    public int delUserAddress(String userNumber,String name){
+        return userAddressMapper.delUserAddress(userNumber,name);
+    }
+
+    public ResultUserAddressVo getByUserNumberAndName(String userNumber,String name){
+        return userAddressMapper.getByUserNumberAndName(userNumber,name);
+    }
+}

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

-package com.example.tdl.service;
-
-
-import com.example.tdl.domain.vo.ResultUserRouteVo;
-import com.example.tdl.mapper.UserRouteMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-
-@Service
-public class UserRouteService {
-//    @Autowired
-//    private UserRouteMapper userRouteMapper;
-//
-//    public List<ResultUserRouteVo> getByUserNumber(String userNumber){
-//        return userRouteMapper.getByUserNumber(userNumber);
-//    }
-//
-//    public int addUserRoute(Map<Object,Object> map){
-//        return userRouteMapper.addUserRoute(map);
-//    }
-//
-//    public int updateUserRoute(Map<Object,Object> map){
-//        return userRouteMapper.updateUserRoute(map);
-//    }
-//
-//    public int delUserRoute(String userNumber,String name){
-//        return userRouteMapper.delUserRoute(userNumber,name);
-//    }
-//
-//    public ResultUserRouteVo getByUserNumberAndName(String userNumber,String name){
-//        return userRouteMapper.getByUserNumberAndName(userNumber,name);
-//    }
-}

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

+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.UpdateTransferModelConfigVo;
+import com.example.tdl.service.TransferModelConfigService;
+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.util.HashMap;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping(path = "/transferModelConfig")
+public class TransferModelConfigController {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    private CommFeedback fb = new CommFeedback();
+
+    private Gson gson = new Gson();
+
+    @Autowired
+    private TransferModelConfigService transferModelConfigService;
+
+
+    @ApiOperation(value = "查询线路配置模板",notes = "查询线路配置模板的返回值对应的意义:" +
+        "      transferNo：线路模板编号" +
+        "      transferModelName: 线路途径地模板名," +
+        "      country: 国家，" +
+        "      city：城市，" +
+        "      addressDetail：详细地址，" +
+        "      lng：经度，" +
+        "      lat：纬度，" +
+        "      postCode：邮编，" +
+        "      sequence：顺序，" +
+        "      remark：备注。")
+    @RequestMapping(value = "/getAll",method = RequestMethod.POST)
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object getAll(@RequestBody String transferNo){
+        JSONObject jsonObject= JSON.parseObject(transferNo);
+        transferNo=(String)jsonObject.get("transferNo");
+        return transferModelConfigService.getAll(transferNo);
+    }
+
+    @ApiOperation(value = "修改线路配置模板",notes = "修改线路配置模板，传递的参数:" +
+            "      transferNo：线路模板编号," +
+            "      info{" +
+            "           country: 国家，" +
+            "           city：城市，" +
+            "           addressDetail：详细地址，" +
+            "           lng：经度，" +
+            "           lat：纬度，" +
+            "           postCode：邮编，" +
+            "           remark：备注" +
+            "       }")
+    @RequestMapping(value = "/updateTransferModelConfig",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    public Object updateTransferModelConfig(@RequestBody UpdateTransferModelConfigVo updateTransferModelConfigVo) {
+        if (StringUtils.isEmpty(updateTransferModelConfigVo.getTransferNo())) {
+            fb.setCode(0);
+            fb.setMessage("需要修改的线路模板编号不能为空");
+            return gson.toJson(fb);
+        }
+        if (updateTransferModelConfigVo.getInfo().size() >= 2 && updateTransferModelConfigVo.getInfo().size() < 5) {
+            String country = "";
+            String city = "";
+            String addressDetail = "";
+            String lng = "";
+            String lat = "";
+            String postCode = "";
+            String remark = "";
+            for (int i = 0; i < updateTransferModelConfigVo.getInfo().size(); i++) {
+                if (StringUtils.isEmpty(updateTransferModelConfigVo.getInfo().get(i).getCountry())) {
+                    fb.setCode(0);
+                    fb.setMessage("国家不能为空");
+                    return gson.toJson(fb);
+                }
+                if (StringUtils.isEmpty(updateTransferModelConfigVo.getInfo().get(i).getCity())) {
+                    fb.setCode(0);
+                    fb.setMessage("城市不能为空");
+                    return gson.toJson(fb);
+                }
+                if (StringUtils.isEmpty(updateTransferModelConfigVo.getInfo().get(i).getAddressDetail())) {
+                    fb.setCode(0);
+                    fb.setMessage("具体地址不能为空");
+                    return gson.toJson(fb);
+                }
+                if (StringUtils.isEmpty(updateTransferModelConfigVo.getInfo().get(i).getLat())) {
+                    fb.setCode(0);
+                    fb.setMessage("纬度不能为空");
+                    return gson.toJson(fb);
+                }
+                if (!updateTransferModelConfigVo.getInfo().get(i).getLat().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 (StringUtils.isEmpty(updateTransferModelConfigVo.getInfo().get(i).getLng())) {
+                    fb.setCode(0);
+                    fb.setMessage("经度不能为空");
+                    return gson.toJson(fb);
+                }
+                if (!updateTransferModelConfigVo.getInfo().get(i).getLng().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(updateTransferModelConfigVo.getInfo().get(i).getPostCode())) {
+                    fb.setCode(0);
+                    fb.setMessage("邮编不能为空");
+                    return gson.toJson(fb);
+                }
+                country = country + updateTransferModelConfigVo.getInfo().get(i).getCountry() + " ";
+                city = city + updateTransferModelConfigVo.getInfo().get(i).getCity() + " ";
+                addressDetail = addressDetail + updateTransferModelConfigVo.getInfo().get(i).getAddressDetail() + " ";
+                lng = lng + updateTransferModelConfigVo.getInfo().get(i).getLng() + " ";
+                lat = lat + updateTransferModelConfigVo.getInfo().get(i).getLat() + " ";
+                postCode = postCode + updateTransferModelConfigVo.getInfo().get(i).getPostCode() + " ";
+                remark = remark + updateTransferModelConfigVo.getInfo().get(i).getRemark() + " ";
+            }
+            Map<Object,Object> map=new HashMap<>();
+            map.put("transferNo",updateTransferModelConfigVo.getTransferNo());
+            map.put("counts",updateTransferModelConfigVo.getInfo().size());
+            map.put("country",country);
+            map.put("city",city);
+            map.put("addressDetail",addressDetail);
+            map.put("lng",lng);
+            map.put("lat",lat);
+            map.put("postCode",postCode);
+            map.put("remark",remark);
+            transferModelConfigService.updateTransferModelConfig(map);
+            Map<String,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);
+    }
+}

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

+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.AddUserAddressVo;
+import com.example.tdl.domain.vo.UpdateUserAddressVo;
+import com.example.tdl.domain.vo.UserRedisVo;
+import com.example.tdl.service.UserAddressService;
+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 javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@RestController
+@RequestMapping("/userAddress")
+public class UserAddressController {
+
+    private Logger logger = LoggerFactory.getLogger(UserAddressController.class);
+
+    CommFeedback fb=new CommFeedback();
+
+    Gson gson=new Gson();
+
+    @Autowired
+    private UserAddressService userAddressService;
+
+    @Autowired
+    private TokenRedisService tokenRedisService;
+
+
+    //根据用户编号查询用户常用地址
+    @ApiOperation(value = "根据用户编号查询用户常用地址",notes = "根据用户编号查询用户常用地址，返回值说明：" +
+            "   userNumber：用户编号," +
+            "   name：常用地址名," +
+            "   country：国家," +
+            "   city：城市," +
+            "   addressDetail：具体地址," +
+            "   lng：经度," +
+            "   lat：纬度," +
+            "   postCode：邮编," +
+            "   remark：备注。")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/getByUserNumber",method = RequestMethod.GET)
+    public Object getByUserNumber(HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        return userAddressService.getByUserNumber(user.getUserNumber());
+    }
+
+    //添加用户常用地址
+    @ApiOperation(value = "添加用户常用地址",notes = "添加用户常用地址，需要传的参数：" +
+            "   name:地址名," +
+            "   country:国家," +
+            "   city:城市," +
+            "   addressDetail:具体地址," +
+            "   lng:经度," +
+            "   lat:纬度," +
+            "   postCode:邮编," +
+            "   remark:备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/addUserAddress",method = RequestMethod.POST)
+    public Object addUserAddress(@RequestBody AddUserAddressVo addUserAddressVo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(addUserAddressVo.getName())){
+            fb.setCode(0);
+            fb.setMessage("添加的别名不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(addUserAddressVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage("国家不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addUserAddressVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage("城市不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(addUserAddressVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage("添加的详细地址不能为空");
+            return gson.toJson(fb);
+        }
+        if(!addUserAddressVo.getLat().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(!addUserAddressVo.getLng().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(!addUserAddressVo.getLat().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(!addUserAddressVo.getLng().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 (userAddressService.getByUserNumberAndName(user.getUserNumber(),addUserAddressVo.getName())!=null){
+            fb.setCode(0);
+            fb.setMessage("添加的常用地址别名不能重复");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("userNumber",user.getUserNumber());
+        map.put("name",addUserAddressVo.getName());
+        map.put("country",addUserAddressVo.getCountry());
+        map.put("city",addUserAddressVo.getCity());
+        map.put("addressDetail",addUserAddressVo.getAddressDetail());
+        map.put("lng",addUserAddressVo.getLng());
+        map.put("lat",addUserAddressVo.getLat());
+        map.put("postCode",addUserAddressVo.getPostCode());
+        map.put("remark",addUserAddressVo.getRemark());
+        userAddressService.addUserAddress(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if (msg.get("msg").equals("添加用户常用地址成功")){
+            fb.setCode(1);
+            fb.setMessage("添加用户常用地址成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+    //修改用户常用地址
+    @ApiOperation(value = "修改用户常用地址",notes = "修改用户常用地址，需要传的参数：" +
+            "   oldName:修改之前的地址名," +
+            "   name:地址名," +
+            "   country:国家," +
+            "   city:城市," +
+            "   addressDetail:具体地址," +
+            "   lng:经度," +
+            "   lat:纬度," +
+            "   postCode:邮编," +
+            "   remark:备注")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/updateUserAddress",method = RequestMethod.POST)
+    public Object updateUserAddress(@RequestBody UpdateUserAddressVo updateUserAddressVo, HttpServletRequest request){
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(updateUserAddressVo.getOldName())){
+            fb.setCode(0);
+            fb.setMessage("需要修改的常用地址别名不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateUserAddressVo.getName())){
+            fb.setCode(0);
+            fb.setMessage("添加的别名不能为空");
+            return gson.toJson(fb);
+        }
+        if(StringUtils.isEmpty(updateUserAddressVo.getCountry())){
+            fb.setCode(0);
+            fb.setMessage("国家不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateUserAddressVo.getCity())){
+            fb.setCode(0);
+            fb.setMessage("城市不能为空");
+            return gson.toJson(fb);
+        }
+        if (StringUtils.isEmpty(updateUserAddressVo.getAddressDetail())){
+            fb.setCode(0);
+            fb.setMessage("添加的详细地址不能为空");
+            return gson.toJson(fb);
+        }
+        if(!updateUserAddressVo.getLat().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(!updateUserAddressVo.getLng().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(!updateUserAddressVo.getLat().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(!updateUserAddressVo.getLng().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 (userAddressService.getByUserNumberAndName(user.getUserNumber(), updateUserAddressVo.getName())!=null&&!updateUserAddressVo.getOldName().equals(updateUserAddressVo.getName())){
+            fb.setCode(0);
+            fb.setMessage("修改的常用地址别名不能重复");
+            return gson.toJson(fb);
+        }
+        Map<Object,Object> map=new HashMap<>();
+        map.put("userNumber",user.getUserNumber());
+        map.put("oldName", updateUserAddressVo.getOldName());
+        map.put("name", updateUserAddressVo.getName());
+        map.put("country", updateUserAddressVo.getCountry());
+        map.put("city", updateUserAddressVo.getCity());
+        map.put("addressDetail", updateUserAddressVo.getAddressDetail());
+        map.put("lng", updateUserAddressVo.getLng());
+        map.put("lat", updateUserAddressVo.getLat());
+        map.put("postCode", updateUserAddressVo.getPostCode());
+        map.put("remark", updateUserAddressVo.getRemark());
+        userAddressService.updateUserAddress(map);
+        Map<Object,Object> msg=new HashMap<>();
+        msg.put("msg",map.get("msg"));
+        if (msg.get("msg").equals("修改用户常用地址成功")){
+            fb.setCode(1);
+            fb.setMessage("修改用户常用地址成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage(msg.get("msg").toString());
+        }
+        return gson.toJson(fb);
+    }
+
+    //删除用户常用地址
+    @ApiOperation(value = "删除用户常用地址",notes = "删除用户常用地址,只用传需要删除的地址名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType="header", name = "Account_token", value = "token", required = true, dataType = "String"),
+    })
+    @RequestMapping(value="/delUserAddress",method = RequestMethod.POST)
+    public Object delUserAddress(@RequestBody String name, HttpServletRequest request){
+        JSONObject jsonObject= JSON.parseObject(name);
+        name=(String)jsonObject.get("name");
+        String token = request.getHeader("Account_token");
+        String datum = tokenRedisService.get("TOKEN_" +token);
+        UserRedisVo user =  gson.fromJson(datum,UserRedisVo.class);
+        if (StringUtils.isEmpty(name)){
+            fb.setCode(0);
+            fb.setMessage("需要删除的别名不能为空");
+            return gson.toJson(fb);
+        }
+        int a = userAddressService.delUserAddress(user.getUserNumber(),name);
+
+        if (a>0){
+            fb.setCode(1);
+            fb.setMessage("删除用户常用地址成功");
+        }else{
+            fb.setCode(0);
+            fb.setMessage("删除用户常用地址失败");
+        }
+        return gson.toJson(fb);
+    }
+
+}

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

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

src/main/resources/mapper/TransferModelConfigMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.tdl.mapper.TransferModelConfigMapper">
+    <select id="getAll" parameterType="String" resultType="com.example.tdl.domain.vo.ResultTransferModelConfigVo">
+        SELECT transferNo,transferModelName,country,city,addressDetail,lng,lat,postCode,sequence,tm.remark
+        from city c,transfer_model_config tm INNER JOIN transfer_model t ON tm.transferModel_id=t.id
+        WHERE tm.city_id=c.id
+        AND t.transferNo=#{transferNo,jdbcType=VARCHAR}
+   </select>
+
+    <update id="updateTransferModelConfig" statementType="CALLABLE" parameterType="java.util.Map">
+        <![CDATA[
+            {
+                call pro_updateTransferModelConfig(
+                    #{transferNo,mode=IN,jdbcType=VARCHAR},
+                    #{counts,mode=IN,jdbcType=INTEGER},
+                    #{country,mode=IN,jdbcType=VARCHAR},
+                    #{city,mode=IN,jdbcType=VARCHAR},
+                    #{addressDetail,mode=IN,jdbcType=VARCHAR},
+                    #{lng,mode=IN,jdbcType=VARCHAR},
+                    #{lat,mode=IN,jdbcType=VARCHAR},
+                    #{postCode,mode=IN,jdbcType=VARCHAR},
+                    #{remark,mode=IN,jdbcType=VARCHAR},
+                    #{msg,mode=OUT,jdbcType=VARCHAR}
+                )
+            }
+        ]]>
+    </update>
+
+    <!--<insert id="addTransferModel" statementType="CALLABLE" parameterType="java.util.Map">-->
+        <!--INSERT INTO transfer_model_config VALUES (-->
+            <!--NULL ,-->
+            <!--(SELECT id from transfer_model WHERE transferNo=#{transferNo,jdbcType=VARCHAR}),-->
+            <!--(SELECT id from city WHERE country=#{country,jdbcType=VARCHAR} AND city=#{city,jdbcType=VARCHAR}),-->
+            <!--#{addressDetail,jdbcType=VARCAHR},-->
+            <!--#{lng,jdbcType=VARCHAR},-->
+            <!--#{lat,jdbcType=VARCHAR},-->
+            <!--#{postCode,jdbcType=VARCHAR},-->
+            <!--#{sequence,jdbcType=VARCHAR},-->
+            <!--#{remark,jdbcType=VARCHAR}-->
+        <!--)-->
+    <!--</insert>-->
+
+    <!--<delete id="delTransferModel" statementType="CALLABLE" parameterType="java.util.Map">-->
+        <!--DELETE from transfer_model_config-->
+        <!--WHERE transferModel_id=(SELECT id from transfer_model WHERE transferNo=#{transferNo,jdbcType=VARCHAR})-->
+        <!--AND-->
+    <!--</delete>-->
+
+    <!--<select id="getByTransferNo" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">-->
+        <!--SELECT transferNo,transferModelName,counts-->
+        <!--from transfer_model-->
+        <!--WHERE transferNo=#{transferNo,jdbcType=VARCHAR}-->
+    <!--</select>-->
+
+    <!--<select id="getByTransferModelName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultModelVo">-->
+        <!--SELECT transferNo,transferModelName,counts-->
+        <!--from transfer_model-->
+        <!--WHERE transferModelName=#{transferModelName,jdbcType=VARCHAR}-->
+    <!--</select>-->
+</mapper>
\ No newline at end of file

src/main/resources/mapper/UserAddressMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.example.tdl.mapper.UserAddressMapper">
+    <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserAddressVo">
+      SELECT userNumber,name,country,city,addressDetail,lng,lat,postCode,u.remark
+      from user_address u INNER JOIN city c ON u.city_id=c.id
+      WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
+    </select>
+
+    <insert id="addUserAddress" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+            {
+               call pro_addUserAddress(
+                    #{userNumber,mode=IN,jdbcType=VARCHAR},
+                    #{name,mode=IN,jdbcType=VARCHAR},
+                    #{country,mode=IN,jdbcType=VARCHAR},
+                    #{city,mode=IN,jdbcType=VARCHAR},
+                    #{addressDetail,mode=IN,jdbcType=VARCHAR},
+                    #{lng,mode=IN,jdbcType=VARCHAR},
+                    #{lat,mode=IN,jdbcType=VARCHAR},
+                    #{postCode,mode=IN,jdbcType=VARCHAR},
+                    #{remark,mode=IN,jdbcType=VARCHAR},
+                    #{msg,mode=OUT,jdbcType=VARCHAR}
+               )
+            }
+        ]]>
+    </insert>
+
+    <update id="updateUserAddress" parameterType="java.util.Map" statementType="CALLABLE">
+        <![CDATA[
+        {
+           call pro_updateUserAddress(
+                #{userNumber,mode=IN,jdbcType=VARCHAR},
+                #{oldName,mode=IN,jdbcType=VARCHAR},
+                #{name,mode=IN,jdbcType=VARCHAR},
+                #{country,mode=IN,jdbcType=VARCHAR},
+                #{city,mode=IN,jdbcType=VARCHAR},
+                #{addressDetail,mode=IN,jdbcType=VARCHAR},
+                #{lng,mode=IN,jdbcType=VARCHAR},
+                #{lat,mode=IN,jdbcType=VARCHAR},
+                #{postCode,mode=IN,jdbcType=VARCHAR},
+                #{remark,mode=IN,jdbcType=VARCHAR},
+                #{msg,mode=OUT,jdbcType=VARCHAR}
+           )
+        }
+      ]]>
+    </update>
+
+    <delete id="delUserAddress" parameterType="String">
+        DELETE from user_address
+        WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
+        AND name=#{name,jdbcType=VARCHAR}
+    </delete>
+
+    <select id="getByUserNumberAndName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserAddressVo">
+        SELECT userNumber,name,country,city,addressDetail,lng,lat,postCode,u.remark
+        from user_address u INNER JOIN city c ON u.city_id=c.id
+        WHERE userNumber=#{userNumber,jdbcType=VARCHAR}
+        AND name=#{name,jdbcType=VARCHAR}
+    </select>
+
+
+    <!-- <insert id="addUserAddress" parameterType="com.example.tdl.domain.vo.AddUserAddressVo">
+        INSERT INTO user_address VALUES (
+            NULL ,
+            #{userNumber,jdbcType=VARCHAR},
+            #{name,jdbcType=VARCHAR},
+            (SELECT id from city WHERE country=#{country,jdbcType=VARCHAR} AND city=#{city,jdbcType=VARCHAR}),
+            #{addressDetail,jdbcType=VARCHAR},
+            #{lng,jdbcType=VARCHAR},
+            #{lat,jdbcType=VARCHAR},
+            #{postCode,jdbcType=VARCHAR},
+            #{remark,jdbcType=VARCHAR}
+        )
+    </insert>-->
+</mapper>
\ No newline at end of file

src/main/resources/mapper/UserRouteMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.tdl.mapper.UserRouteMapper">
-<!--    <select id="getByUserNumber" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserRouteVo">
-      SELECT userNumber,userName,name,country,province,city,address,longitude,latitude,remark
-      from city_config c,user_route r INNER JOIN `user` u ON r.user_id=u.id
-      WHERE r.cityConfig_id=c.id AND userNumber=#{userNumber,jdbcType=VARCHAR}
-    </select>
-
-    <insert id="addUserRoute" parameterType="java.util.Map" statementType="CALLABLE">
-        <![CDATA[
-        {
-           call pro_addUserRoute(
-                #{userNumber,mode=IN,jdbcType=VARCHAR},
-                #{name,mode=IN,jdbcType=VARCHAR},
-                #{country,mode=IN,jdbcType=VARCHAR},
-                #{province,mode=IN,jdbcType=VARCHAR},
-                #{city,mode=IN,jdbcType=VARCHAR},
-                #{address,mode=IN,jdbcType=VARCHAR},
-                #{longitude,mode=IN,jdbcType=VARCHAR},
-                #{latitude,mode=IN,jdbcType=VARCHAR},
-                #{remark,mode=IN,jdbcType=VARCHAR},
-                #{msg,mode=OUT,jdbcType=VARCHAR}
-           )
-        }
-      ]]>
-    </insert>
-
-    <update id="updateUserRoute" parameterType="java.util.Map" statementType="CALLABLE">
-        <![CDATA[
-        {
-           call pro_updateUserRoute(
-                #{userNumber,mode=IN,jdbcType=VARCHAR},
-                #{oldName,mode=IN,jdbcType=VARCHAR},
-                #{name,mode=IN,jdbcType=VARCHAR},
-                #{country,mode=IN,jdbcType=VARCHAR},
-                #{province,mode=IN,jdbcType=VARCHAR},
-                #{city,mode=IN,jdbcType=VARCHAR},
-                #{address,mode=IN,jdbcType=VARCHAR},
-                #{longitude,mode=IN,jdbcType=VARCHAR},
-                #{latitude,mode=IN,jdbcType=VARCHAR},
-                #{remark,mode=IN,jdbcType=VARCHAR},
-                #{msg,mode=OUT,jdbcType=VARCHAR}
-           )
-        }
-      ]]>
-    </update>
-
-    <delete id="delUserRoute" parameterType="String">
-        DELETE from user_route
-        WHERE user_id=(SELECT id from user where userNumber=#{userNumber,jdbcType=VARCHAR})
-        AND name=#{name,jdbcType=VARCHAR}
-    </delete>
-
-    <select id="getByUserNumberAndName" parameterType="String" resultType="com.example.tdl.domain.vo.ResultUserRouteVo">
-        SELECT userNumber,userName,name,country,province,city,address,longitude,latitude,remark
-        from city_config c,user_route r INNER JOIN `user` u ON r.user_id=u.id
-        WHERE r.cityConfig_id=c.id
-        AND userNumber=#{userNumber,jdbcType=VARCHAR}
-        AND name=#{name,jdbcType=VARCHAR}
-    </select>-->
-</mapper>
\ No newline at end of file

src/main/resources/mybatis-config.xml

@@ -48,7 +48,8 @@
         <mapper resource="mapper/TopicConfigMapper.xml"/>
         <mapper resource="mapper/CityConfigMapper.xml"/>
         <mapper resource="mapper/TDLLogMapper.xml"/>
-        <mapper resource="mapper/UserRouteMapper.xml"/>
+        <mapper resource="mapper/UserAddressMapper.xml"/>
         <mapper resource="mapper/TransferModelMapper.xml"/>
+        <mapper resource="mapper/TransferModelConfigMapper.xml"/>
     </mappers>
 </configuration>