Merge remote-tracking branch 'origin/fxz_dev' into leng_dev

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/resolver/DictResolver.java

@@ -0,0 +1,99 @@
+package com.pig4cloud.pigx.common.data.resolver;
+
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pig4cloud.pigx.admin.api.entity.SysDictItem;
+import com.pig4cloud.pigx.admin.api.feign.RemoteDictService;
+import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
+import lombok.experimental.UtilityClass;
+
+import java.util.List;
+
+/**
+ * @author fxz
+ * @date 2022/3/24 字典解析器
+ */
+@UtilityClass
+public class DictResolver {
+
+	/**
+	 * 根据字典类型获取所有字典项
+	 * @param type 字典类型
+	 * @return 字典数据项集合
+	 */
+	public List<SysDictItem> getDictItemsByType(String type) {
+		Assert.isTrue(StringUtils.isNotBlank(type), "参数不合法");
+
+		RemoteDictService remoteDictService = SpringContextHolder.getBean(RemoteDictService.class);
+
+		return remoteDictService.getDictByType(type).getData();
+	}
+
+	/**
+	 * 根据字典类型以及字典项字典值获取字典标签
+	 * @param type 字典类型
+	 * @param itemValue 字典项字典值
+	 * @return 字典项标签值
+	 */
+	public String getDictItemLabel(String type, String itemValue) {
+		Assert.isTrue(StringUtils.isNotBlank(type) && StringUtils.isNotBlank(itemValue), "参数不合法");
+
+		SysDictItem sysDictItem = getDictItemByItemValue(type, itemValue);
+
+		return ObjectUtils.isNotEmpty(sysDictItem) ? sysDictItem.getLabel() : StringPool.EMPTY;
+	}
+
+	/**
+	 * 根据字典类型以及字典标签获取字典值
+	 * @param type 字典类型
+	 * @param itemLabel 字典数据标签
+	 * @return 字典数据项值
+	 */
+	public String getDictItemValue(String type, String itemLabel) {
+		Assert.isTrue(StringUtils.isNotBlank(type) && StringUtils.isNotBlank(itemLabel), "参数不合法");
+
+		SysDictItem sysDictItem = getDictItemByItemLabel(type, itemLabel);
+
+		return ObjectUtils.isNotEmpty(sysDictItem) ? sysDictItem.getItemValue() : StringPool.EMPTY;
+	}
+
+	/**
+	 * 根据字典类型以及字典值获取字典项
+	 * @param type 字典类型
+	 * @param itemValue 字典数据值
+	 * @return 字典数据项
+	 */
+	public SysDictItem getDictItemByItemValue(String type, String itemValue) {
+		Assert.isTrue(StringUtils.isNotBlank(type) && StringUtils.isNotBlank(itemValue), "参数不合法");
+
+		List<SysDictItem> dictItemList = getDictItemsByType(type);
+
+		if (CollectionUtils.isNotEmpty(dictItemList)) {
+			return dictItemList.stream().filter(item -> itemValue.equals(item.getItemValue())).findFirst().orElse(null);
+		}
+
+		return null;
+	}
+
+	/**
+	 * 根据字典类型以及字典标签获取字典项
+	 * @param type 字典类型
+	 * @param itemLabel 字典数据项标签
+	 * @return 字典数据项
+	 */
+	public SysDictItem getDictItemByItemLabel(String type, String itemLabel) {
+		Assert.isTrue(StringUtils.isNotBlank(type) && StringUtils.isNotBlank(itemLabel), "参数不合法");
+
+		List<SysDictItem> dictItemList = getDictItemsByType(type);
+
+		if (CollectionUtils.isNotEmpty(dictItemList)) {
+			return dictItemList.stream().filter(item -> itemLabel.equals(item.getLabel())).findFirst().orElse(null);
+		}
+
+		return null;
+	}
+
+}

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteDictService.java

@@ -0,0 +1,29 @@
+package com.pig4cloud.pigx.admin.api.feign;
+
+import com.pig4cloud.pigx.admin.api.entity.SysDictItem;
+import com.pig4cloud.pigx.common.core.constant.ServiceNameConstants;
+import com.pig4cloud.pigx.common.core.util.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @author lengleng
+ * @date 2020/5/12
+ * <p>
+ * 查询参数相关
+ */
+@FeignClient(contextId = "remoteDictService", value = ServiceNameConstants.UPMS_SERVICE)
+public interface RemoteDictService {
+
+	/**
+	 * 通过字典类型查找字典
+	 * @param type 字典类型
+	 * @return 同类型字典
+	 */
+	@GetMapping("/dict/type/{type}")
+	R<List<SysDictItem>> getDictByType(@PathVariable("type") String type);
+
+}

pigx-upms/pigx-upms-api/src/main/resources/META-INF/spring.factories

@@ -6,4 +6,5 @@ com.pig4cloud.pigx.common.feign.PigxFeignAutoConfiguration=\
   com.pig4cloud.pigx.admin.api.feign.RemoteParamService,\
   com.pig4cloud.pigx.admin.api.feign.RemoteTenantService,\
   com.pig4cloud.pigx.admin.api.feign.RemoteTokenService,\
-  com.pig4cloud.pigx.admin.api.feign.RemoteUserService
+  com.pig4cloud.pigx.admin.api.feign.RemoteUserService,\
+  com.pig4cloud.pigx.admin.api.feign.RemoteDictService

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java

@@ -37,6 +37,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -83,7 +84,7 @@ public class SysDictController {
 	 */
 	@GetMapping("/type/{type}")
 	@Cacheable(value = CacheConstants.DICT_DETAILS, key = "#type", unless = "#result.data.isEmpty()")
-	public R getDictByType(@PathVariable String type) {
+	public R<List<SysDictItem>> getDictByType(@PathVariable String type) {
 		return R.ok(sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getDictType, type)));
 	}