From 2326029f50a2e90a8a9b75e0a4ce82ce36cba5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Sat, 27 Jul 2024 17:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/ss/account/domain/SmAccount.java    |   4 +-
 .../ss/account/domain/SmAccountQuery.java     |   5 +
 .../ruoyi/ss/account/domain/SmAccountVO.java  |  15 +++
 .../ruoyi/ss/account/domain/SmAccountVo.java  |  11 --
 .../ss/account/domain/enums/AccountType.java  |   3 +-
 .../ss/account/mapper/SmAccountMapper.java    |   8 +-
 .../ss/account/mapper/SmAccountMapper.xml     |  45 ++++----
 .../ss/account/service/ISmAccountService.java |  12 +-
 .../service/impl/SmAccountServiceImpl.java    |  34 +++---
 .../impl/TransactionBillServiceImpl.java      |   6 +-
 .../controller/app/AppAccountController.java  |   3 -
 .../web/controller/ss/AccountController.java  | 107 ++++++++++++++++++
 12 files changed, 186 insertions(+), 67 deletions(-)
 create mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVO.java
 delete mode 100644 smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java
 create mode 100644 smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/AccountController.java

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java
index 94e9ea71..5896a239 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccount.java
@@ -2,8 +2,10 @@ package com.ruoyi.ss.account.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.annotation.Sensitive;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.ValidGroup;
+import com.ruoyi.common.enums.DesensitizedType;
 import com.ruoyi.common.utils.RegexpUtils;
 import com.ruoyi.common.valid.EnumValid;
 import com.ruoyi.common.valid.bank.BankCardInfo;
