feat: 全局格式化代码

This commit is contained in:
evo
2025-12-06 14:38:41 +08:00
parent 96c53390aa
commit 7c7d5838cd
538 changed files with 21132 additions and 14160 deletions

View File

@@ -1,7 +1,6 @@
package org.ruoyi.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

View File

@@ -1,6 +1,5 @@
package org.ruoyi.domain;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

View File

@@ -26,13 +26,13 @@ public class ChatToken implements Serializable {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户ID
*/
@NotBlank(message = "用户ID", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "用户ID", groups = {AddGroup.class, EditGroup.class})
private Long UserId;
/**
@@ -43,7 +43,7 @@ public class ChatToken implements Serializable {
/**
* 模型名称
*/
@NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelName;
}

View File

@@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.ruoyi.annotation.DataColumn;
import org.ruoyi.core.domain.BaseEntity;
import java.util.Date;
/**
* MCP对象 mcp_info
*
@@ -25,7 +22,7 @@ public class McpInfo extends BaseEntity {
/**
* id
*/
@TableId(value = "mcp_id", type = IdType.AUTO)
@TableId(value = "mcp_id", type = IdType.AUTO)
private Integer mcpId;
/**
@@ -62,6 +59,4 @@ public class McpInfo extends BaseEntity {
private Boolean status;
}

View File

@@ -24,55 +24,55 @@ public class ChatMessageBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户id
*/
@NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 消息内容
*/
@NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "消息内容不能为空", groups = {AddGroup.class, EditGroup.class})
private String content;
/**
* 会话id
*/
@NotBlank(message = "会话id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "会话id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long sessionId;
/**
* 对话角色
*/
@NotBlank(message = "对话角色不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "对话角色不能为空", groups = {AddGroup.class, EditGroup.class})
private String role;
/**
* 扣除金额
*/
@NotNull(message = "扣除金额不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "扣除金额不能为空", groups = {AddGroup.class, EditGroup.class})
private Double deductCost;
/**
* 累计 Tokens
*/
@NotNull(message = "累计 Tokens不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "累计 Tokens不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer totalTokens;
/**
* 模型名称
*/
@NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelName;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;
/**

View File

@@ -1,16 +1,10 @@
package org.ruoyi.domain.bo;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.ruoyi.common.core.validate.AddGroup;
import org.ruoyi.common.core.validate.EditGroup;
import org.ruoyi.core.domain.BaseEntity;
import java.io.Serializable;
import java.util.Date;
@@ -29,19 +23,19 @@ public class ChatMessageForUniappBo implements Serializable {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户id
*/
@NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 消息内容
*/
@NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "消息内容不能为空", groups = {AddGroup.class, EditGroup.class})
private String content;
/**
@@ -67,7 +61,7 @@ public class ChatMessageForUniappBo implements Serializable {
/**
* 模型名称
*/
private String modelName ;
private String modelName;
/**
@@ -112,5 +106,4 @@ public class ChatMessageForUniappBo implements Serializable {
private Map<String, Object> params = new HashMap<>();
}

View File

@@ -1,6 +1,5 @@
package org.ruoyi.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -25,43 +24,43 @@ public class ChatModelBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 模型分类
*/
@NotBlank(message = "模型分类不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型分类不能为空", groups = {AddGroup.class, EditGroup.class})
private String category;
/**
* 模型名称
*/
@NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelName;
/**
* 模型描述
*/
@NotBlank(message = "模型描述不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型描述不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelDescribe;
/**
* 模型价格
*/
@NotNull(message = "模型价格不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "模型价格不能为空", groups = {AddGroup.class, EditGroup.class})
private Double modelPrice;
/**
* 计费类型
*/
@NotBlank(message = "计费类型不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "计费类型不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelType;
/**
* 是否显示
*/
@NotBlank(message = "是否显示不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "是否显示不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelShow;
/**
@@ -72,7 +71,7 @@ public class ChatModelBo extends BaseEntity {
/**
* 请求地址
*/
@NotBlank(message = "请求地址不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "请求地址不能为空", groups = {AddGroup.class, EditGroup.class})
private String apiHost;
/**
@@ -83,7 +82,7 @@ public class ChatModelBo extends BaseEntity {
/**
* 密钥
*/
@NotBlank(message = "密钥不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "密钥不能为空", groups = {AddGroup.class, EditGroup.class})
private String apiKey;
/**
@@ -94,7 +93,7 @@ public class ChatModelBo extends BaseEntity {
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;

View File

@@ -26,49 +26,49 @@ public class ChatPayOrderBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 订单编号
*/
@NotBlank(message = "订单编号不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "订单编号不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderNo;
/**
* 订单名称
*/
@NotBlank(message = "订单名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "订单名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String orderName;
/**
* 金额
*/
@NotNull(message = "金额不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "金额不能为空", groups = {AddGroup.class, EditGroup.class})
private BigDecimal amount;
/**
* 支付状态
*/
@NotBlank(message = "支付状态不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "支付状态不能为空", groups = {AddGroup.class, EditGroup.class})
private String paymentStatus;
/**
* 支付方式
*/
@NotBlank(message = "支付方式不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "支付方式不能为空", groups = {AddGroup.class, EditGroup.class})
private String paymentMethod;
/**
* 用户ID
*/
@NotNull(message = "用户ID不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 备注
*/
@NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "备注不能为空", groups = {AddGroup.class, EditGroup.class})
private String remark;

View File

@@ -1,6 +1,5 @@
package org.ruoyi.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@@ -23,7 +22,7 @@ public class ChatSessionBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**

View File

@@ -24,31 +24,31 @@ public class ChatUsageTokenBo extends BaseEntity {
/**
* 主键
*/
@NotNull(message = "主键不能为空", groups = { EditGroup.class })
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
private Long id;
/**
* 用户
*/
@NotNull(message = "用户不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "用户不能为空", groups = {AddGroup.class, EditGroup.class})
private Long userId;
/**
* 待结算token
*/
@NotNull(message = "待结算token不能为空", groups = { AddGroup.class, EditGroup.class })
@NotNull(message = "待结算token不能为空", groups = {AddGroup.class, EditGroup.class})
private Integer token;
/**
* 模型名称
*/
@NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String modelName;
/**
* 累计使用token
*/
@NotBlank(message = "累计使用token不能为空", groups = { AddGroup.class, EditGroup.class })
@NotBlank(message = "累计使用token不能为空", groups = {AddGroup.class, EditGroup.class})
private String totalToken;

View File

@@ -5,7 +5,6 @@ import jakarta.validation.constraints.NotNull;
import lombok.Data;
import org.ruoyi.domain.McpInfo;
import java.io.Serializable;
/**
@@ -19,40 +18,40 @@ import java.io.Serializable;
@AutoMapper(target = McpInfo.class, reverseConvertGenerate = false)
public class McpInfoBo implements Serializable {
/**
* id
*/
@NotNull(message = "id不能为空" )
/**
* id
*/
@NotNull(message = "id不能为空")
private Integer mcpId;
/**
* 服务器名称
*/
/**
* 服务器名称
*/
private String serverName;
/**
* 链接方式
*/
/**
* 链接方式
*/
private String transportType;
/**
* Command
*/
/**
* Command
*/
private String command;
/**
* Args
*/
/**
* Args
*/
private String arguments;
private String description;
/**
* Env
*/
* Env
*/
private String env;
/**
* 是否启用
*/
/**
* 是否启用
*/
private Boolean status;

View File

@@ -96,5 +96,4 @@ public class ChatMessageVo implements Serializable {
private Date createTime;
}

View File

@@ -13,7 +13,6 @@ import java.io.Serial;
import java.io.Serializable;
/**
* 聊天模型视图对象 chat_model
*

View File

@@ -11,8 +11,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
/**
* 支付订单视图对象 chat_pay_order
*

View File

@@ -10,7 +10,6 @@ import java.io.Serial;
import java.io.Serializable;
/**
* 会话管理视图对象 chat_session
*

View File

@@ -10,8 +10,6 @@ import java.io.Serial;
import java.io.Serializable;
/**
* 用户token使用详情视图对象 chat_usage_token
*

View File

@@ -21,45 +21,45 @@ import java.io.Serializable;
@ExcelIgnoreUnannotated
@AutoMapper(target = McpInfo.class)
public class McpInfoVo implements Serializable {
private Integer mcpId;
private Integer mcpId;
/**
* 服务器名称
*/
@ExcelProperty(value = "服务器名称")
private String serverName;
/**
* 服务器名称
*/
@ExcelProperty(value = "服务器名称")
private String serverName;
/**
* 链接方式
*/
@ExcelProperty(value = "链接方式", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "mcp_transport_type")
private String transportType;
/**
* 链接方式
*/
@ExcelProperty(value = "链接方式", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "mcp_transport_type")
private String transportType;
/**
* Command
*/
@ExcelProperty(value = "Command")
private String command;
/**
* Command
*/
@ExcelProperty(value = "Command")
private String command;
/**
* Args
*/
@ExcelProperty(value = "Args")
private String arguments;
/**
* Args
*/
@ExcelProperty(value = "Args")
private String arguments;
@ExcelProperty(value = "Description")
private String description;
/**
* Env
*/
@ExcelProperty(value = "Env")
private String env;
/**
* Env
*/
@ExcelProperty(value = "Env")
private String env;
/**
* 是否启用
*/
@ExcelProperty(value = "是否启用")
private Boolean status;
/**
* 是否启用
*/
@ExcelProperty(value = "是否启用")
private Boolean status;
}

View File

@@ -53,21 +53,22 @@ public interface IChatModelService {
* 通过模型名称获取模型信息
*/
ChatModelVo selectModelByName(String modelName);
/**
* 通过模型分类获取模型信息
*/
ChatModelVo selectModelByCategory(String image);
/**
* 通过模型分类获取优先级最高的模型信息
*/
ChatModelVo selectModelByCategoryWithHighestPriority(String category);
/**
* 在同一分类下,查找优先级小于当前优先级的最高优先级模型(用于降级)。
*/
ChatModelVo selectFallbackModelByCategoryAndLessPriority(String category, Integer currentPriority);
/**
* 获取ppt模型信息
*/

View File

@@ -18,7 +18,7 @@ public interface IChatTokenService {
/**
* 清空用户token
*/
void resetToken(Long userId,String modelName);
void resetToken(Long userId, String modelName);
/**
* 修改用户token

View File

@@ -36,7 +36,7 @@ public class ChatMessageServiceImpl implements IChatMessageService {
* 查询聊天消息
*/
@Override
public ChatMessageVo queryById(Long id){
public ChatMessageVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -45,7 +45,7 @@ public class ChatMessageServiceImpl implements IChatMessageService {
*/
@Override
public TableDataInfo<ChatMessageVo> queryPageList(ChatMessageBo bo, PageQuery pageQuery) {
if(!LoginHelper.isLogin()){
if (!LoginHelper.isLogin()) {
return TableDataInfo.build();
}
// 只有非管理员才自动设置为自己的 ID
@@ -104,7 +104,7 @@ public class ChatMessageServiceImpl implements IChatMessageService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ChatMessage entity){
private void validEntityBeforeSave(ChatMessage entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -113,7 +113,7 @@ public class ChatMessageServiceImpl implements IChatMessageService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

View File

@@ -35,7 +35,7 @@ public class ChatPayOrderServiceImpl implements IChatPayOrderService {
* 查询支付订单
*/
@Override
public ChatPayOrderVo queryById(Long id){
public ChatPayOrderVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -97,7 +97,7 @@ public class ChatPayOrderServiceImpl implements IChatPayOrderService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ChatPayOrder entity){
private void validEntityBeforeSave(ChatPayOrder entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -106,7 +106,7 @@ public class ChatPayOrderServiceImpl implements IChatPayOrderService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

View File

@@ -35,7 +35,7 @@ public class ChatSessionServiceImpl implements IChatSessionService {
* 查询会话管理
*/
@Override
public ChatSessionVo queryById(Long id){
public ChatSessionVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -94,7 +94,7 @@ public class ChatSessionServiceImpl implements IChatSessionService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ChatSession entity){
private void validEntityBeforeSave(ChatSession entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -103,7 +103,7 @@ public class ChatSessionServiceImpl implements IChatSessionService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

View File

@@ -32,7 +32,6 @@ public class ChatTokenServiceImpl implements IChatTokenService {
/**
* 清空用户token
*
*/
@Override
public void resetToken(Long userId, String modelName) {
@@ -43,7 +42,6 @@ public class ChatTokenServiceImpl implements IChatTokenService {
/**
* 增加用户token
*
*/
@Override
public void editToken(ChatUsageToken chatToken) {

View File

@@ -35,7 +35,7 @@ public class ChatUsageTokenServiceImpl implements IChatUsageTokenService {
* 查询用户token使用详情
*/
@Override
public ChatUsageTokenVo queryById(Long id){
public ChatUsageTokenVo queryById(Long id) {
return baseMapper.selectVoById(id);
}
@@ -95,7 +95,7 @@ public class ChatUsageTokenServiceImpl implements IChatUsageTokenService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(ChatUsageToken entity){
private void validEntityBeforeSave(ChatUsageToken entity) {
//TODO 做一些数据校验,如唯一约束
}
@@ -104,7 +104,7 @@ public class ChatUsageTokenServiceImpl implements IChatUsageTokenService {
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteBatchIds(ids) > 0;

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.ruoyi.mapper.ChatMessageMapper">
</mapper>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.ruoyi.mapper.ChatModelMapper">
</mapper>

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.ruoyi.mapper.ChatPayOrderMapper">
</mapper>