feat: 新增装修垃圾独立模块，新增用户控制层，修改单点登录

guzijian
1 parent 0c1344e2
Showing 16 changed files with 208 additions and 61 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/custom/BizException.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/handle/HandleException.java
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/AddressDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/LoginVo.java → trash-garbage/src/main/java/com/trash/garbage/pojo/dto/LoginDto.java
trash-garbage/src/main/java/com/trash/garbage/security/UserAbstract.java
trash-garbage/src/main/java/com/trash/garbage/service/GarAddressService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarAddressServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/utils/SecurityUtil.java
trash-garbage/src/main/resources/application-dev.yml
trash-garbage/src/main/resources/mapper/GarAddressMapper.xml
 package com.trash.garbage.controller;
-import com.aliyuncs.exceptions.ClientException;
 import com.trash.garbage.global.Result;
-import com.trash.garbage.pojo.vo.LoginVo;
+import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.dto.AddressDto;
+import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.service.GarUserService;
-import com.trash.garbage.utils.SMSUtils;
-import com.trash.garbage.utils.ValidateCodeUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import java.util.Random;
+import java.util.List;
 /**
  * @author 20412
@@ -34,7 +32,7 @@ public class GarbageUserController {
      */
     @ApiOperation("用户接口-用户登录")
     @PostMapping("/login")
-    public Result<String> login(@RequestBody LoginVo user) {
+    public Result<String> login(@RequestBody LoginDto user) {
         return Result.OK(garUserService.login(user));
     }
@@ -48,6 +46,17 @@ public class GarbageUserController {
             e.printStackTrace();
             return Result.ERROR();
         }
+    }
+
+    @ApiOperation("用户接口-获取用户地址")
+    @GetMapping("/query/address/{type}")
+    public Result<List<GarAddress>> queryAddress(@PathVariable("type") String type){
+        return Result.OK(garUserService.queryAddress(type));
+    }
+    @ApiOperation("用户接口-新增地址")
+    @PostMapping("/save/address")
+    public Result<String> saveAddress(@RequestBody AddressDto dto){
+        return Result.OK(garUserService.saveAddress(dto));
     }
 }
+package com.trash.garbage.custom;
+
+import com.trash.garbage.global.ResultCode;
+import lombok.Data;
+
+/**
+ * @author 20412
+ */
+@Data
+public class BizException extends RuntimeException{
+    private String msg;
+    private ResultCode code;
+
+    public BizException(ResultCode code, String msg){
+        this.msg = msg;
+        this.code = code;
+    }
+}
@@ -15,6 +15,15 @@ public class GlobalStatus {
     public static final int DEL_FLAG_YES = 1;
     /**
+     * 地址查询类型  当前地址
+     */
+    public static final String QUERY_ADDRESS_TYPE_CURRENT = "CURRENT";
+    /**
+     * 地址查询类型 所有
+     */
+    public static final String QUERY_ADDRESS_TYPE_ALL = "ALL";
+
+    /**
      * 用户状态管理
      */
     public enum UserStatusEnum{
@@ -40,15 +49,22 @@ public class GlobalStatus {
     /**
      * 字典
      */
-    public enum DicEnum{
-        MODE("MODE"),
-        CUSTOM("CUSTOM");
-        DicEnum(String type){
-            this.type = type;
+    public enum GarAddressStatus {
+        NORMAL_ADDRESS(0,"地址"),
+        DEFAULT_ADDRESS(1,"默认地址"),
+        CURRENT_ADDRESS(2,"当前选中地址");
+        GarAddressStatus(Integer status,String description){
+            this.status = status;
+            this.description = description;
+        }
+        private String description;
+        private Integer status;
+        public Integer getValue(){
+            return this.status;
         }
-        private String type;
-        public String getValue(){
-            return this.type;
+        public String getDescription(){
+            return this.description;
         }
+
     }
 }
+package com.trash.garbage.handle;
+
+import com.trash.garbage.custom.BizException;
+import com.trash.garbage.global.Result;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * @author 20412
+ */
+@RestControllerAdvice
+public class HandleException {
+
+    @ExceptionHandler(BizException.class)
+    public Result<?> handleBizException(BizException e) {
+        return Result.ERROR(e.getCode(), e.getMsg());
+    }
+}
 package com.trash.garbage.interceptor;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.trash.garbage.global.GlobalStatus;
 import com.trash.garbage.utils.SecurityUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
@@ -27,7 +26,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.hasGetter("garCreateBy")){
             if (!Objects.isNull(SecurityUtil.getUserCustom())){
-                this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtil.getUserCustom().getUser().getUserId());
+                this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
             }
         }
@@ -36,12 +35,12 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         }
         if (metaObject.hasGetter("garUserId")){
             if (!Objects.isNull(SecurityUtil.getUserCustom())) {
-                this.strictInsertFill(metaObject, "garUserId", String.class, SecurityUtil.getUserCustom().getUser().getUserId());
+                this.strictInsertFill(metaObject, "garUserId", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
             }
         }
         if (metaObject.hasGetter("garUpdateBy")){
             if (!Objects.isNull(SecurityUtil.getUserCustom())){
-                this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtil.getUserCustom().getUser().getUserId());
+                this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtil.getUserCustom().getUser().getGarUserId());
             }
         }
     }
