From 8f4bb21f9399f6dfe9aba30bfc95ad2440338387 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 23 Oct 2024 16:54:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=B1=BB=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/config/RemoteConfig.java | 90 ------------------- .../service/impl/PurchaseBindServiceImpl.java | 4 - 2 files changed, 94 deletions(-) delete mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/RemoteConfig.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/RemoteConfig.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/RemoteConfig.java deleted file mode 100644 index 64803918..00000000 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/config/RemoteConfig.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.bonus.material.purchase.config; - -import com.bonus.common.core.constant.SecurityConstants; -import com.bonus.common.core.web.domain.AjaxResult; -import com.bonus.system.api.RemoteDictDataService; -import com.bonus.system.api.RemoteUserService; -import com.bonus.system.api.domain.SysDictData; -import com.bonus.system.api.domain.SysUser; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 框架远程调用配置类 - * @Author ma_sh - * @create 2024/10/23 16:10 - */ -@Component -@Slf4j -public class RemoteConfig { - - @Resource - private RemoteDictDataService remoteDictDataService; - - @Resource - private RemoteUserService remoteUserService; - - /** - * 获取字典值 - * @param dictType - * @param dictLabel - * @return - */ - public String getDictValue(String dictType, String dictLabel) { - try { - Map dictMap = new LinkedHashMap<>(); - AjaxResult ajaxResult = remoteDictDataService.dictType(dictType, SecurityConstants.INNER); - if (ajaxResult.isSuccess()) { - // 假设 ajaxResult.get("data") 返回的是 List - List rawData = (List) ajaxResult.get("data"); - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - // 将 rawData 转换为 SysDictData 列表 - List dataList = rawData.stream() - .map(rawDatum -> objectMapper.convertValue(rawDatum, SysDictData.class)) - .collect(Collectors.toList()); - // 使用 Map 存储字典数据以提高查找速度 - dictMap = dataList.stream() - .collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel)); - } - return dictMap.get(dictLabel); - } catch (Exception e) { - log.error("远程调用查询字典键值失败:", e.getMessage()); - } - return null; - } - - /** - * 获取用户名 - * @param userId - * @return - */ - public String getUserName(String userId) { - try { - String userName = ""; - AjaxResult ajaxResult = remoteUserService.getInfo(Long.parseLong(userId), SecurityConstants.INNER); - if (ajaxResult.isSuccess()) { - // ajaxResult.get("data") 返回的是 LinkedHashMap - LinkedHashMap rawDataList = (LinkedHashMap) ajaxResult.get("data"); - ObjectMapper objectMapper = new ObjectMapper(); - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - if (rawDataList != null) { - SysUser sysUser = objectMapper.convertValue(rawDataList, SysUser.class); - userName = sysUser.getNickName(); - } - } - return userName; - } catch (IllegalArgumentException e) { - log.error("远程调用查询用户名失败:", e.getMessage()); - } - return null; - } -} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java index 3a47b537..4407f19c 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseBindServiceImpl.java @@ -8,7 +8,6 @@ import com.bonus.common.biz.enums.HttpCodeEnum; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.purchase.config.RemoteConfig; import com.bonus.material.purchase.dto.PurchaseDto; import com.bonus.material.purchase.mapper.PurchaseBindMapper; import com.bonus.material.purchase.service.IPurchaseBindService; @@ -42,9 +41,6 @@ public class PurchaseBindServiceImpl implements IPurchaseBindService { @Resource private TmTaskMapper tmTaskMapper; - @Resource - private RemoteConfig remoteConfig; - /** * 查询所有绑定信息 * @param dto