Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-27 09:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update:优化模型供应器查询

Browse Source
This commit is contained in:
hrz
2025-05-17 23:18:19 +08:00
parent 59e18dc1c1
commit 29216768e1
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelProviderDTO.java
-1
View File
@@ -16,7 +16,6 @@ import xiaozhi.common.annotation.UpdateGroup;
@Data @Data
@Schema(description = "模型供应器/商") @Schema(description = "模型供应器/商")
public class ModelProviderDTO implements Serializable { public class ModelProviderDTO implements Serializable {
//
@Schema(description = "主键") @Schema(description = "主键")
@NotBlank(message = "id不能为空", groups = UpdateGroup.class) @NotBlank(message = "id不能为空", groups = UpdateGroup.class)
private String id; private String id;
main/manager-api/src/main/java/xiaozhi/modules/model/entity/ModelProviderEntity.java
-3
View File
@@ -3,10 +3,8 @@ package xiaozhi.modules.model.entity;
import java.util.Date; import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@@ -30,7 +28,6 @@ public class ModelProviderEntity {
private String name; private String name;
@Schema(description = "供应器字段列表(JSON格式)") @Schema(description = "供应器字段列表(JSON格式)")
// @TableField(typeHandler = JacksonTypeHandler.class)
private String fields; private String fields;
@Schema(description = "排序") @Schema(description = "排序")
main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelProviderServiceImpl.java
+5 -2
View File
@@ -59,7 +59,9 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
} }
if (StringUtils.isNotBlank(modelProviderDTO.getName())) { if (StringUtils.isNotBlank(modelProviderDTO.getName())) {
wrapper.like("name", "%" + modelProviderDTO.getName() + "%"); wrapper.and(w -> w.like("name", modelProviderDTO.getName())
.or()
.like("provider_code", modelProviderDTO.getName()));
} }
return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class); return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class);
} }
@@ -93,7 +95,8 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
UserDetail user = SecurityUser.getUser(); UserDetail user = SecurityUser.getUser();
modelProviderDTO.setUpdater(user.getId()); modelProviderDTO.setUpdater(user.getId());
modelProviderDTO.setUpdateDate(new Date()); modelProviderDTO.setUpdateDate(new Date());
if (modelProviderDao.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) { if (modelProviderDao
.updateById(ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderEntity.class)) == 0) {
throw new RenException("修改数据失败"); throw new RenException("修改数据失败");
} }
return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class); return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
main/xiaozhi-server/config/logger.py
+1 -1
View File
@@ -4,7 +4,7 @@ from loguru import logger
from config.config_loader import load_config from config.config_loader import load_config
from config.settings import check_config_file from config.settings import check_config_file
SERVER_VERSION = "0.4.3" SERVER_VERSION = "0.4.4"
def get_module_abbreviation(module_name, module_dict): def get_module_abbreviation(module_name, module_dict):