Merge remote-tracking branch 'origin/master'

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

@@ -6,17 +6,17 @@ import cn.iocoder.yudao.framework.ip.core.Area;
 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 import cn.iocoder.yudao.framework.ip.core.utils.IPUtils;
 import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeSimpleRespVO;
 import cn.iocoder.yudao.module.system.convert.ip.AreaConvert;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -34,28 +34,6 @@ public class AreaController {
         return success(AreaConvert.INSTANCE.convertList(area.getChildren()));
     }
 
-    @GetMapping("/get-children")
-    @Operation(summary = "获得地区的下级区域")
-    @Parameter(name = "id", description = "区域编号", required = true, example = "150000")
-    public CommonResult<List<AreaNodeSimpleRespVO>> getChildren(@RequestParam("id") Integer id) {
-        Area area = AreaUtils.getArea(id);
-        Assert.notNull(area, String.format("获取不到 id : %d 的区域", id));
-        return success(AreaConvert.INSTANCE.convertList2(area.getChildren()));
-    }
-
-    // 4)方法改成 getAreaChildrenList 获得子节点们；5）url 可以已改成 children-list
-    //@芋艿 是不是叫 getAreaListByIds 更合适。 因为不一定是子节点。 用于前端树选择获取缓存数据。 见 <el-tree-select :cache-data="areaCache">
-    @GetMapping("/get-by-ids")
-    @Operation(summary = "通过区域 ids 获得地区列表")
-    @Parameter(name = "ids", description = "区域编号 ids", required = true, example = "1,150000")
-    public CommonResult<List<AreaNodeSimpleRespVO>> getAreaListByIds(@RequestParam("ids") Set<Integer> ids) {
-        List<Area> areaList = new ArrayList<>(ids.size());
-        for (Integer areaId : ids) {
-            areaList.add(AreaUtils.getArea(areaId));
-        }
-        return success(AreaConvert.INSTANCE.convertList2(areaList));
-    }
-
     @GetMapping("/get-by-ip")
     @Operation(summary = "获得 IP 对应的地区名")
     @Parameter(name = "ip", description = "IP", required = true)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/ip/vo/AreaNodeSimpleRespVO.java

@@ -1,19 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.ip.vo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Schema(description = "管理后台 - 简洁的地区节点 Response VO")
-@Data
-public class AreaNodeSimpleRespVO {
-
-    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "110000")
-    private Integer id;
-
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "北京")
-    private String name;
-
-    @Schema(description = "是否叶子节点", example = "false")
-    private Boolean leaf;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/AppDictDataController.java

