From b67d0a5f9c7804791d6d52c4cd8a26645fb348bb Mon Sep 17 00:00:00 2001 From: zayac Date: Thu, 16 May 2024 16:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=B4=A6=E5=8F=B7AccountType?= =?UTF-8?q?Enum,=E4=BD=BF=E7=94=A8Platform=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD=E8=B4=A6=E5=8F=B7=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E5=B9=B3=E5=8F=B0=20=E4=BF=AE=E5=A4=8D=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system/enums/AccountTypeEnum.java | 33 ------------------- .../admin/system/model/entity/AccountDO.java | 6 ---- .../admin/system/model/entity/PlatformDO.java | 5 ++- .../system/model/query/AccountQuery.java | 13 ++++++-- .../system/model/query/PlatformQuery.java | 4 +-- .../admin/system/model/req/AccountReq.java | 18 +--------- .../admin/system/model/req/PlatformReq.java | 8 ++--- .../system/model/resp/AccountDetailResp.java | 24 +++++++++----- .../admin/system/model/resp/AccountResp.java | 17 +++++++--- .../system/model/resp/PlatformDetailResp.java | 8 ++--- .../admin/system/model/resp/PlatformResp.java | 6 ++-- .../admin/system/service/PlatformService.java | 5 +++ .../service/impl/PlatformServiceImpl.java | 14 ++++++++ .../admin/webapi/common/CommonController.java | 8 +++++ .../webapi/system/AccountController.java | 4 +-- 15 files changed, 83 insertions(+), 90 deletions(-) delete mode 100644 zayac-admin-system/src/main/java/com/zayac/admin/system/enums/AccountTypeEnum.java diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/AccountTypeEnum.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/AccountTypeEnum.java deleted file mode 100644 index 4ac51992..00000000 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/enums/AccountTypeEnum.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.zayac.admin.system.enums; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import top.continew.starter.data.mybatis.plus.base.IBaseEnum; - -@Getter -@RequiredArgsConstructor -public enum AccountTypeEnum implements IBaseEnum { - /** - * 开云 - */ - KY(1, "开云"), - - /** - * 华体会 - */ - HTH(2, "华体会"), - - /** - * 九游 - */ - JY(3, "九游"), - - /** - * 爱体育 - */ - ATY(4, "爱体育"), - ; - - private final Integer value; - private final String description; -} diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/AccountDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/AccountDO.java index d4ea6aa0..9ed1cc60 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/AccountDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/AccountDO.java @@ -3,7 +3,6 @@ package com.zayac.admin.system.model.entity; import java.io.Serial; import com.zayac.admin.common.enums.DisEnableStatusEnum; -import com.zayac.admin.system.enums.AccountTypeEnum; import lombok.Data; import com.baomidou.mybatisplus.annotation.TableName; @@ -38,11 +37,6 @@ public class AccountDO extends BaseDO { */ private String password; - /** - * 账号类型(1:开云,2:华体会,3:九游,4:爱游戏) - */ - private AccountTypeEnum type; - /** * headers */ diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/PlatformDO.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/PlatformDO.java index 304f1b37..32c02bec 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/PlatformDO.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/entity/PlatformDO.java @@ -1,7 +1,6 @@ package com.zayac.admin.system.model.entity; import java.io.Serial; -import java.time.LocalDateTime; import com.zayac.admin.common.enums.DisEnableStatusEnum; import lombok.Data; @@ -25,9 +24,9 @@ public class PlatformDO extends BaseDO { /** - * 平台ID + * 平台代码 */ - private Integer platformId; + private Integer code; /** * 平台名称 diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/AccountQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/AccountQuery.java index 3fc2e708..12867cc9 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/AccountQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/AccountQuery.java @@ -29,7 +29,7 @@ public class AccountQuery implements Serializable { */ @Schema(description = "账号昵称") @Query(type = QueryType.EQ) - private String name; + private String nickname; /** * 账号 @@ -39,11 +39,18 @@ public class AccountQuery implements Serializable { private String username; /** - * 账号类型(0:开云,1:华体会,2:九游,3:爱游戏) + * 所属平台 */ @Schema(description = "账号类型(0:开云,1:华体会,2:九游,3:爱游戏)") @Query(type = QueryType.EQ) - private Boolean type; + private Long platformId; + + /** + * 所属账号 + */ + @Schema(description = "所属用户") + @Query(type = QueryType.EQ) + private Long userId; /** * 状态（1：启用；2：禁用) diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/PlatformQuery.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/PlatformQuery.java index 3cece566..7028fda5 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/PlatformQuery.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/query/PlatformQuery.java @@ -28,9 +28,9 @@ public class PlatformQuery implements Serializable { /** * 平台ID */ - @Schema(description = "平台ID", example = "ky") + @Schema(description = "平台代码", example = "1") @Query(type = QueryType.EQ) - private Integer platformId; + private Integer code; /** * 平台名称 diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/AccountReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/AccountReq.java index 1d364852..4ad80272 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/AccountReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/AccountReq.java @@ -1,17 +1,8 @@ package com.zayac.admin.system.model.req; import java.io.Serial; -import java.time.LocalDateTime; -import cn.crane4j.annotation.AssembleMethod; -import cn.crane4j.annotation.ContainerMethod; -import cn.crane4j.annotation.Mapping; import com.zayac.admin.common.enums.DisEnableStatusEnum; -import com.zayac.admin.system.enums.AccountTypeEnum; -import com.zayac.admin.system.model.resp.DeptResp; -import com.zayac.admin.system.model.resp.PlatformResp; -import com.zayac.admin.system.service.DeptService; -import com.zayac.admin.system.service.PlatformService; import jakarta.validation.constraints.*; import lombok.Data; @@ -58,14 +49,6 @@ public class AccountReq extends BaseReq { @Length(max = 64, message = "密码长度不能超过 {max} 个字符") private String password; - /** - * 账号类型(1:开云,2:华体会,3:九游,4:爱游戏) - */ - @Schema(description = "账号类型(1:开云,2:华体会,3:九游,4:爱游戏)", type = "Integer", allowableValues = {"1", "2", "3", "4"}, example = "1") - @NotNull(message = "账号类型不能为空") - @AssembleMethod(targetType = PlatformService.class, method = @ContainerMethod(bindMethod = "getByPlatformId", resultType = PlatformResp.class), prop="id:platformId") - private AccountTypeEnum type; - /** * 状态（1：启用；2：禁用) */ @@ -82,6 +65,7 @@ public class AccountReq extends BaseReq { /** * 所属平台ID */ + @Schema(description = "所属平台ID", example = "123456789") private Long platformId; } \ No newline at end of file diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/PlatformReq.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/PlatformReq.java index 60765624..ac425b32 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/PlatformReq.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/req/PlatformReq.java @@ -52,11 +52,11 @@ public class PlatformReq extends BaseReq { private String url; /** - * 平台ID + * 平台代码 */ - @Schema(description = "平台ID") - @NotNull(message = "平台ID不能为空") - private Integer platformId; + @Schema(description = "平台代码") + @NotNull(message = "平台代码不能为空") + private Integer code; /** * 状态(1启用,2禁用) diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountDetailResp.java index 8e013dba..25008f67 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountDetailResp.java @@ -3,7 +3,6 @@ package com.zayac.admin.system.model.resp; import java.io.Serial; import com.zayac.admin.common.enums.DisEnableStatusEnum; -import com.zayac.admin.system.enums.AccountTypeEnum; import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; @@ -48,13 +47,6 @@ public class AccountDetailResp extends BaseDetailResp { @ExcelProperty(value = "密码") private String password; - /** - * 账号类型(1:开云,2:华体会,3:九游,4:爱游戏) - */ - @Schema(description = "账号类型(1:开云,2:华体会,3:九游,4:爱游戏)", type = "Integer", allowableValues = {"1", "2", "3", "4"}, example = "1") - @ExcelProperty(value = "账号类型") - private AccountTypeEnum type; - /** * headers */ @@ -76,4 +68,20 @@ public class AccountDetailResp extends BaseDetailResp { @Schema(description = "用户ID") @ExcelProperty(value = "用户ID") private Long userId; + + /** + * 所属用户 + */ + @Schema(description = "所属用户") + @ExcelProperty(value = "所属用户") + private String ownerName; + + + + /** + * 平台名称 + */ + @Schema(description = "平台名称") + @ExcelProperty(value = "平台名称") + private String platformName; } \ No newline at end of file diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountResp.java index f95ca2c7..f7e75ec8 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/AccountResp.java @@ -6,7 +6,7 @@ import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.Mapping; import com.zayac.admin.common.enums.DisEnableStatusEnum; -import com.zayac.admin.system.enums.AccountTypeEnum; +import com.zayac.admin.system.service.PlatformService; import com.zayac.admin.system.service.UserService; import lombok.Data; @@ -49,15 +49,22 @@ public class AccountResp extends BaseResp { private String password; /** - * 平台(0:开云,1:华体会,2:九游,3:爱游戏) + * 平台名称 */ - @Schema(description = "平台(0:开云,1:华体会,2:九游,3:爱游戏)", type = "Integer", allowableValues = {"0", "1", "2", "3", "4"}, example = "1") - private AccountTypeEnum type; + @Schema(description = "平台名称", example = "开云") + private String platformName; + + /** + * 平台ID + */ + @AssembleMethod(targetType = PlatformService.class, method = @ContainerMethod(bindMethod = "get", resultType = PlatformResp.class), prop = "name:platformName") + private Long platformId; + /** * headers */ - @Schema(description = "headers",type = "JSON") + @Schema(description = "headers", type = "JSON") private String headers; /** diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformDetailResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformDetailResp.java index e9a3074f..f20574a8 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformDetailResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformDetailResp.java @@ -28,11 +28,11 @@ public class PlatformDetailResp extends BaseDetailResp { private static final long serialVersionUID = 1L; /** - * 平台ID + * 平台代码 */ - @Schema(description = "平台ID") - @ExcelProperty(value = "平台ID") - private Integer platformId; + @Schema(description = "平台代码") + @ExcelProperty(value = "平台代码") + private Integer code; /** * 平台名称 diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformResp.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformResp.java index 5a0cf316..fb49ae1c 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformResp.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/model/resp/PlatformResp.java @@ -24,10 +24,10 @@ public class PlatformResp extends BaseResp { private static final long serialVersionUID = 1L; /** - * 平台ID + * 平台代码 */ - @Schema(description = "平台ID") - private Integer platformId; + @Schema(description = "平台代码") + private Integer code; /** * 平台名称 diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/service/PlatformService.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/PlatformService.java index f7564518..aed94848 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/service/PlatformService.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/PlatformService.java @@ -1,5 +1,6 @@ package com.zayac.admin.system.service; +import com.zayac.admin.common.model.resp.LabelValueResp; import com.zayac.admin.system.model.entity.PlatformDO; import top.continew.starter.extension.crud.service.BaseService; import com.zayac.admin.system.model.query.PlatformQuery; @@ -7,6 +8,8 @@ import com.zayac.admin.system.model.req.PlatformReq; import com.zayac.admin.system.model.resp.PlatformDetailResp; import com.zayac.admin.system.model.resp.PlatformResp; +import java.util.List; + /** * 平台业务接口 * @@ -17,4 +20,6 @@ public interface PlatformService extends BaseService> buildDict(List list); } \ No newline at end of file diff --git a/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/PlatformServiceImpl.java b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/PlatformServiceImpl.java index 98beb477..cc0de33c 100644 --- a/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/PlatformServiceImpl.java +++ b/zayac-admin-system/src/main/java/com/zayac/admin/system/service/impl/PlatformServiceImpl.java @@ -1,5 +1,8 @@ package com.zayac.admin.system.service.impl; +import cn.hutool.core.collection.CollUtil; +import com.zayac.admin.common.model.resp.LabelValueResp; +import com.zayac.admin.system.model.resp.RoleResp; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -13,6 +16,9 @@ import com.zayac.admin.system.model.resp.PlatformDetailResp; import com.zayac.admin.system.model.resp.PlatformResp; import com.zayac.admin.system.service.PlatformService; +import java.util.ArrayList; +import java.util.List; + /** * 平台业务实现 * @@ -31,4 +37,12 @@ public class PlatformServiceImpl extends BaseServiceImpl> buildDict(List list) { + if (CollUtil.isEmpty(list)) { + return new ArrayList<>(0); + } + return list.stream().map(r -> new LabelValueResp<>(r.getName(), r.getId())).toList(); + } } \ No newline at end of file diff --git a/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java index eb88071d..a1ba302d 100644 --- a/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/common/CommonController.java @@ -72,6 +72,7 @@ public class CommonController { private final DictItemService dictItemService; private final OptionService optionService; private final UserService userService; + private final PlatformService platformService; @Operation(summary = "上传文件", description = "上传文件") @PostMapping("/file") @@ -106,6 +107,13 @@ public class CommonController { return R.ok(userService.buildDict(userService.list(query, sortQuery))); } + @Operation(summary = "查询平台字典", description = "查询平台字典列表") + @GetMapping("/dict/platform") + public R>> listPlatformDict(PlatformQuery query, SortQuery sortQuery) { + + return R.ok(platformService.buildDict(platformService.list(query, sortQuery))); + } + @Operation(summary = "查询字典", description = "查询字典列表") @Parameter(name = "code", description = "字典编码", example = "notice_type", in = ParameterIn.PATH) @GetMapping("/dict/{code}") diff --git a/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/AccountController.java b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/AccountController.java index 1aea288c..051249f5 100644 --- a/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/AccountController.java +++ b/zayac-admin-webapi/src/main/java/com/zayac/admin/webapi/system/AccountController.java @@ -39,7 +39,7 @@ import top.continew.starter.web.model.R; public class AccountController extends BaseController { private final PlatformService platformService; - @Override +/* @Override public R add(@Validated(ValidateGroup.Crud.Add.class) @RequestBody AccountReq req) { // String rawPassword = ExceptionUtils.exToNull(() -> SecureUtils.decryptByRsaPrivateKey(req.getPassword())); // ValidationUtils.throwIfNull(rawPassword, "密码解密失败"); @@ -57,6 +57,6 @@ public class AccountController extends BaseController