diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java index 9358738..7e8a547 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/DictDetailController.java @@ -20,7 +20,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.service.DictDetailService; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; import org.springframework.data.domain.Pageable; @@ -57,7 +56,7 @@ public class DictDetailController { @GetMapping(value = "/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,,]"); - Map> dictMap = new HashMap<>(16); + Map> dictMap = new HashMap<>(16); for (String name : names) { dictMap.put(name, dictDetailService.getDictByName(name)); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java index 3c7bd85..b7661c2 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/DictDetailService.java @@ -15,8 +15,6 @@ */ package org.nl.modules.system.service; -import org.nl.modules.system.domain.DictDetail; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; import org.springframework.data.domain.Pageable; @@ -61,7 +59,7 @@ public interface DictDetailService { * @param name 字典名称 * @return / */ - List getDictByName(String name); + List getDictByName(String name); /** * 根据ID查询 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index 7fca473..f6b8284 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -19,13 +19,13 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.service.DictDetailService; -import org.nl.modules.system.service.dto.DictDetailDto; import org.nl.modules.system.service.dto.DictDetailQueryCriteria; import org.nl.modules.system.service.dto.DictDto; import org.nl.modules.wql.WQL; @@ -98,8 +98,16 @@ public class DictDetailServiceImpl implements DictDetailService { @Override @Cacheable(key = "'name:' + #p0") - public List getDictByName(String name) { - return null; + public List getDictByName(String name) { + List dictDtos = this.findByDictName(name); + return dictDtos; + } + + private List findByDictName(String name) { // 前端的name就是code + WQLObject wo = WQLObject.getWQLObject("sys_dict"); + JSONArray jsonArray = wo.query("code = '" + name + "' AND " + + "label IS NOT NULL AND label != '' ").getResultJSONArray(0); + return jsonArray.toJavaList(DictDto.class); } @Override