@@ -53,7 +52,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             this.strictUpdateFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
         if (metaObject.hasGetter("garUpdateBy")){
-            this.strictUpdateFill(metaObject,"garUpdateBy",String.class,SecurityUtil.getUserCustom().getUser().getUserId());
+            this.strictUpdateFill(metaObject,"garUpdateBy",String.class,SecurityUtil.getUserCustom().getUser().getGarUserId());
         }
     }
 }
 \ No newline at end of file
 package com.trash.garbage.pojo.domain;
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
+
 /**
  * 建筑垃圾-用户地址
+ *
  * @author 20412
  * @TableName gar_address
  */
-@TableName(value ="gar_address")
+@TableName(value = "gar_address")
 @Data
 public class GarAddress implements Serializable {
     /**
@@ -24,7 +29,7 @@ public class GarAddress implements Serializable {
     /**
      * 用户id
      */
-    private Long garUserId;
+    private String garUserId;
     /**
      * 用户地址
@@ -39,14 +44,26 @@ public class GarAddress implements Serializable {
     /**
      * 创建时间
      */
+    @TableField(fill = FieldFill.INSERT)
     private Date garCreateTime;
     /**
      * 修改时间
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date garUpdateTime;
     /**
+     * 联系人名
+     */
+    private String garUserContactName;
+
+    /**
+     * 联系电话
+     */
+    private String garUserContactTel;
+
+    /**
      * 备注
      */
     private String garRemark;
@@ -67,12 +84,14 @@ public class GarAddress implements Serializable {
         }
         GarAddress other = (GarAddress) that;
         return (this.getGarAddressId() == null ? other.getGarAddressId() == null : this.getGarAddressId().equals(other.getGarAddressId()))
-            && (this.getGarUserId() == null ? other.getGarUserId() == null : this.getGarUserId().equals(other.getGarUserId()))
-            && (this.getGarUserAddress() == null ? other.getGarUserAddress() == null : this.getGarUserAddress().equals(other.getGarUserAddress()))
-            && (this.getGarUserDefault() == null ? other.getGarUserDefault() == null : this.getGarUserDefault().equals(other.getGarUserDefault()))
-            && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
-            && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
-            && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
+                && (this.getGarUserId() == null ? other.getGarUserId() == null : this.getGarUserId().equals(other.getGarUserId()))
+                && (this.getGarUserAddress() == null ? other.getGarUserAddress() == null : this.getGarUserAddress().equals(other.getGarUserAddress()))
+                && (this.getGarUserDefault() == null ? other.getGarUserDefault() == null : this.getGarUserDefault().equals(other.getGarUserDefault()))
+                && (this.getGarCreateTime() == null ? other.getGarCreateTime() == null : this.getGarCreateTime().equals(other.getGarCreateTime()))
+                && (this.getGarUpdateTime() == null ? other.getGarUpdateTime() == null : this.getGarUpdateTime().equals(other.getGarUpdateTime()))
+                && (this.getGarUserContactName() == null ? other.getGarUserContactName() == null : this.getGarUserContactName().equals(other.getGarUserContactName()))
+                && (this.getGarUserContactTel() == null ? other.getGarUserContactTel() == null : this.getGarUserContactTel().equals(other.getGarUserContactTel()))
+                && (this.getGarRemark() == null ? other.getGarRemark() == null : this.getGarRemark().equals(other.getGarRemark()));
     }
     @Override
@@ -85,6 +104,8 @@ public class GarAddress implements Serializable {
         result = prime * result + ((getGarUserDefault() == null) ? 0 : getGarUserDefault().hashCode());
         result = prime * result + ((getGarCreateTime() == null) ? 0 : getGarCreateTime().hashCode());
         result = prime * result + ((getGarUpdateTime() == null) ? 0 : getGarUpdateTime().hashCode());
+        result = prime * result + ((getGarUserContactName() == null) ? 0 : getGarUserContactName().hashCode());
+        result = prime * result + ((getGarUserContactTel() == null) ? 0 : getGarUserContactTel().hashCode());
         result = prime * result + ((getGarRemark() == null) ? 0 : getGarRemark().hashCode());
         return result;
     }