@@ -73,7 +75,7 @@ public class SmAccount extends BaseEntity
      * 数据脱敏
      */
     public void desensitization() {
-        if (this.accountNo != null) {
+        if (this.accountNo != null && AccountType.BANK_CARD.getType().equals(this.accountType)) {
             this.accountNo = StringUtils.substring(this.accountNo, 0, 4)
                     + "****"
                     + StringUtils.substring(this.accountNo, this.accountNo.length() - 4, this.accountNo.length());
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountQuery.java
index 50566032..47f9baab 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountQuery.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountQuery.java
@@ -1,5 +1,6 @@
 package com.ruoyi.ss.account.domain;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -8,4 +9,8 @@ import lombok.Data;
  */
 @Data
 public class SmAccountQuery extends SmAccount {
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVO.java
new file mode 100644
index 00000000..7af31f2b
--- /dev/null
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVO.java
@@ -0,0 +1,15 @@
+package com.ruoyi.ss.account.domain;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wjh
+ * 2024/3/27
+ */
+@Data
+public class SmAccountVO extends SmAccount {
+
+    @ApiModelProperty("用户名称")
+    private String userName;
+}
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java
deleted file mode 100644
index 45863a9c..00000000
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/SmAccountVo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.ruoyi.ss.account.domain;
-
-import lombok.Data;
-
-/**
- * @author wjh
- * 2024/3/27
- */
-@Data
-public class SmAccountVo extends SmAccount {
-}
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java
index 82be9da6..92674ca5 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/domain/enums/AccountType.java
@@ -16,7 +16,8 @@ public enum AccountType {
 
     BANK_CARD("1", "个人银行卡"),
     WECHAT("2", "微信"),
-    ALIPAY("3", "支付宝");
+    ALIPAY("3", "支付宝"),
+    OFFLINE_IMAGE("4", "线下图片");
 
 
     private final String type;
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java
index 203d1950..7d306c7d 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.java
@@ -2,7 +2,7 @@ package com.ruoyi.ss.account.mapper;
 
 import com.ruoyi.ss.account.domain.SmAccount;
 import com.ruoyi.ss.account.domain.SmAccountQuery;
-import com.ruoyi.ss.account.domain.SmAccountVo;
+import com.ruoyi.ss.account.domain.SmAccountVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,7 +21,7 @@ public interface SmAccountMapper
      * @param accountId 用户账户主键
      * @return 用户账户
      */
-    public SmAccountVo selectSmAccountByAccountId(Long accountId);
+    public SmAccountVO selectSmAccountByAccountId(Long accountId);
 
     /**
      * 查询用户账户列表
@@ -29,7 +29,7 @@ public interface SmAccountMapper
      * @param smAccount 用户账户
      * @return 用户账户集合
      */
-    public List<SmAccountVo> selectSmAccountList(SmAccountQuery smAccount);
+    public List<SmAccountVO> selectSmAccountList(SmAccountQuery smAccount);
 
     /**
      * 新增用户账户
@@ -68,7 +68,7 @@ public interface SmAccountMapper
      * @param accountNo 账号
      * @param accountType 类型
      */
-    SmAccountVo selectByAccountNo(@Param("accountNo") String accountNo, @Param("accountType") String accountType);
+    SmAccountVO selectByAccountNo(@Param("accountNo") String accountNo, @Param("accountType") String accountType);
 
     /**
      * 为用户设置默认的账户
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml
index 04985d71..22c6ac3c 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/mapper/SmAccountMapper.xml
@@ -4,40 +4,45 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.ss.account.mapper.SmAccountMapper">
 
-    <resultMap type="SmAccountVo" id="SmAccountResult">
-        <result property="accountId"    column="account_id"    />
-        <result property="userId"    column="user_id"    />
-        <result property="accountType"    column="account_type"    />
-        <result property="name"    column="name"    />
-        <result property="idCard"    column="id_card"    />
-        <result property="accountNo"    column="account_no"    />
-        <result property="mobile"    column="mobile"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
+    <resultMap type="SmAccountVO" id="SmAccountResult" autoMapping="true">
         <result property="cardInfo"    column="card_info"   typeHandler="com.ruoyi.system.mapper.typehandler.BankCardInfoTypeHandler" />
-        <result property="isDefault" column="is_default"/>
     </resultMap>
 
     <sql id="selectSmAccountVo">
-        select account_id, user_id, account_type, name, id_card, account_no, mobile, create_time, create_by, card_info, is_default from sm_account
+        select
+            sa.account_id,
+            sa.user_id,
+            sa.account_type,
+            sa.name,
+            sa.id_card,
+            sa.account_no,
+            sa.mobile,
+            sa.create_time,
+            sa.create_by,
+            sa.card_info,
+            sa.is_default,
+            su.user_name as user_name
+        from sm_account sa
+            left join sm_user su on su.user_id = sa.user_id
     </sql>
 
     <select id="selectSmAccountList" parameterType="SmAccountQuery" resultMap="SmAccountResult">
         <include refid="selectSmAccountVo"/>
         <where>
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="accountType != null  and accountType != ''"> and account_type = #{accountType}</if>
-            <if test="name != null  and name != ''"> and name = #{name}</if>
-            <if test="idCard != null  and idCard != ''"> and id_card = #{idCard}</if>
-            <if test="accountNo != null  and accountNo != ''"> and account_no = #{accountNo}</if>
-            <if test="mobile != null  and mobile != ''"> and mobile = #{mobile}</if>
-            <if test="isDefault != null"> and is_default = #{isDefault}</if>
+            <if test="userId != null "> and sa.user_id = #{userId}</if>
+            <if test="accountType != null  and accountType != ''"> and sa.account_type = #{accountType}</if>
+            <if test="name != null  and name != ''"> and sa.name = #{name}</if>
+            <if test="idCard != null  and idCard != ''"> and sa.id_card = #{idCard}</if>
+            <if test="accountNo != null  and accountNo != ''"> and sa.account_no = #{accountNo}</if>
+            <if test="mobile != null  and mobile != ''"> and sa.mobile = #{mobile}</if>
+            <if test="isDefault != null"> and sa.is_default = #{isDefault}</if>
+            <if test="userName != null  and userName != ''"> and su.user_name like CONCAT('%',#{userName},'%')</if>
         </where>
     </select>
 
     <select id="selectSmAccountByAccountId" parameterType="Long" resultMap="SmAccountResult">
         <include refid="selectSmAccountVo"/>
-        where account_id = #{accountId}
+        where sa.account_id = #{accountId}
     </select>
 
     <select id="selectByAccountNo" resultMap="SmAccountResult">
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/ISmAccountService.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/ISmAccountService.java
index cd7d7e54..b855653d 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/ISmAccountService.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/ISmAccountService.java
@@ -3,7 +3,7 @@ package com.ruoyi.ss.account.service;
 import com.ruoyi.ss.account.domain.SmAccount;
 import com.ruoyi.ss.account.domain.SmAccountBO;
 import com.ruoyi.ss.account.domain.SmAccountQuery;
-import com.ruoyi.ss.account.domain.SmAccountVo;
+import com.ruoyi.ss.account.domain.SmAccountVO;
 import com.ruoyi.ss.account.domain.enums.AccountType;
 
 import java.util.List;
@@ -23,7 +23,7 @@ public interface ISmAccountService
      * @param accountId 用户账户主键
      * @return 用户账户
      */
-    public SmAccount selectSmAccountByAccountId(Long accountId);
+    public SmAccountVO selectSmAccountByAccountId(Long accountId);
 
     /**
      * 查询用户账户列表
@@ -31,7 +31,7 @@ public interface ISmAccountService
      * @param smAccount 用户账户
      * @return 用户账户集合
      */
-    public List<SmAccountVo> selectSmAccountList(SmAccountQuery smAccount);
+    public List<SmAccountVO> selectSmAccountList(SmAccountQuery smAccount);
 
     /**
      * 新增用户账户
@@ -74,7 +74,7 @@ public interface ISmAccountService
     /**
      * 查询列表并分组
      */
-    Map<String, List<SmAccountVo>> selectSmAccountGroup(SmAccountQuery dto);
+    Map<String, List<SmAccountVO>> selectSmAccountGroup(SmAccountQuery dto);
 
     /**
      * 判断这个账号是不是用户的
@@ -87,13 +87,13 @@ public interface ISmAccountService
      * 查询用户的微信账户
      * @param userId 用户id
      */
-    SmAccountVo selectUserWxAccount(Long userId);
+    SmAccountVO selectUserWxAccount(Long userId);
 
     /**
      * 查询用户的支付宝账户
      * @param userId 用户id
      */
-    SmAccountVo selectUseAliAccount(Long userId);
+    SmAccountVO selectUseAliAccount(Long userId);
 
     /**
      * 设置默认账户
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/SmAccountServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/SmAccountServiceImpl.java
index 5372b876..c2c3a64d 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/SmAccountServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/account/service/impl/SmAccountServiceImpl.java
@@ -7,7 +7,7 @@ import com.ruoyi.common.valid.bank.BankValidUtils;
 import com.ruoyi.ss.account.domain.SmAccount;
 import com.ruoyi.ss.account.domain.SmAccountBO;
 import com.ruoyi.ss.account.domain.SmAccountQuery;
-import com.ruoyi.ss.account.domain.SmAccountVo;
+import com.ruoyi.ss.account.domain.SmAccountVO;
 import com.ruoyi.ss.account.domain.enums.AccountType;
 import com.ruoyi.ss.account.mapper.SmAccountMapper;
 import com.ruoyi.ss.account.service.ISmAccountService;
@@ -37,9 +37,9 @@ public class SmAccountServiceImpl implements ISmAccountService
      * @return 用户账户
      */
     @Override
-    public SmAccountVo selectSmAccountByAccountId(Long accountId)
+    public SmAccountVO selectSmAccountByAccountId(Long accountId)
     {
-        SmAccountVo account = smAccountMapper.selectSmAccountByAccountId(accountId);
+        SmAccountVO account = smAccountMapper.selectSmAccountByAccountId(accountId);
         account.desensitization();
         return account;
     }
@@ -51,11 +51,9 @@ public class SmAccountServiceImpl implements ISmAccountService
      * @return 用户账户
      */
     @Override
-    public List<SmAccountVo> selectSmAccountList(SmAccountQuery dto)
+    public List<SmAccountVO> selectSmAccountList(SmAccountQuery dto)
     {
-        List<SmAccountVo> list = smAccountMapper.selectSmAccountList(dto);
-        list.forEach(SmAccount::desensitization);
-        return list;
+        return smAccountMapper.selectSmAccountList(dto);
     }
 
     /**
@@ -123,12 +121,12 @@ public class SmAccountServiceImpl implements ISmAccountService
     }
 
     @Override
-    public Map<String, List<SmAccountVo>> selectSmAccountGroup(SmAccountQuery dto) {
-        List<SmAccountVo> list = this.selectSmAccountList(dto);
+    public Map<String, List<SmAccountVO>> selectSmAccountGroup(SmAccountQuery dto) {
+        List<SmAccountVO> list = this.selectSmAccountList(dto);
         if (CollectionUtils.isEmpty(list)) {
             return Collections.emptyMap();
         }
-        Map<String, List<SmAccountVo>> map = new HashMap<>();
+        Map<String, List<SmAccountVO>> map = new HashMap<>();
         map.put(AccountType.BANK_CARD.name(), list.stream()
                 .filter(item -> Objects.equals(AccountType.BANK_CARD.getType(), item.getAccountType())).collect(Collectors.toList()));
         map.put(AccountType.WECHAT.name(), list.stream()
@@ -149,19 +147,19 @@ public class SmAccountServiceImpl implements ISmAccountService
         if (userId == null || accountNo == null) {
             return false;
         }
-        SmAccountVo account = smAccountMapper.selectByAccountNo(accountNo, accountType.getType());
+        SmAccountVO account = smAccountMapper.selectByAccountNo(accountNo, accountType.getType());
         return account != null && account.getUserId() != null && account.getUserId().equals(userId);
     }
 
     @Override
-    public SmAccountVo selectUserWxAccount(Long userId) {
+    public SmAccountVO selectUserWxAccount(Long userId) {
         if (userId == null) {
             return null;
         }
         SmAccountQuery dto = new SmAccountQuery();
         dto.setUserId(userId);
         dto.setAccountType(AccountType.WECHAT.getType());
-        List<SmAccountVo> list = smAccountMapper.selectSmAccountList(dto);
+        List<SmAccountVO> list = smAccountMapper.selectSmAccountList(dto);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
@@ -169,14 +167,14 @@ public class SmAccountServiceImpl implements ISmAccountService
     }
 
     @Override
-    public SmAccountVo selectUseAliAccount(Long userId) {
+    public SmAccountVO selectUseAliAccount(Long userId) {
         if (userId == null) {
             return null;
         }
         SmAccountQuery dto = new SmAccountQuery();
         dto.setUserId(userId);
         dto.setAccountType(AccountType.ALIPAY.getType());
-        List<SmAccountVo> list = smAccountMapper.selectSmAccountList(dto);
+        List<SmAccountVO> list = smAccountMapper.selectSmAccountList(dto);
         if (CollectionUtils.isEmpty(list)) {
             return null;
         }
@@ -185,7 +183,7 @@ public class SmAccountServiceImpl implements ISmAccountService
 
     @Override
     public boolean setDefault(Long userId, Long accountId) {
-        SmAccountVo account = smAccountMapper.selectSmAccountByAccountId(accountId);
+        SmAccountVO account = smAccountMapper.selectSmAccountByAccountId(accountId);
         ServiceUtil.assertion(account == null, "账户不存在");
         ServiceUtil.assertion(!Objects.equals(account.getUserId(), userId), "该账户不是本用户的账户");
 
@@ -198,9 +196,9 @@ public class SmAccountServiceImpl implements ISmAccountService
         SmAccountQuery dto = new SmAccountQuery();
         dto.setAccountNo(data.getAccountNo());
         dto.setUserId(data.getUserId());
-        List<SmAccountVo> repeats = smAccountMapper.selectSmAccountList(dto);
+        List<SmAccountVO> repeats = smAccountMapper.selectSmAccountList(dto);
         if (!CollectionUtils.isEmpty(repeats)) {
-            for (SmAccountVo repeat : repeats) {
+            for (SmAccountVO repeat : repeats) {
                 if (!Objects.equals(repeat.getAccountId(), data.getAccountId())) {
                     return true;
                 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
index 6ea3ae05..ba4087c5 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
@@ -6,7 +6,7 @@ import com.ruoyi.common.core.redis.enums.RedisLockKey;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.common.utils.collection.CollectionUtils;
-import com.ruoyi.ss.account.domain.SmAccountVo;
+import com.ruoyi.ss.account.domain.SmAccountVO;
 import com.ruoyi.ss.account.service.ISmAccountService;
 import com.ruoyi.ss.channel.domain.SmChannel;
 import com.ruoyi.ss.channel.service.ISmChannelService;
@@ -397,11 +397,11 @@ public class TransactionBillServiceImpl implements TransactionBillService {
                 ServiceUtil.assertion(!smAccountService.validateUserHasAccount(userId, accountNo, payType.getAccountType()),
                         "该提现账号未绑定，请重新选择");
             } else if (TransactionBillPayType.WECHAT.equals(payType)){
-                SmAccountVo wxAccount = smAccountService.selectUserWxAccount(userId);
+                SmAccountVO wxAccount = smAccountService.selectUserWxAccount(userId);
                 ServiceUtil.assertion(wxAccount == null, "用户不存在微信账户");
                 accountNo = wxAccount.getAccountNo();
             } else if (TransactionBillPayType.ALI.equals(payType)) {
-                SmAccountVo wxAccount = smAccountService.selectUseAliAccount(userId);
+                SmAccountVO wxAccount = smAccountService.selectUseAliAccount(userId);
                 ServiceUtil.assertion(wxAccount == null, "用户不存在支付宝账户");
                 accountNo = wxAccount.getAccountNo();
             }
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java
index 022b12d5..64a7abf3 100644
--- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/app/AppAccountController.java
@@ -25,9 +25,6 @@ public class AppAccountController extends BaseController {
     @Autowired
     private ISmAccountService accountService;
 
-    @Autowired
-    private IVerificationCodeService verificationCodeService;
-
     @MchRequired
     @ApiOperation("添加收款账户")
     @PostMapping
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/AccountController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/AccountController.java
new file mode 100644
index 00000000..a7ff27c7
--- /dev/null
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/AccountController.java
@@ -0,0 +1,107 @@
+package com.ruoyi.web.controller.ss;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.ss.account.domain.SmAccount;
+import com.ruoyi.ss.account.domain.SmAccountVO;
+import com.ruoyi.ss.account.domain.SmAccountQuery;
+import com.ruoyi.ss.account.service.ISmAccountService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户账户Controller
+ *
+ * @author ruoyi
+ * @date 2024-07-27
+ */
+@RestController
+@RequestMapping("/ss/account")
+public class AccountController extends BaseController
+{
+    @Autowired
+    private ISmAccountService smAccountService;
+
+    /**
+     * 查询用户账户列表
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SmAccountQuery query)
+    {
+        startPage();
+        startOrderBy();
+        List<SmAccountVO> list = smAccountService.selectSmAccountList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户账户列表
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:export')")
+    @Log(title = "用户账户", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, SmAccountQuery query)
+    {
+        List<SmAccountVO> list = smAccountService.selectSmAccountList(query);
+        ExcelUtil<SmAccountVO> util = new ExcelUtil<SmAccountVO>(SmAccountVO.class);
+        util.exportExcel(response, list, "用户账户数据");
+    }
+
+    /**
+     * 获取用户账户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:query')")
+    @GetMapping(value = "/{accountId}")
+    public AjaxResult getInfo(@PathVariable("accountId") Long accountId)
+    {
+        return success(smAccountService.selectSmAccountByAccountId(accountId));
+    }
+
+    /**
+     * 新增用户账户
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:add')")
+    @Log(title = "用户账户", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SmAccount smAccount)
+    {
+        return toAjax(smAccountService.insertSmAccount(smAccount));
+    }
+
+    /**
+     * 修改用户账户
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:edit')")
+    @Log(title = "用户账户", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SmAccount smAccount)
+    {
+        return toAjax(smAccountService.updateSmAccount(smAccount));
+    }
+
+    /**
+     * 删除用户账户
+     */
+    @PreAuthorize("@ss.hasPermi('ss:account:remove')")
+    @Log(title = "用户账户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{accountIds}")
+    public AjaxResult remove(@PathVariable Long[] accountIds)
+    {
+        return toAjax(smAccountService.deleteSmAccountByAccountIds(accountIds));
+    }
+}