feat: 优化

This commit is contained in:
2026-03-07 15:49:46 +08:00
parent 52a1094144
commit 09b7862971
24 changed files with 296 additions and 209 deletions

View File

@@ -49,4 +49,7 @@ public interface ErrorCodeConstants {
ErrorCode POINTS_PENDING_NOT_FOUND = new ErrorCode(1_030_003_004, "预扣记录不存在");
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不存在");
}

View File

@@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.tik.muye.aimodelconfig.dal;
import lombok.*;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -45,18 +44,6 @@ public class AiModelConfigDO extends BaseDO {
* 状态(0-禁用 1-启用)
*/
private Integer status;
/**
* 温度参数
*/
private BigDecimal temperature;
/**
* 回复数Token数
*/
private Integer maxTokens;
/**
* 每日请求次数
*/
private Integer dailyLimit;
/**
* 模型类型(image-图像 text-文本 video-视频 audio-音频)
*/
@@ -65,22 +52,6 @@ public class AiModelConfigDO extends BaseDO {
* 消耗积分
*/
private Integer consumePoints;
/**
* 最大文本数量
*/
private Integer maxTextLength;
/**
* 图片最大像素
*/
private String maxImageSize;
/**
* 视频最大时长(秒)
*/
private Integer maxVideoDuration;
/**
* 视频最大质量
*/
private String maxVideoQuality;
/**
* 备注
*/

View File

@@ -25,15 +25,8 @@ public interface AiModelConfigMapper extends BaseMapperX<AiModelConfigDO> {
.eqIfPresent(AiModelConfigDO::getPlatform, reqVO.getPlatform())
.eqIfPresent(AiModelConfigDO::getApiKey, reqVO.getApiKey())
.eqIfPresent(AiModelConfigDO::getStatus, reqVO.getStatus())
.eqIfPresent(AiModelConfigDO::getTemperature, reqVO.getTemperature())
.eqIfPresent(AiModelConfigDO::getMaxTokens, reqVO.getMaxTokens())
.eqIfPresent(AiModelConfigDO::getDailyLimit, reqVO.getDailyLimit())
.eqIfPresent(AiModelConfigDO::getModelType, reqVO.getModelType())
.eqIfPresent(AiModelConfigDO::getConsumePoints, reqVO.getConsumePoints())
.eqIfPresent(AiModelConfigDO::getMaxTextLength, reqVO.getMaxTextLength())
.eqIfPresent(AiModelConfigDO::getMaxImageSize, reqVO.getMaxImageSize())
.eqIfPresent(AiModelConfigDO::getMaxVideoDuration, reqVO.getMaxVideoDuration())
.eqIfPresent(AiModelConfigDO::getMaxVideoQuality, reqVO.getMaxVideoQuality())
.eqIfPresent(AiModelConfigDO::getRemark, reqVO.getRemark())
.betweenIfPresent(AiModelConfigDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(AiModelConfigDO::getId));

View File

@@ -1,10 +1,8 @@
package cn.iocoder.yudao.module.tik.muye.aimodelconfig.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -29,33 +27,12 @@ public class AiModelConfigPageReqVO extends PageParam {
@Schema(description = "状态(0-禁用 1-启用)", example = "2")
private Integer status;
@Schema(description = "温度参数")
private BigDecimal temperature;
@Schema(description = "回复数Token数")
private Integer maxTokens;
@Schema(description = "每日请求次数")
private Integer dailyLimit;
@Schema(description = "模型类型(image-图像 text-文本 video-视频 audio-音频)", example = "2")
private String modelType;
@Schema(description = "消耗积分")
private Integer consumePoints;
@Schema(description = "最大文本数量")
private Integer maxTextLength;
@Schema(description = "图片最大像素")
private String maxImageSize;
@Schema(description = "视频最大时长(秒)")
private Integer maxVideoDuration;
@Schema(description = "视频最大质量")
private String maxVideoQuality;
@Schema(description = "备注", example = "随便")
private String remark;

View File

@@ -2,9 +2,6 @@ package cn.iocoder.yudao.module.tik.muye.aimodelconfig.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import java.math.BigDecimal;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import cn.idev.excel.annotation.*;
@@ -37,18 +34,6 @@ public class AiModelConfigRespVO {
@ExcelProperty("状态(0-禁用 1-启用)")
private Integer status;
@Schema(description = "温度参数", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("温度参数")
private BigDecimal temperature;
@Schema(description = "回复数Token数", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("回复数Token数")
private Integer maxTokens;
@Schema(description = "每日请求次数", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("每日请求次数")
private Integer dailyLimit;
@Schema(description = "模型类型(image-图像 text-文本 video-视频 audio-音频)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("模型类型(image-图像 text-文本 video-视频 audio-音频)")
private String modelType;
@@ -57,22 +42,6 @@ public class AiModelConfigRespVO {
@ExcelProperty("消耗积分")
private Integer consumePoints;
@Schema(description = "最大文本数量", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("最大文本数量")
private Integer maxTextLength;
@Schema(description = "图片最大像素", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("图片最大像素")
private String maxImageSize;
@Schema(description = "视频最大时长(秒)", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("视频最大时长(秒)")
private Integer maxVideoDuration;
@Schema(description = "视频最大质量", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("视频最大质量")
private String maxVideoQuality;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
@ExcelProperty("备注")
private String remark;

View File

@@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.tik.muye.aimodelconfig.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
import java.math.BigDecimal;
@Schema(description = "管理后台 - AI模型配置新增/修改 Request VO")
@Data
@@ -32,18 +30,6 @@ public class AiModelConfigSaveReqVO {
@NotNull(message = "状态(0-禁用 1-启用)不能为空")
private Integer status;
@Schema(description = "温度参数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "温度参数不能为空")
private BigDecimal temperature;
@Schema(description = "回复数Token数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "回复数Token数不能为空")
private Integer maxTokens;
@Schema(description = "每日请求次数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "每日请求次数不能为空")
private Integer dailyLimit;
@Schema(description = "模型类型(image-图像 text-文本 video-视频 audio-音频)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@NotEmpty(message = "模型类型(image-图像 text-文本 video-视频 audio-音频)不能为空")
private String modelType;
@@ -52,18 +38,6 @@ public class AiModelConfigSaveReqVO {
@NotNull(message = "消耗积分不能为空")
private Integer consumePoints;
@Schema(description = "最大文本数量")
private Integer maxTextLength;
@Schema(description = "图片最大像素")
private String maxImageSize;
@Schema(description = "视频最大时长(秒)")
private Integer maxVideoDuration;
@Schema(description = "视频最大质量")
private String maxVideoQuality;
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
@NotEmpty(message = "备注不能为空")
private String remark;

View File

@@ -1,5 +1,9 @@
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;
import cn.iocoder.yudao.module.tik.muye.aimodelconfig.mapper.AiModelConfigMapper;
import cn.iocoder.yudao.module.tik.muye.memberuserprofile.dal.MemberUserProfileDO;
@@ -43,6 +47,9 @@ public class PointsServiceImpl implements PointsService {
@Resource
private PointRecordMapper pointRecordMapper;
@Resource
private MemberUserService memberUserService;
@Override
public AiModelConfigDO getConfig(String platform, String modelCode) {
AiModelConfigDO config = aiModelConfigMapper.selectByPlatformAndModelCode(platform, modelCode);
@@ -72,9 +79,14 @@ public class PointsServiceImpl implements PointsService {
// 2. 查询扣减后余额
MemberUserProfileDO profile = memberUserProfileMapper.selectByUserId(userId);
// 2.1 获取用户手机号
MemberUserDO user = memberUserService.getUser(Long.parseLong(userId));
String mobile = user != null ? user.getMobile() : "";
// 3. 创建积分记录(已确认状态)
PointRecordDO record = PointRecordDO.builder()
.userId(Long.parseLong(userId))
.mobile(mobile)
.type("decrease")
.pointAmount(-points)
.balance(profile.getRemainingPoints())
@@ -98,9 +110,14 @@ public class PointsServiceImpl implements PointsService {
// 2. 查询当前余额
MemberUserProfileDO profile = memberUserProfileMapper.selectByUserId(userId);
// 2.1 获取用户手机号
MemberUserDO user = memberUserService.getUser(Long.parseLong(userId));
String mobile = user != null ? user.getMobile() : "";
// 3. 创建预扣记录(待确认状态)
PointRecordDO record = PointRecordDO.builder()
.userId(Long.parseLong(userId))
.mobile(mobile)
.type("decrease")
.pointAmount(-points)
.balance(profile.getRemainingPoints())

View File

@@ -0,0 +1,68 @@
package cn.iocoder.yudao.module.tik.tikhup.controller;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.tik.tikhup.service.TikTokenService;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenPageReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenSaveReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenVO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - TikToken 管理")
@RestController
@RequestMapping("/admin-api/tik/token")
@Validated
public class TikTokenAdminController {
@Resource
private TikTokenService tikTokenService;
@PostMapping("/create")
@Operation(summary = "创建TikToken")
@PreAuthorize("@ss.hasPermission('tik:token:create')")
public CommonResult<Long> create(@Valid @RequestBody TikTokenSaveReqVO reqVO) {
return success(tikTokenService.create(reqVO));
}
@PutMapping("/update")
@Operation(summary = "更新TikToken")
@PreAuthorize("@ss.hasPermission('tik:token:update')")
public CommonResult<Boolean> update(@Valid @RequestBody TikTokenSaveReqVO reqVO) {
tikTokenService.update(reqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除TikToken")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('tik:token:delete')")
public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
tikTokenService.delete(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获取TikToken详情")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('tik:token:query')")
public CommonResult<TikTokenVO> get(@RequestParam("id") Long id) {
return success(tikTokenService.get(id));
}
@GetMapping("/page")
@Operation(summary = "分页查询TikToken列表")
@PreAuthorize("@ss.hasPermission('tik:token:query')")
public CommonResult<PageResult<TikTokenVO>> getPage(@Valid TikTokenPageReqVO reqVO) {
return success(tikTokenService.getPage(reqVO));
}
}

View File

@@ -1,6 +1,11 @@
package cn.iocoder.yudao.module.tik.tikhup.mapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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;
@@ -15,4 +20,12 @@ public interface TikTokenMapper extends BaseMapperX<TikTokenVO> {
return selectOne("interface_type",interfaceType);
}
default PageResult<TikTokenVO> selectPage(TikTokenPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<TikTokenVO>()
.likeIfPresent(TikTokenVO::getPlatformUrl, reqVO.getPlatformUrl())
.eqIfPresent(TikTokenVO::getInterfaceType, reqVO.getInterfaceType())
.likeIfPresent(TikTokenVO::getInterfaceDesc, reqVO.getInterfaceDesc())
.orderByDesc(TikTokenVO::getId));
}
}

View File

@@ -0,0 +1,39 @@
package cn.iocoder.yudao.module.tik.tikhup.service;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenPageReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenSaveReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenVO;
import jakarta.validation.Valid;
/**
* TikToken 管理Service接口
*/
public interface TikTokenService {
/**
* 分页查询TikToken列表
*/
PageResult<TikTokenVO> getPage(TikTokenPageReqVO reqVO);
/**
* 创建TikToken
*/
Long create(@Valid TikTokenSaveReqVO reqVO);
/**
* 更新TikToken
*/
void update(@Valid TikTokenSaveReqVO reqVO);
/**
* 删除TikToken
*/
void delete(Long id);
/**
* 获取TikToken详情
*/
TikTokenVO get(Long id);
}

View File

@@ -0,0 +1,62 @@
package cn.iocoder.yudao.module.tik.tikhup.service;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.tik.tikhup.mapper.TikTokenMapper;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenPageReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenSaveReqVO;
import cn.iocoder.yudao.module.tik.tikhup.vo.TikTokenVO;
import jakarta.annotation.Resource;
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;
/**
* TikToken 管理Service实现类
*/
@Service
@Validated
public class TikTokenServiceImpl implements TikTokenService {
@Resource
private TikTokenMapper tikTokenMapper;
@Override
public PageResult<TikTokenVO> getPage(TikTokenPageReqVO reqVO) {
return tikTokenMapper.selectPage(reqVO);
}
@Override
public Long create(TikTokenSaveReqVO reqVO) {
TikTokenVO token = BeanUtils.toBean(reqVO, TikTokenVO.class);
tikTokenMapper.insert(token);
return token.getId();
}
@Override
public void update(TikTokenSaveReqVO reqVO) {
validateExists(reqVO.getId());
TikTokenVO token = BeanUtils.toBean(reqVO, TikTokenVO.class);
tikTokenMapper.updateById(token);
}
@Override
public void delete(Long id) {
validateExists(id);
tikTokenMapper.deleteById(id);
}
@Override
public TikTokenVO get(Long id) {
return tikTokenMapper.selectById(id);
}
private void validateExists(Long id) {
if (tikTokenMapper.selectById(id) == null) {
throw exception(TIKE_TOKEN_NOT_EXISTS);
}
}
}

View File

@@ -0,0 +1,22 @@
package cn.iocoder.yudao.module.tik.tikhup.vo;
import cn.iocoder.yudao.framework.common.pojo.SortablePageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Schema(description = "管理后台 - TikToken 分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
public class TikTokenPageReqVO extends SortablePageParam {
@Schema(description = "平台URL", example = "https://api.tikhub.io")
private String platformUrl;
@Schema(description = "接口类型", example = "crawler")
private String interfaceType;
@Schema(description = "接口描述", example = "抖音视频爬虫接口")
private String interfaceDesc;
}

View File

@@ -0,0 +1,25 @@
package cn.iocoder.yudao.module.tik.tikhup.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import lombok.Data;
@Schema(description = "管理后台 - TikToken 创建/更新 Request VO")
@Data
public class TikTokenSaveReqVO {
@Schema(description = "编号", example = "1")
private Long id;
@Schema(description = "平台URL", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://api.tikhub.io")
@NotEmpty(message = "平台URL不能为空")
private String platformUrl;
@Schema(description = "接口类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "crawler")
@NotEmpty(message = "接口类型不能为空")
private String interfaceType;
@Schema(description = "接口描述", example = "抖音视频爬虫接口")
private String interfaceDesc;
}

View File

@@ -17,10 +17,10 @@ public class TikTokenVO extends TenantBaseDO {
@TableField(value = "platform_url")
private String platformUrl;
@TableField(value = "platform_token")
private String platformToken;
@TableField(value = "interface_type")
private String interfaceType;
@TableField(value = "interface_desc")
private String interfaceDesc;
}