@@ -101,9 +122,11 @@ public class GarAddress implements Serializable {
         sb.append(", garUserDefault=").append(garUserDefault);
         sb.append(", garCreateTime=").append(garCreateTime);
         sb.append(", garUpdateTime=").append(garUpdateTime);
+        sb.append(", garUserContactName=").append(garUserContactName);
+        sb.append(", garUserContactTel=").append(garUserContactTel);
         sb.append(", garRemark=").append(garRemark);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
-}
 \ No newline at end of file
+}
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+/**
+ * @author 20412
+ */
+@Data
+public class AddressDto {
+    private String address;
+    private String details;
+    private String contactName;
+    private String contactTel;
+    private Integer defaultFlag;
+}
-package com.trash.garbage.pojo.vo;
+package com.trash.garbage.pojo.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author 20412
  */
 @Data
 @ApiModel(value = "登录vo")
-public class LoginVo {
+public class LoginDto {
     @ApiModelProperty(value = "登录vo-手机号")
     private String tel;
     @ApiModelProperty(value = "登录vo-验证码")
@@ -17,7 +17,7 @@ public abstract class UserAbstract {
      */
     public abstract String getTel();
-    public String getUserId(){
+    public String getGarUserId(){
         return this.garUserId;
     }
 package com.trash.garbage.service;
-import com.trash.garbage.pojo.domain.GarAddress;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarAddress;
 /**
 * @author 20412
 * @description 针对表【gar_address(建筑垃圾-用户地址)】的数据库操作Service
-* @createDate 2023-11-20 16:03:15
+* @createDate 2023-11-22 09:48:43
 */
 public interface GarAddressService extends IService<GarAddress> {
 package com.trash.garbage.service;
 import com.aliyuncs.exceptions.ClientException;
+import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.trash.garbage.pojo.vo.LoginVo;
+import com.trash.garbage.pojo.dto.AddressDto;
+import com.trash.garbage.pojo.dto.LoginDto;
+
+import java.util.List;
 /**
 * @author 20412
@@ -12,7 +16,11 @@ import com.trash.garbage.pojo.vo.LoginVo;
 */
 public interface GarUserService extends IService<GarUser> {
-    String login(LoginVo user);
+    String login(LoginDto user);
     void sendVerify(String tel) throws ClientException;
+
+    List<GarAddress> queryAddress(String type);
+
+    String saveAddress(AddressDto dto);
 }
 package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.mapper.GarAddressMapper;
 import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.service.GarAddressService;
-import com.trash.garbage.mapper.GarAddressMapper;
 import org.springframework.stereotype.Service;
 /**
 * @author 20412
 * @description 针对表【gar_address(建筑垃圾-用户地址)】的数据库操作Service实现
-* @createDate 2023-11-20 16:03:15
+* @createDate 2023-11-22 09:48:43
 */
 @Service
 public class GarAddressServiceImpl extends ServiceImpl<GarAddressMapper, GarAddress>
-    implements GarAddressService{
+    implements GarAddressService {
 }
@@ -3,22 +3,23 @@ package com.trash.garbage.service.impl;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.config.WxConfig;
+import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.GlobalRedisProperties;
 import com.trash.garbage.global.GlobalStatus;
-import com.trash.garbage.global.Result;
+import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.pojo.domain.GarAddress;
 import com.trash.garbage.pojo.domain.GarUser;
-import com.trash.garbage.pojo.vo.LoginVo;
+import com.trash.garbage.pojo.dto.AddressDto;
+import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.security.UserCustom;
+import com.trash.garbage.service.GarAddressService;
 import com.trash.garbage.service.GarUserService;
 import com.trash.garbage.mapper.GarUserMapper;
-import com.trash.garbage.utils.JwtUtils;
-import com.trash.garbage.utils.RedisUtils;
-import com.trash.garbage.utils.SMSUtils;
-import com.trash.garbage.utils.ValidateCodeUtil;
+import com.trash.garbage.utils.*;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -32,6 +33,8 @@ import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.spec.AlgorithmParameterSpec;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -49,12 +52,15 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     @Autowired
     private AuthenticationManager authenticationManager;
+    @Autowired
+    private GarAddressService garAddressService;
+
     @Resource
     private RedisUtils redisUtils;
     @Override
-    public String login(LoginVo user) {
+    public String login(LoginDto user) {
         if (Objects.isNull(user)) {
             throw new UsernameNotFoundException("当前用户不存在");
         }
@@ -73,7 +79,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         // 验证码验证
         Integer code = (Integer) redisUtils.get(GlobalRedisProperties.REDIS_USER_CODE.getValue() + user.getTel());
         if (!code.equals(user.getCode())) {
-            throw new RuntimeException("验证码错误！！");
+            throw new BizException(ResultCode.CODE_400, "验证码错误！！");
         }
         // 封装成authentication对象
         Authentication authentication = new UsernamePasswordAuthenticationToken(user.getTel(), "");
@@ -84,9 +90,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         }
         UserCustom userCustom = (UserCustom) authenticate.getPrincipal();
         // 存入redis
-        redisUtils.set(GlobalRedisProperties.REDIS_USER_HEADER.getValue() + userCustom.getUser().getUserId(), userCustom);
+        redisUtils.set(GlobalRedisProperties.REDIS_USER_HEADER.getValue() + userCustom.getUser().getGarUserId(), userCustom);
         // 修改在线状态
-        return JwtUtils.createToken(userCustom.getUser().getTel(), userCustom.getUser().getUserId());
+        return JwtUtils.createToken(userCustom.getUser().getTel(), userCustom.getUser().getGarUserId());
     }
     @Override
@@ -96,10 +102,44 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         //给用户发送验证码
 //        SMSUtils.sendMessage("", tel, validateCode.toString(), "");
         // 保存redis
-        System.out.println("code:"+ validateCode);
+        System.out.println("code:" + validateCode);
         redisUtils.setEx(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
     }
+    @Override
+    public List<GarAddress> queryAddress(String type) {
+        UserCustom userCustom = SecurityUtil.getUserCustom();
+        if (Objects.isNull(userCustom)) {
+            throw new BizException(ResultCode.CODE_401, ResultCode.CODE_401.getMsg());
+        }
+        String garUserId = userCustom.getUser().getGarUserId();
+        LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarAddress::getGarUserId, garUserId);
+        List<GarAddress> addressList = garAddressService.list(qw);
+        if (GlobalStatus.QUERY_ADDRESS_TYPE_CURRENT.equals(type)) {
+            for (GarAddress garAddress : addressList) {
+                if (GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue().equals(garAddress.getGarUserDefault())) {
+                    return Arrays.asList(garAddress);
+                }
+            }
+        }
+        return addressList;
+    }
+
+    @Override
+    public String saveAddress(AddressDto dto) {
+        UserCustom userCustom = SecurityUtil.getUserCustom();
+        GarAddress garAddress = new GarAddress();
+        garAddress.setGarUserId(userCustom.getUser().getGarUserId());
+        garAddress.setGarUserAddress(dto.getAddress());
+        garAddress.setGarUserDefault(dto.getDefaultFlag());
+        garAddress.setGarUserContactName(dto.getContactName());
+        garAddress.setGarUserContactTel(dto.getContactTel());
+        garAddress.setGarRemark(dto.getDetails());
+        garAddressService.save(garAddress);
+        return "新增地址成功";
+    }
+
     /**
      * 微信小程序解密
 package com.trash.garbage.utils;
+import com.trash.garbage.custom.BizException;
+import com.trash.garbage.global.ResultCode;
 import com.trash.garbage.security.UserCustom;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -11,8 +13,7 @@ public class SecurityUtil {
     public static UserCustom getUserCustom() {
         if (SecurityContextHolder.getContext().getAuthentication().getPrincipal() instanceof UserCustom)
-        return (UserCustom) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        return null;
+            return (UserCustom) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        throw new BizException(ResultCode.CODE_401, ResultCode.CODE_401.getMsg());
     }
-
 }
@@ -53,10 +53,11 @@ spring:
   redis:
     # 地址
 #    host: 121.41.83.61
-    host: 192.168.172.221
+#    host: 192.168.172.221
+    host: 127.0.0.1
     database: 0
     #            password: "guzijian"
-    port: 6378
+    port: 6379
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -79,7 +80,6 @@ mybatis-plus:
   global-config:
     # 指定逻辑删除含义
     db-config:
-      logic-delete-field: delFlag
       logic-delete-value: 1
       logic-not-delete-value: 0
   configuration:
@@ -6,17 +6,19 @@
     <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarAddress">
             <id property="garAddressId" column="gar_address_id" jdbcType="BIGINT"/>
-            <result property="garUserId" column="gar_user_id" jdbcType="BIGINT"/>
+            <result property="garUserId" column="gar_user_id" jdbcType="VARCHAR"/>
             <result property="garUserAddress" column="gar_user_address" jdbcType="VARCHAR"/>
             <result property="garUserDefault" column="gar_user_default" jdbcType="TINYINT"/>
             <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
             <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garUserContactName" column="gar_user_contact_name" jdbcType="VARCHAR"/>
+            <result property="garUserContactTel" column="gar_user_contact_tel" jdbcType="VARCHAR"/>
             <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
     </resultMap>
     <sql id="Base_Column_List">
         gar_address_id,gar_user_id,gar_user_address,
         gar_user_default,gar_create_time,gar_update_time,
-        gar_remark
+        gar_user_contact_name,gar_user_contact_tel,gar_remark
     </sql>
 </mapper>