@@ -1,4 +1,39 @@
 package cn.iocoder.yudao.module.system.controller.app.dict;
 
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.system.controller.app.dict.vo.AppDictDataRespVO;
+import cn.iocoder.yudao.module.system.convert.dict.DictDataConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
+import cn.iocoder.yudao.module.system.service.dict.DictDataService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 App - 字典数据")
+@RestController
+@RequestMapping("/system/dict-data")
+@Validated
 public class AppDictDataController {
+
+    @Resource
+    private DictDataService dictDataService;
+
+    @GetMapping("/type")
+    @Operation(summary = "根据字典类型查询字典数据信息")
+    @Parameter(name = "type", description = "字典类型", required = true, example = "common_status")
+    public CommonResult<List<AppDictDataRespVO>> getDictDataListByType(@RequestParam("type") String type) {
+        List<DictDataDO> list = dictDataService.getEnabledDictDataListByType(type);
+        return success(DictDataConvert.INSTANCE.convertList03(list));
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/dict/vo/AppDictDataRespVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.controller.app.dict.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+
+@Schema(description = "用户 App - 字典数据信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AppDictDataRespVO {
+
+    @Schema(description = "字典数据编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long id;
+
+    @Schema(description = "字典标签", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道")
+    private String label;
+
+    @Schema(description = "字典值", requiredMode = Schema.RequiredMode.REQUIRED, example = "iocoder")
+    private String value;
+
+    @Schema(description = "字典类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "sys_common_sex")
+    private String dictType;
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/dict/DictDataConvert.java

@@ -3,11 +3,11 @@ package cn.iocoder.yudao.module.system.convert.dict;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.*;
+import cn.iocoder.yudao.module.system.controller.app.dict.vo.AppDictDataRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
-import java.util.Collection;
 import java.util.List;
 
 @Mapper
@@ -29,4 +29,7 @@ public interface DictDataConvert {
 
     DictDataRespDTO convert02(DictDataDO bean);
 
+    List<AppDictDataRespVO> convertList03(List<DictDataDO> list);
+
+    List<DictDataRespDTO> convertList04(List<DictDataDO> list);
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/ip/AreaConvert.java

@@ -1,16 +1,12 @@
 package cn.iocoder.yudao.module.system.convert.ip;
 
 import cn.iocoder.yudao.framework.ip.core.Area;
-import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
 import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.ip.vo.AreaNodeSimpleRespVO;
 import cn.iocoder.yudao.module.system.controller.app.ip.vo.AppAreaNodeRespVO;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 
 import java.util.List;
-import java.util.Objects;
 
 @Mapper
 public interface AreaConvert {
@@ -19,15 +15,6 @@ public interface AreaConvert {
 
     List<AreaNodeRespVO> convertList(List<Area> list);
 
-    List<AreaNodeSimpleRespVO> convertList2(List<Area> list);
-
-    @Mapping(source = "type", target = "leaf")
-    AreaNodeSimpleRespVO convert(Area area);
-
-    default Boolean convertAreaType(Integer type) {
-        return Objects.equals(AreaTypeEnum.DISTRICT.getType(), type);
-    }
-
     List<AppAreaNodeRespVO> convertList3(List<Area> list);
 
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java

@@ -48,4 +48,10 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
                 .eqIfPresent(DictDataDO::getStatus, reqVO.getStatus()));
     }
 
+    default List<DictDataDO> selectListByTypeAndStatus(String dictType, Integer status) {
+        return selectList(new LambdaQueryWrapper<DictDataDO>()
+                .eq(DictDataDO::getDictType, dictType)
+                .eq(DictDataDO::getStatus, status));
+    }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java

@@ -176,7 +176,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    @DataPermission(enable = false) // 禁用数据权限，避免简历不正确的缓存
+    @DataPermission(enable = false) // 禁用数据权限，避免建立不正确的缓存
     @Cacheable(cacheNames = RedisKeyConstants.DEPT_CHILDREN_ID_LIST, key = "#id")
     public Set<Long> getChildDeptIdListFromCache(Long id) {
         List<DeptDO> children = getChildDeptList(id);

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

@@ -62,6 +62,14 @@ public interface DictDataService {
      */
     List<DictDataDO> getDictDataList(DictDataExportReqVO reqVO);
 
+    /**
+     * 获得字典数据列表
+     *
+     * @param dictType 字典类型
+     * @return 字典数据列表
+     */
+    List<DictDataDO> getEnabledDictDataListByType(String dictType);
+
     /**
      * 获得字典数据详情
      *
@@ -84,7 +92,7 @@ public interface DictDataService {
      * 2. 字典数据被禁用
      *
      * @param dictType 字典类型
-     * @param values 字典数据值的数组
+     * @param values   字典数据值的数组
      */
     void validateDictDataList(String dictType, Collection<String> values);
 
@@ -92,7 +100,7 @@ public interface DictDataService {
      * 获得指定的字典数据
      *
      * @param dictType 字典类型
-     * @param value 字典数据值
+     * @param value    字典数据值
      * @return 字典数据
      */
     DictDataDO getDictData(String dictType, String value);
@@ -101,7 +109,7 @@ public interface DictDataService {
      * 解析获得指定的字典数据，从缓存中
      *
      * @param dictType 字典类型
-     * @param label 字典数据标签
+     * @param label    字典数据标签
      * @return 字典数据
      */
     DictDataDO parseDictData(String dictType, String label);

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

@@ -49,7 +49,7 @@ public class DictDataServiceImpl implements DictDataService {
 
     @Override
     public List<DictDataDO> getDictDataList() {
-        List<DictDataDO> list = dictDataMapper.selectList();
+        List<DictDataDO> list = dictDataMapper.selectList(DictDataDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
         list.sort(COMPARATOR_TYPE_AND_SORT);
         return list;
     }
@@ -66,6 +66,13 @@ public class DictDataServiceImpl implements DictDataService {
         return list;
     }
 
+    @Override
+    public List<DictDataDO> getEnabledDictDataListByType(String dictType) {
+        List<DictDataDO> list = dictDataMapper.selectListByTypeAndStatus(dictType, CommonStatusEnum.ENABLE.getStatus());
+        list.sort(COMPARATOR_TYPE_AND_SORT);
+        return list;
+    }
+
     @Override
     public DictDataDO getDictData(Long id) {
         return dictDataMapper.selectById(id);