diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/SyncDataController.java b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java similarity index 95% rename from ruoyi-business/src/main/java/com/ruoyi/business/controller/SyncDataController.java rename to ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java index 4baeab013..a852a5541 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/SyncDataController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/SyncDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.business.controller; +package com.ruoyi.business.ajax; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; @@ -17,7 +17,7 @@ import javax.annotation.Resource; import java.io.IOException; @RestController -@RequestMapping("/api/data") +@RequestMapping("/ajax/data") public class SyncDataController extends BaseController { @Resource diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizAccount.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizAccount.java new file mode 100644 index 000000000..147d0d3ce --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizAccount.java @@ -0,0 +1,84 @@ +package com.ruoyi.business.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 会员账户对象 biz_account + * + * @author ruoyi + * @date 2020-09-14 + */ +public class BizAccount extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 会员账户ID */ + private Long id; + + /** 会员ID */ + @Excel(name = "会员ID") + private Long memberId; + + /** 账户类型:0-福豆余额,1-个人福豆,2-团队福豆,3-专项福豆,4-福豆田 */ + @Excel(name = "账户类型:0-福豆余额,1-个人福豆,2-团队福豆,3-专项福豆,4-福豆田") + private Integer accountType; + + /** 账户金额 */ + @Excel(name = "账户金额") + private BigDecimal amount; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setAccountType(Integer accountType) + { + this.accountType = accountType; + } + + public Integer getAccountType() + { + return accountType; + } + public void setAmount(BigDecimal amount) + { + this.amount = amount; + } + + public BigDecimal getAmount() + { + return amount; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("accountType", getAccountType()) + .append("amount", getAmount()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizAccountMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizAccountMapper.java new file mode 100644 index 000000000..068622160 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizAccountMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.business.mapper; + +import com.ruoyi.business.domain.BizAccount; + +import java.util.List; + +/** + * 会员账户Mapper接口 + * + * @author ruoyi + * @date 2020-09-14 + */ +public interface BizAccountMapper +{ + /** + * 查询会员账户 + * + * @param id 会员账户ID + * @return 会员账户 + */ + public BizAccount selectBizAccountById(Long id); + + /** + * 查询会员账户列表 + * + * @param bizAccount 会员账户 + * @return 会员账户集合 + */ + public List selectBizAccountList(BizAccount bizAccount); + + /** + * 新增会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + public int insertBizAccount(BizAccount bizAccount); + + /** + * 修改会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + public int updateBizAccount(BizAccount bizAccount); + + /** + * 删除会员账户 + * + * @param id 会员账户ID + * @return 结果 + */ + public int deleteBizAccountById(Long id); + + /** + * 批量删除会员账户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBizAccountByIds(String[] ids); +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizAccountService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizAccountService.java new file mode 100644 index 000000000..803334f1b --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizAccountService.java @@ -0,0 +1,62 @@ +package com.ruoyi.business.service; + +import com.ruoyi.business.domain.BizAccount; + +import java.util.List; + +/** + * 会员账户Service接口 + * + * @author ruoyi + * @date 2020-09-14 + */ +public interface IBizAccountService +{ + /** + * 查询会员账户 + * + * @param id 会员账户ID + * @return 会员账户 + */ + public BizAccount selectBizAccountById(Long id); + + /** + * 查询会员账户列表 + * + * @param bizAccount 会员账户 + * @return 会员账户集合 + */ + public List selectBizAccountList(BizAccount bizAccount); + + /** + * 新增会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + public int insertBizAccount(BizAccount bizAccount); + + /** + * 修改会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + public int updateBizAccount(BizAccount bizAccount); + + /** + * 批量删除会员账户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBizAccountByIds(String ids); + + /** + * 删除会员账户信息 + * + * @param id 会员账户ID + * @return 结果 + */ + public int deleteBizAccountById(Long id); +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizAccountServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizAccountServiceImpl.java new file mode 100644 index 000000000..8a5a908a7 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizAccountServiceImpl.java @@ -0,0 +1,98 @@ +package com.ruoyi.business.service.impl; + +import java.util.List; + +import com.ruoyi.business.domain.BizAccount; +import com.ruoyi.business.mapper.BizAccountMapper; +import com.ruoyi.business.service.IBizAccountService; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.common.core.text.Convert; + +/** + * 会员账户Service业务层处理 + * + * @author ruoyi + * @date 2020-09-14 + */ +@Service +public class BizAccountServiceImpl implements IBizAccountService +{ + @Autowired + private BizAccountMapper bizAccountMapper; + + /** + * 查询会员账户 + * + * @param id 会员账户ID + * @return 会员账户 + */ + @Override + public BizAccount selectBizAccountById(Long id) + { + return bizAccountMapper.selectBizAccountById(id); + } + + /** + * 查询会员账户列表 + * + * @param bizAccount 会员账户 + * @return 会员账户 + */ + @Override + public List selectBizAccountList(BizAccount bizAccount) + { + return bizAccountMapper.selectBizAccountList(bizAccount); + } + + /** + * 新增会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + @Override + public int insertBizAccount(BizAccount bizAccount) + { + bizAccount.setCreateTime(DateUtils.getNowDate()); + return bizAccountMapper.insertBizAccount(bizAccount); + } + + /** + * 修改会员账户 + * + * @param bizAccount 会员账户 + * @return 结果 + */ + @Override + public int updateBizAccount(BizAccount bizAccount) + { + bizAccount.setUpdateTime(DateUtils.getNowDate()); + return bizAccountMapper.updateBizAccount(bizAccount); + } + + /** + * 删除会员账户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBizAccountByIds(String ids) + { + return bizAccountMapper.deleteBizAccountByIds(Convert.toStrArray(ids)); + } + + /** + * 删除会员账户信息 + * + * @param id 会员账户ID + * @return 结果 + */ + @Override + public int deleteBizAccountById(Long id) + { + return bizAccountMapper.deleteBizAccountById(id); + } +} diff --git a/ruoyi-business/src/main/resources/mapper/business/BizAccountMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizAccountMapper.xml new file mode 100644 index 000000000..02b296e8b --- /dev/null +++ b/ruoyi-business/src/main/resources/mapper/business/BizAccountMapper.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + select id, member_id, account_type, amount, create_by, create_time, update_by, update_time from biz_account + + + + + + + + insert into biz_account + + member_id, + account_type, + amount, + create_by, + create_time, + update_by, + update_time, + + + #{memberId}, + #{accountType}, + #{amount}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update biz_account + + member_id = #{memberId}, + account_type = #{accountType}, + amount = #{amount}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from biz_account where id = #{id} + + + + delete from biz_account where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java index aaf720058..a925809e5 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java @@ -275,6 +275,7 @@ public class ShiroConfig filterChainDefinitionMap.put("/docs/**", "anon"); filterChainDefinitionMap.put("/fonts/**", "anon"); filterChainDefinitionMap.put("/img/**", "anon"); + // 前端所有接口放行 filterChainDefinitionMap.put("/ajax/**", "anon"); filterChainDefinitionMap.put("/js/**", "anon"); filterChainDefinitionMap.put("/ruoyi/**", "anon"); @@ -285,8 +286,6 @@ public class ShiroConfig filterChainDefinitionMap.put("/login", "anon,captchaValidate"); // 注册相关 filterChainDefinitionMap.put("/register", "anon,captchaValidate"); - // 前端所有接口放行 - filterChainDefinitionMap.put("/api/**", "anon"); // 系统权限列表 // filterChainDefinitionMap.putAll(SpringUtils.getBean(IMenuService.class).selectPermsAll());