diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/controller/TzSharedAccountController.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/controller/TzSharedAccountController.java new file mode 100644 index 0000000..0d4b176 --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/controller/TzSharedAccountController.java @@ -0,0 +1,105 @@ +package org.dromara.work.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.work.domain.vo.TzSharedAccountVo; +import org.dromara.work.domain.bo.TzSharedAccountBo; +import org.dromara.work.service.ITzSharedAccountService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 共享账号 + * + * @author Maosw + * @date 2025-05-06 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/work/sharedAccount") +public class TzSharedAccountController extends BaseController { + + private final ITzSharedAccountService tzSharedAccountService; + + /** + * 查询共享账号列表 + */ + @SaCheckPermission("work:sharedAccount:list") + @GetMapping("/list") + public TableDataInfo list(TzSharedAccountBo bo, PageQuery pageQuery) { + return tzSharedAccountService.queryPageList(bo, pageQuery); + } + + /** + * 导出共享账号列表 + */ + @SaCheckPermission("work:sharedAccount:export") + @Log(title = "共享账号", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TzSharedAccountBo bo, HttpServletResponse response) { + List list = tzSharedAccountService.queryList(bo); + ExcelUtil.exportExcel(list, "共享账号", TzSharedAccountVo.class, response); + } + + /** + * 获取共享账号详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("work:sharedAccount:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tzSharedAccountService.queryById(id)); + } + + /** + * 新增共享账号 + */ + @SaCheckPermission("work:sharedAccount:add") + @Log(title = "共享账号", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TzSharedAccountBo bo) { + return toAjax(tzSharedAccountService.insertByBo(bo)); + } + + /** + * 修改共享账号 + */ + @SaCheckPermission("work:sharedAccount:edit") + @Log(title = "共享账号", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TzSharedAccountBo bo) { + return toAjax(tzSharedAccountService.updateByBo(bo)); + } + + /** + * 删除共享账号 + * + * @param ids 主键串 + */ + @SaCheckPermission("work:sharedAccount:remove") + @Log(title = "共享账号", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tzSharedAccountService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TzSharedAccount.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TzSharedAccount.java new file mode 100644 index 0000000..5e30ddb --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TzSharedAccount.java @@ -0,0 +1,88 @@ +package org.dromara.work.domain; + +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.io.Serial; + +/** + * 共享账号对象 tz_shared_account + * + * @author Maosw + * @date 2025-05-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("tz_shared_account") +public class TzSharedAccount extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private Long id; + + /** + * 使用者ID + */ + private Long userId; + + /** + * 使用者姓名 + */ + private String userName; + + /** + * 共享账号编号 + */ + private String code; + + /** + * 登录账号 + */ + private String loginName; + + /** + * 登录密码 + */ + private String loginPwd; + + /** + * 状态:0-未使用,1-使用中 + */ + private Integer status; + + /** + * 开始使用时间 + */ + private Date startTime; + + /** + * 预期结束时间 + */ + private Date endTime; + + /** + * 绑定人姓名 + */ + private String bindName; + + /** + * 绑定人手机号码 + */ + private String bindPhone; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpClientBo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpClientBo.java index 12fb11c..c9b4077 100644 --- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpClientBo.java +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpClientBo.java @@ -58,7 +58,6 @@ public class TpClientBo extends BaseEntity { /** * 电话号码 */ - @NotBlank(message = "电话号码不能为空", groups = { AddGroup.class, EditGroup.class }) private String phone; /** diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TzSharedAccountBo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TzSharedAccountBo.java new file mode 100644 index 0000000..735168f --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TzSharedAccountBo.java @@ -0,0 +1,90 @@ +package org.dromara.work.domain.bo; + +import org.dromara.work.domain.TzSharedAccount; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 共享账号业务对象 tz_shared_account + * + * @author Maosw + * @date 2025-05-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TzSharedAccount.class, reverseConvertGenerate = false) +public class TzSharedAccountBo extends BaseEntity { + + /** + * 主键ID + */ + @NotNull(message = "主键ID不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 使用者ID + */ + private Long userId; + + /** + * 使用者姓名 + */ + private String userName; + + /** + * 共享账号编号 + */ + private String code; + + /** + * 登录账号 + */ + @NotBlank(message = "登录账号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String loginName; + + /** + * 登录密码 + */ + @NotBlank(message = "登录密码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String loginPwd; + + /** + * 状态:0-未使用,1-使用中 + */ + @NotNull(message = "状态:0-未使用,1-使用中不能为空", groups = { AddGroup.class, EditGroup.class }) + private Integer status; + + /** + * 开始使用时间 + */ + private Date startTime; + + /** + * 预期结束时间 + */ + private Date endTime; + + /** + * 绑定人姓名 + */ + private String bindName; + + /** + * 绑定人手机号码 + */ + private String bindPhone; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TzSharedAccountVo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TzSharedAccountVo.java new file mode 100644 index 0000000..fabb494 --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TzSharedAccountVo.java @@ -0,0 +1,112 @@ +package org.dromara.work.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.work.domain.TzSharedAccount; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 共享账号视图对象 tz_shared_account + * + * @author Maosw + * @date 2025-05-06 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TzSharedAccount.class) +public class TzSharedAccountVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long id; + + /** + * 使用者ID + */ + @ExcelProperty(value = "使用者ID") + private Long userId; + + /** + * 使用者姓名 + */ + @ExcelProperty(value = "使用者姓名") + private String userName; + + /** + * 共享账号编号 + */ + @ExcelProperty(value = "共享账号编号") + private String code; + + /** + * 登录账号 + */ + @ExcelProperty(value = "登录账号") + private String loginName; + + /** + * 登录密码 + */ + @ExcelProperty(value = "登录密码") + private String loginPwd; + + /** + * 状态:0-未使用,1-使用中 + */ + @ExcelProperty(value = "状态:0-未使用,1-使用中") + private Integer status; + + /** + * 开始使用时间 + */ + @ExcelProperty(value = "开始使用时间") + private Date startTime; + + /** + * 预期结束时间 + */ + @ExcelProperty(value = "预期结束时间") + private Date endTime; + + /** + * 绑定人姓名 + */ + @ExcelProperty(value = "绑定人姓名") + private String bindName; + + /** + * 绑定人手机号码 + */ + @ExcelProperty(value = "绑定人手机号码") + private String bindPhone; + + /** + * 创建时间 + */ + @ExcelProperty(value = "创建时间") + private Date createTime; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/mapper/TzSharedAccountMapper.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/mapper/TzSharedAccountMapper.java new file mode 100644 index 0000000..ed4eec7 --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/mapper/TzSharedAccountMapper.java @@ -0,0 +1,15 @@ +package org.dromara.work.mapper; + +import org.dromara.work.domain.TzSharedAccount; +import org.dromara.work.domain.vo.TzSharedAccountVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 共享账号Mapper接口 + * + * @author Maosw + * @date 2025-05-06 + */ +public interface TzSharedAccountMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITzSharedAccountService.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITzSharedAccountService.java new file mode 100644 index 0000000..46e0b4a --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITzSharedAccountService.java @@ -0,0 +1,68 @@ +package org.dromara.work.service; + +import org.dromara.work.domain.vo.TzSharedAccountVo; +import org.dromara.work.domain.bo.TzSharedAccountBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 共享账号Service接口 + * + * @author Maosw + * @date 2025-05-06 + */ +public interface ITzSharedAccountService { + + /** + * 查询共享账号 + * + * @param id 主键 + * @return 共享账号 + */ + TzSharedAccountVo queryById(Long id); + + /** + * 分页查询共享账号列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 共享账号分页列表 + */ + TableDataInfo queryPageList(TzSharedAccountBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的共享账号列表 + * + * @param bo 查询条件 + * @return 共享账号列表 + */ + List queryList(TzSharedAccountBo bo); + + /** + * 新增共享账号 + * + * @param bo 共享账号 + * @return 是否新增成功 + */ + Boolean insertByBo(TzSharedAccountBo bo); + + /** + * 修改共享账号 + * + * @param bo 共享账号 + * @return 是否修改成功 + */ + Boolean updateByBo(TzSharedAccountBo bo); + + /** + * 校验并批量删除共享账号信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TzSharedAccountServiceImpl.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TzSharedAccountServiceImpl.java new file mode 100644 index 0000000..17ebf2f --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TzSharedAccountServiceImpl.java @@ -0,0 +1,142 @@ +package org.dromara.work.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.work.domain.bo.TzSharedAccountBo; +import org.dromara.work.domain.vo.TzSharedAccountVo; +import org.dromara.work.domain.TzSharedAccount; +import org.dromara.work.mapper.TzSharedAccountMapper; +import org.dromara.work.service.ITzSharedAccountService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 共享账号Service业务层处理 + * + * @author Maosw + * @date 2025-05-06 + */ +@RequiredArgsConstructor +@Service +public class TzSharedAccountServiceImpl implements ITzSharedAccountService { + + private final TzSharedAccountMapper baseMapper; + + /** + * 查询共享账号 + * + * @param id 主键 + * @return 共享账号 + */ + @Override + public TzSharedAccountVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询共享账号列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 共享账号分页列表 + */ + @Override + public TableDataInfo queryPageList(TzSharedAccountBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的共享账号列表 + * + * @param bo 查询条件 + * @return 共享账号列表 + */ + @Override + public List queryList(TzSharedAccountBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TzSharedAccountBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.orderByAsc(TzSharedAccount::getId); + lqw.eq(bo.getUserId() != null, TzSharedAccount::getUserId, bo.getUserId()); + lqw.like(StringUtils.isNotBlank(bo.getUserName()), TzSharedAccount::getUserName, bo.getUserName()); + lqw.eq(StringUtils.isNotBlank(bo.getCode()), TzSharedAccount::getCode, bo.getCode()); + lqw.like(StringUtils.isNotBlank(bo.getLoginName()), TzSharedAccount::getLoginName, bo.getLoginName()); + lqw.eq(bo.getStatus() != null, TzSharedAccount::getStatus, bo.getStatus()); + lqw.between(params.get("beginStartTime") != null && params.get("endStartTime") != null, + TzSharedAccount::getStartTime ,params.get("beginStartTime"), params.get("endStartTime")); + lqw.between(params.get("beginEndTime") != null && params.get("endEndTime") != null, + TzSharedAccount::getEndTime ,params.get("beginEndTime"), params.get("endEndTime")); + lqw.like(StringUtils.isNotBlank(bo.getBindName()), TzSharedAccount::getBindName, bo.getBindName()); + lqw.eq(StringUtils.isNotBlank(bo.getBindPhone()), TzSharedAccount::getBindPhone, bo.getBindPhone()); + lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, + TzSharedAccount::getCreateTime ,params.get("beginCreateTime"), params.get("endCreateTime")); + return lqw; + } + + /** + * 新增共享账号 + * + * @param bo 共享账号 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TzSharedAccountBo bo) { + TzSharedAccount add = MapstructUtils.convert(bo, TzSharedAccount.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改共享账号 + * + * @param bo 共享账号 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TzSharedAccountBo bo) { + TzSharedAccount update = MapstructUtils.convert(bo, TzSharedAccount.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TzSharedAccount entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除共享账号信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +} diff --git a/ruoyi-modules/ruoyi-work/src/main/resources/mapper/work/TzSharedAccountMapper.xml b/ruoyi-modules/ruoyi-work/src/main/resources/mapper/work/TzSharedAccountMapper.xml new file mode 100644 index 0000000..9f6d658 --- /dev/null +++ b/ruoyi-modules/ruoyi-work/src/main/resources/mapper/work/TzSharedAccountMapper.xml @@ -0,0 +1,7 @@ + + + + +