diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java index f67b62856..c09767af7 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleController.java @@ -1,7 +1,10 @@ package com.czg.controller.admin; import com.czg.account.dto.PageDTO; -import com.czg.account.dto.role.*; +import com.czg.account.dto.role.RoleAddDTO; +import com.czg.account.dto.role.RoleEditDTO; +import com.czg.account.dto.role.RolePermissionDTO; +import com.czg.account.dto.role.RoleRemoveDTO; import com.czg.account.entity.SysRole; import com.czg.account.service.SysRoleService; import com.czg.annotation.SaAdminCheckPermission; @@ -99,13 +102,4 @@ public class RoleController { } return CzgResult.success(roleService.removeById(roleRemoveDTO.id())); } - - /** - * 根据模板保存角色 - */ - @PostMapping("/saveByTemplate") - public CzgResult saveByTemplate(@Validated @RequestBody RoleSaveTemplateDTO dto) { - return CzgResult.success(roleService.saveByTemplate(StpKit.USER.getShopId(), dto)); - } - } diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java deleted file mode 100644 index 3d9d52051..000000000 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/RoleTemplateController.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.czg.controller.admin; - -import com.czg.account.dto.RoleTemplateDTO; -import com.czg.market.entity.SysRoleTemplate; -import com.czg.market.service.SysRoleTemplateService; -import com.czg.resp.CzgResult; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 角色模板 - */ -@RestController -@RequestMapping("/admin/roleTemplate") -public class RoleTemplateController { - @Resource - private SysRoleTemplateService roleTemplateService; - - /** - * 添加 - */ - @PostMapping - public CzgResult save(@RequestBody @Validated RoleTemplateDTO dto) { - return CzgResult.success(roleTemplateService.saveInfo(dto)); - } - - /** - * 删除 - */ - @DeleteMapping - public CzgResult delete(@RequestParam Long id) { - return CzgResult.success(roleTemplateService.removeById(id)); - } - - /** - * 编辑 - */ - @PutMapping - public CzgResult edit(@RequestBody @Validated RoleTemplateDTO dto) { - return CzgResult.success(roleTemplateService.editInfo(dto)); - } - - /** - * 列表 - */ - @GetMapping("/list") - public CzgResult> list() { - return CzgResult.success(roleTemplateService.listInfo()); - } -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java deleted file mode 100644 index 5c3ddf070..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/RoleTemplateDTO.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.czg.account.dto; - -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -import java.time.LocalDateTime; -import java.util.List; - -@Data -public class RoleTemplateDTO { - private Integer id; - - /** - * 模板名称 - */ - @NotBlank(message = "模板名称不能为空") - private String name; - - /** - * 是否启用 - */ - private Integer isEnable; - - /** - * 排序 - */ - private Integer sort; - - /** - * 角色id列表 - */ - private Integer roleId; - /** - * 上级id - */ - private Integer pid; -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/role/RoleSaveTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/role/RoleSaveTemplateDTO.java deleted file mode 100644 index 26635fa4e..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/role/RoleSaveTemplateDTO.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.czg.account.dto.role; - -import jakarta.validation.constraints.NotBlank; - -import java.util.List; - -public record RoleSaveTemplateDTO( - /* 角色名称 */ - @NotBlank - List roleTemplateIdList -) { -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java index 15e94ea69..ac486b313 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/SysRoleService.java @@ -4,7 +4,6 @@ import com.czg.account.dto.PageDTO; import com.czg.account.dto.role.RoleAddDTO; import com.czg.account.dto.role.RoleEditDTO; import com.czg.account.dto.role.RolePermissionDTO; -import com.czg.account.dto.role.RoleSaveTemplateDTO; import com.czg.account.entity.SysRole; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -30,7 +29,4 @@ public interface SysRoleService extends IService { List getRoleMenu(long loginIdAsLong, Integer id, Integer type); Boolean editPermission(long userId, RolePermissionDTO rolePermissionDTO); - - Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto); - } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SysRoleTemplateDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SysRoleTemplateDTO.java deleted file mode 100644 index d21e32140..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SysRoleTemplateDTO.java +++ /dev/null @@ -1,67 +0,0 @@ - -package com.czg.market.dto; - -import java.io.Serializable; -import java.time.LocalDateTime; -import com.alibaba.fastjson2.annotation.JSONField; -import lombok.experimental.Accessors; -import java.io.Serial; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 角色模板 实体类。 - * - * @author zs - * @since 2025-12-08 - */ -@Data -@NoArgsConstructor -@AllArgsConstructor -@Accessors(chain = true) -public class SysRoleTemplateDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - private Integer id; - - /** - * 模板名称 - */ - private String name; - - /** - * 是否启用 - */ - private Integer isEnable; - - /** - * 排序 - */ - private Integer sort; - - /** - * 操作人 - */ - private String opUser; - - /** - * 创建人 - */ - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - - /** - * 修改时间 - */ - @JSONField(format = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime updateTime; - - /** - * 角色id列表 - */ - private String roleIdList; - -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java deleted file mode 100644 index 44fc947b4..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SysRoleTemplate.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.czg.market.entity; - -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import java.io.Serializable; -import java.time.LocalDateTime; - -import java.io.Serial; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 角色模板 实体类。 - * - * @author zs - * @since 2025-12-08 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Table("sys_role_template") -public class SysRoleTemplate implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @Id(keyType = KeyType.Auto) - private Integer id; - - /** - * 模板名称 - */ - private String name; - - /** - * 是否启用 - */ - private Integer isEnable; - - /** - * 排序 - */ - private Integer sort; - - /** - * 操作人 - */ - private String opUser; - private Long opSysUserId; - - /** - * 创建人 - */ - @Column(onInsertValue = "now()") - private LocalDateTime createTime; - - /** - * 修改时间 - */ - @Column(onInsertValue = "now()", onUpdateValue = "now()") - private LocalDateTime updateTime; - - /** - * 角色id列表 - */ - private String roleId; - - /** - * 上级id - */ - private Integer pid; - -} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java deleted file mode 100644 index 901d03938..000000000 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SysRoleTemplateService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.czg.market.service; - -import com.czg.account.dto.RoleTemplateDTO; -import com.mybatisflex.core.service.IService; -import com.czg.market.entity.SysRoleTemplate; - -import java.util.List; - -/** - * 角色模板 服务层。 - * - * @author zs - * @since 2025-12-08 - */ -public interface SysRoleTemplateService extends IService { - - Boolean saveInfo(RoleTemplateDTO dto); - - List listInfo(); - - Boolean editInfo(RoleTemplateDTO dto); -} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java index 8ab1e5cbe..2154d1439 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/SysRoleServiceImpl.java @@ -9,22 +9,18 @@ import com.czg.account.dto.menu.MenuApiInfoItemDTO; import com.czg.account.dto.role.RoleAddDTO; import com.czg.account.dto.role.RoleEditDTO; import com.czg.account.dto.role.RolePermissionDTO; -import com.czg.account.dto.role.RoleSaveTemplateDTO; import com.czg.account.entity.*; import com.czg.account.service.CashMenuService; import com.czg.account.service.SysMenuService; import com.czg.account.service.SysRoleService; import com.czg.account.service.SysRolesMenusService; import com.czg.exception.CzgException; -import com.czg.market.entity.SysRoleTemplate; -import com.czg.market.service.SysRoleTemplateService; import com.czg.sa.StpKit; import com.czg.service.account.mapper.SysRoleMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,9 +43,6 @@ public class SysRoleServiceImpl extends ServiceImpl impl private SysRolesMenusService sysRolesMenusService; @Resource private CashMenuService cashMenuService; - @Resource - @Lazy - private SysRoleTemplateService roleTemplateService; @Override public List getByUserId(Long id) { @@ -244,18 +237,6 @@ public class SysRoleServiceImpl extends ServiceImpl impl throw new CzgException("保存失败"); } - @Override - public Boolean saveByTemplate(long shopId, RoleSaveTemplateDTO dto) { - roleTemplateService.list(new QueryWrapper().in(SysRoleTemplate::getId, dto.roleTemplateIdList())).forEach(item -> { - SysRole role = getById(item.getRoleId()); - role.setShopId(shopId); - role.setCreateTime(null); - role.setId(null); - save(role); - }); - return true; - } - @Override @Transactional(rollbackFor = Exception.class) public Boolean edit(RoleEditDTO roleEditDTO) { diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/SysRoleTemplateMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/SysRoleTemplateMapper.java deleted file mode 100644 index 6b954b139..000000000 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/SysRoleTemplateMapper.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.czg.service.market.mapper; - -import com.mybatisflex.core.BaseMapper; -import com.czg.market.entity.SysRoleTemplate; - -/** - * 角色模板 映射层。 - * - * @author zs - * @since 2025-12-08 - */ -public interface SysRoleTemplateMapper extends BaseMapper { - -} diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SysRoleTemplateServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SysRoleTemplateServiceImpl.java deleted file mode 100644 index b1340152f..000000000 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SysRoleTemplateServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.czg.service.market.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import com.czg.account.dto.RoleTemplateDTO; -import com.czg.account.service.SysRoleService; -import com.czg.sa.StpKit; -import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.entity.SysRoleTemplate; -import com.czg.market.service.SysRoleTemplateService; -import com.czg.service.market.mapper.SysRoleTemplateMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 角色模板 服务层实现。 - * - * @author zs - * @since 2025-12-08 - */ -@Service -public class SysRoleTemplateServiceImpl extends ServiceImpl implements SysRoleTemplateService{ - @Resource - private SysRoleService roleService; - - @Override - public Boolean saveInfo(RoleTemplateDTO dto) { - SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class, "roleIdList"); - roleTemplate.setOpUser(StpKit.USER.getAccount()); - roleTemplate.setOpSysUserId(StpKit.USER.getLoginIdAsLong()); - return save(roleTemplate); - } - - @Override - public List listInfo() { - return list(); - } - - @Override - public Boolean editInfo(RoleTemplateDTO dto) { - SysRoleTemplate roleTemplate = BeanUtil.copyProperties(dto, SysRoleTemplate.class); - roleTemplate.setOpUser(StpKit.USER.getAccount()); - roleTemplate.setOpSysUserId(StpKit.USER.getLoginIdAsLong()); - return updateById(roleTemplate); - } -} diff --git a/cash-service/market-service/src/main/resources/mapper/SysRoleTemplateMapper.xml b/cash-service/market-service/src/main/resources/mapper/SysRoleTemplateMapper.xml deleted file mode 100644 index 9f76411e3..000000000 --- a/cash-service/market-service/src/main/resources/mapper/SysRoleTemplateMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - -