优化字典接口、模型接口部分业务逻辑

2026-07-22 07:03:53 +08:00 · 2026-01-19 15:19:48 +08:00
parent ce6b0bd099
commit 5f19b9b0d0
5 changed files with 47 additions and 26 deletions
@@ -56,7 +56,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                new QueryWrapper<ModelConfigEntity>()
                        .eq("model_type", modelType)
                        .eq("is_enabled", 1)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%")
+                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
                        .select("id", "model_name"));
        return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
    }
@@ -67,14 +67,14 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                new QueryWrapper<ModelConfigEntity>()
                        .eq("model_type", "llm")
                        .eq("is_enabled", 1)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%")
+                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName)
                        .select("id", "model_name", "config_json"));

        return entities.stream().map(item -> {
            LlmModelBasicInfoDTO dto = new LlmModelBasicInfoDTO();
            dto.setId(item.getId());
            dto.setModelName(item.getModelName());
-            String type = item.getConfigJson().get("type").toString();
+            String type = item.getConfigJson().getOrDefault("type", "").toString();
            dto.setType(type);
            return dto;
        }).toList();
@@ -91,14 +91,13 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
        Page<ModelConfigEntity> pageInfo = new Page<>(curPage, pageSize);

        // 添加排序规则：先按is_enabled降序，再按sort升序
-        pageInfo.addOrder(OrderItem.desc("is_enabled"));
-        pageInfo.addOrder(OrderItem.asc("sort"));
+        pageInfo.addOrder(OrderItem.desc("is_enabled"), OrderItem.asc("sort"));

        IPage<ModelConfigEntity> modelConfigEntityIPage = modelConfigDao.selectPage(
                pageInfo,
                new QueryWrapper<ModelConfigEntity>()
                        .eq("model_type", modelType)
-                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%"));
+                        .like(StringUtils.isNotBlank(modelName), "model_name", modelName));

        return getPageData(modelConfigEntityIPage, ModelConfigDTO.class);
    }
@@ -489,7 +488,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
            List<ModelConfigEntity> intentConfigs = modelConfigDao.selectList(
                    new QueryWrapper<ModelConfigEntity>()
                            .eq("model_type", "Intent")
-                            .like("config_json", "%" + modelId + "%"));
+                            .like("config_json", modelId));
            if (!intentConfigs.isEmpty()) {
                throw new RenException(ErrorCode.LLM_REFERENCED_BY_INTENT);
            }
@@ -124,12 +124,6 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
        return getPageData(modelProviderDao.selectPage(pageParam, wrapper), ModelProviderDTO.class);
    }

-    public static void main(String[] args) {
-        String jsonString = "\"[]\"";
-        JSONArray jsonArray = new JSONArray(jsonString);
-        System.out.println("字符串转 JSONArray: " + jsonArray.toString());
-    }
-
    @Override
    public ModelProviderDTO add(ModelProviderDTO modelProviderDTO) {
        UserDetail user = SecurityUser.getUser();
@@ -153,8 +147,7 @@ public class ModelProviderServiceImpl extends BaseServiceImpl<ModelProviderDao,
        UserDetail user = SecurityUser.getUser();
        modelProviderDTO.setUpdater(user.getId());
        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(ErrorCode.UPDATE_DATA_FAILED);
        }
        return ConvertUtils.sourceToTarget(modelProviderDTO, ModelProviderDTO.class);
@@ -4,6 +4,7 @@ import java.util.List;

 import org.apache.ibatis.annotations.Mapper;

+import org.apache.ibatis.annotations.Param;
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 import xiaozhi.modules.sys.vo.SysDictDataItem;
@@ -23,4 +24,9 @@ public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
     * @return 字典类型编码
     */
    String getTypeByTypeId(Long dictTypeId);
+
+    /**
+     * 根据字典数据ID集合获取字典类型编码集合
+     */
+    List<String> getDictTypesByIdList(@Param("dictDataIdList") List<Long> dictDataIdList);
 }
@@ -1,9 +1,6 @@
 package xiaozhi.modules.sys.service.impl;

-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

@@ -23,6 +20,7 @@ import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
+import xiaozhi.common.utils.ToolUtil;
 import xiaozhi.modules.sys.dao.SysDictDataDao;
 import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
@@ -104,13 +102,19 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void delete(Long[] ids) {
-        for (Long id : ids) {
-            SysDictDataEntity entity = baseDao.selectById(id);
-            // 删除Redis缓存
-            String dictType = baseDao.getTypeByTypeId(entity.getDictTypeId());
-            redisUtils.delete(RedisKeys.getDictDataByTypeKey(dictType));
-            // 删除
-            deleteById(id);
+        List<Long> idList = Arrays.asList(ids);
+        if (ToolUtil.isNotEmpty(idList)) {
+            //批量删除redis字典
+            List<String> redisKeyList = new ArrayList<>();
+            //批量获取字典类型
+            List<String> dictTypeList = Optional.ofNullable(baseDao.getDictTypesByIdList(idList)).orElseGet(ArrayList::new);
+            dictTypeList.forEach(dictType -> redisKeyList.add(RedisKeys.getDictDataByTypeKey(dictType)));
+            if (ToolUtil.isNotEmpty(redisKeyList)) {
+                //清除缓存
+                redisUtils.delete(redisKeyList);
+            }
+            //批量删除字典数据
+            deleteBatchIds(Arrays.asList(ids));
        }
    }

@@ -15,4 +15,23 @@
        FROM sys_dict_type
        WHERE id = #{dictTypeId}
    </select>
+
+    <select id="getDictTypesByIdList" resultType="java.lang.String">
+        SELECT
+            dict_type
+        FROM
+            sys_dict_type
+        WHERE
+            id IN (
+                SELECT
+                    dict_type_id
+                FROM
+                    sys_dict_data
+                WHERE
+                    id IN
+                <foreach collection="dictDataIdList" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                )
+    </select>
 </mapper>