hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-10-30 01:38:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21

Browse Source
This commit is contained in:
YunaiV
2024-02-26 12:25:55 +08:00
parent 21452af780 cb8d4e0976
commit 088fbb2096
254 changed files with 5572 additions and 5773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
View File

@@ -4,10 +4,11 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
import cn.iocoder.yudao.module.system.service.dict.DictDataService;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.util.Collection;
import java.util.List;
/**
* 字典数据 API 实现类
@@ -37,4 +38,10 @@ public class DictDataApiImpl implements DictDataApi {
return BeanUtils.toBean(dictData, DictDataRespDTO.class);
}
@Override
public List<DictDataRespDTO> getDictDataList(String dictType) {
List<DictDataDO> list = dictDataService.getDictDataListByDictType(dictType);
return BeanUtils.toBean(list, DictDataRespDTO.class);
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/AreaController.java
View File

@@ -29,7 +29,7 @@ public class AreaController {
@GetMapping("/tree")
@Operation(summary = "获得地区树")
public CommonResult<List<AreaNodeRespVO>> getAreaTree() {
Area area = AreaUtils.getArea(Area.ID_CHINA);
Area area = AreaUtils.parseArea(Area.ID_CHINA);
Assert.notNull(area, "获取不到中国");
return success(BeanUtils.toBean(area.getChildren(), AreaNodeRespVO.class));
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/ip/AppAreaController.java
View File

@@ -26,7 +26,7 @@ public class AppAreaController {
@GetMapping("/tree")
@Operation(summary = "获得地区树")
public CommonResult<List<AppAreaNodeRespVO>> getAreaTree() {
Area area = AreaUtils.getArea(Area.ID_CHINA);
Area area = AreaUtils.parseArea(Area.ID_CHINA);
Assert.notNull(area, "获取不到中国");
return success(BeanUtils.toBean(area.getChildren(), AppAreaNodeRespVO.class));
}

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
View File

@@ -99,4 +99,12 @@ public interface DictDataService {
*/
DictDataDO parseDictData(String dictType, String label);
/**
* 获得指定数据类型的字典数据列表
*
* @param dictType 字典类型
* @return 字典数据列表
*/
List<DictDataDO> getDictDataListByDictType(String dictType);
}

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
View File

@@ -11,10 +11,10 @@ import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictTypeDO;
import cn.iocoder.yudao.module.system.dal.mysql.dict.DictDataMapper;
import com.google.common.annotations.VisibleForTesting;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
@@ -169,4 +169,11 @@ public class DictDataServiceImpl implements DictDataService {
return dictDataMapper.selectByDictTypeAndLabel(dictType, label);
}
@Override
public List<DictDataDO> getDictDataListByDictType(String dictType) {
List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getDictType, dictType);
list.sort(Comparator.comparing(DictDataDO::getSort));
return list;
}
}