From 5a5af706e50a7df9c69e1a0f8c240931f1cd56bd Mon Sep 17 00:00:00 2001 From: sion123 <450702724@qq.com> Date: Sat, 7 Mar 2026 15:52:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/tik/enums/ErrorCodeConstants.java | 2 +- .../muye/aimodelconfig/vo/AiModelConfigPageReqVO.java | 5 +++-- .../muye/aimodelconfig/vo/AiModelConfigSaveReqVO.java | 7 +++---- .../tik/muye/points/service/PointsServiceImpl.java | 2 -- .../module/tik/tikhup/mapper/TikTokenMapper.java | 2 -- .../tik/tikhup/service/TikTokenServiceImpl.java | 4 ++-- yudao-ui-admin-vue3/src/api/tik/token/index.ts | 1 - .../src/views/muye/pointrecord/PointRecordForm.vue | 8 ++++---- .../muye/pointsigninconfig/PointSigninConfigForm.vue | 4 ++-- .../src/views/muye/pointsigninconfig/index.vue | 11 +++++++---- 10 files changed, 22 insertions(+), 24 deletions(-) diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/enums/ErrorCodeConstants.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/enums/ErrorCodeConstants.java index 2e7ca95ef4..b623dded0c 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/enums/ErrorCodeConstants.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/enums/ErrorCodeConstants.java @@ -50,6 +50,6 @@ public interface ErrorCodeConstants { ErrorCode POINTS_PENDING_ALREADY_CONFIRMED = new ErrorCode(1_030_003_005, "预扣记录已确认或已取消"); // ========== TikToken相关错误码 1-030-004-000 ========== - ErrorCode TIKE_TOKEN_NOT_EXISTS = new ErrorCode(1_030_004_001, "TikToken不存在"); + ErrorCode TIK_TOKEN_NOT_EXISTS = new ErrorCode(1_030_004_001, "TikToken不存在"); } diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigPageReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigPageReqVO.java index 37c8d85da5..d0018130d0 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigPageReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigPageReqVO.java @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.tik.muye.aimodelconfig.vo; import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.SortablePageParam; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; @@ -10,7 +10,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Schema(description = "管理后台 - AI模型配置分页 Request VO") @Data -public class AiModelConfigPageReqVO extends PageParam { +@EqualsAndHashCode(callSuper = true) +public class AiModelConfigPageReqVO extends SortablePageParam { @Schema(description = "模型名称", example = "李四") private String modelName; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigSaveReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigSaveReqVO.java index efb3beb549..158d57edeb 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigSaveReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/aimodelconfig/vo/AiModelConfigSaveReqVO.java @@ -27,19 +27,18 @@ public class AiModelConfigSaveReqVO { private String apiKey; @Schema(description = "状态(0-禁用 1-启用)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "状态(0-禁用 1-启用)不能为空") + @NotNull(message = "状态不能为空") private Integer status; @Schema(description = "模型类型(image-图像 text-文本 video-视频 audio-音频)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotEmpty(message = "模型类型(image-图像 text-文本 video-视频 audio-音频)不能为空") + @NotEmpty(message = "模型类型不能为空") private String modelType; @Schema(description = "消耗积分", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "消耗积分不能为空") private Integer consumePoints; - @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便") - @NotEmpty(message = "备注不能为空") + @Schema(description = "备注", example = "随便") private String remark; } \ No newline at end of file diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/points/service/PointsServiceImpl.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/points/service/PointsServiceImpl.java index 07bee91f92..fff2414924 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/points/service/PointsServiceImpl.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/points/service/PointsServiceImpl.java @@ -1,7 +1,5 @@ package cn.iocoder.yudao.module.tik.muye.points.service; -import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; -import cn.iocoder.yudao.module.member.service.user.MemberUserService; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.service.user.MemberUserService; import cn.iocoder.yudao.module.tik.muye.aimodelconfig.dal.AiModelConfigDO; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/mapper/TikTokenMapper.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/mapper/TikTokenMapper.java index 102668fbec..1008592d46 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/mapper/TikTokenMapper.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/mapper/TikTokenMapper.java @@ -5,8 +5,6 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenPageReqVO; import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenVO; -import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenPageReqVO; -import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenVO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/service/TikTokenServiceImpl.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/service/TikTokenServiceImpl.java index f146680623..4491911d2e 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/service/TikTokenServiceImpl.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/tikhup/service/TikTokenServiceImpl.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.tik.enums.ErrorCodeConstants.TIKE_TOKEN_NOT_EXISTS; +import static cn.iocoder.yudao.module.tik.enums.ErrorCodeConstants.TIK_TOKEN_NOT_EXISTS; /** * TikToken 管理Service实现类 @@ -55,7 +55,7 @@ public class TikTokenServiceImpl implements TikTokenService { private void validateExists(Long id) { if (tikTokenMapper.selectById(id) == null) { - throw exception(TIKE_TOKEN_NOT_EXISTS); + throw exception(TIK_TOKEN_NOT_EXISTS); } } diff --git a/yudao-ui-admin-vue3/src/api/tik/token/index.ts b/yudao-ui-admin-vue3/src/api/tik/token/index.ts index 0e440b2e9d..d50465b5e4 100644 --- a/yudao-ui-admin-vue3/src/api/tik/token/index.ts +++ b/yudao-ui-admin-vue3/src/api/tik/token/index.ts @@ -1,5 +1,4 @@ import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; /** tikhup管理信息 */ export interface Token { diff --git a/yudao-ui-admin-vue3/src/views/muye/pointrecord/PointRecordForm.vue b/yudao-ui-admin-vue3/src/views/muye/pointrecord/PointRecordForm.vue index 745abdb86e..a60248c653 100644 --- a/yudao-ui-admin-vue3/src/views/muye/pointrecord/PointRecordForm.vue +++ b/yudao-ui-admin-vue3/src/views/muye/pointrecord/PointRecordForm.vue @@ -13,14 +13,14 @@ - + 增加 减少 - - + + @@ -28,7 +28,7 @@ - + 签到 充值 diff --git a/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/PointSigninConfigForm.vue b/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/PointSigninConfigForm.vue index 0c4ebbadc9..a01801fe4c 100644 --- a/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/PointSigninConfigForm.vue +++ b/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/PointSigninConfigForm.vue @@ -28,7 +28,7 @@ - + 禁用 启用 @@ -77,7 +77,7 @@ const formRules = reactive({ adjustReason: [{ required: true, message: '调整原因不能为空', trigger: 'blur' }], operatorId: [{ required: true, message: '操作人用户编号不能为空', trigger: 'blur' }], operatorName: [{ required: true, message: '操作人账号不能为空', trigger: 'blur' }], - status: [{ required: true, message: '状态(0-禁用 1-启用)不能为空', trigger: 'blur' }], + status: [{ required: true, message: '状态不能为空', trigger: 'change' }], remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }], }) const formRef = ref() // 表单 Ref diff --git a/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/index.vue b/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/index.vue index 5f933dea59..eb808d80f6 100644 --- a/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/index.vue +++ b/yudao-ui-admin-vue3/src/views/muye/pointsigninconfig/index.vue @@ -106,11 +106,14 @@ - + + + - - - + + + +