zhangherong
2025-04-22 ecb37e69b4b9587de63a584064688442cf4b64b7
art: 设备管理-点检工单-字典翻译
已添加1个文件
已修改2个文件
230 ■■■■■ 文件已修改
lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-boot-base-core/src/main/java/org/jeecg/common/util/TranslateDictTextUtils.java 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java
@@ -89,6 +89,7 @@
     *               }
     *             }
     *             ç›®å‰vue是这么进行字典渲染到table上的多了就很麻烦了 è¿™ä¸ªç›´æŽ¥åœ¨æœåŠ¡ç«¯æ¸²æŸ“å®Œæˆå‰ç«¯å¯ä»¥ç›´æŽ¥ç”¨
     *
     * @param result
     */
    private Object parseDictText(Object result) {
@@ -217,6 +218,7 @@
     * ä¸€æ¬¡æ€§æŠŠæ‰€æœ‰çš„字典都翻译了
     * 1.  æ‰€æœ‰çš„æ™®é€šæ•°æ®å­—典的所有数据只执行一次SQL
     * 2.  è¡¨å­—典相同的所有数据只执行一次SQL
     *
     * @param dataListMap
     * @return
     */
@@ -353,6 +355,7 @@
    /**
     *  ç¿»è¯‘字典文本
     *
     * @param code
     * @param text
     * @param table
@@ -412,6 +415,7 @@
    /**
     * æ£€æµ‹è¿”回结果集中是否包含Dict注解
     *
     * @param records
     * @return
     */
lxzn-boot-base-core/src/main/java/org/jeecg/common/util/TranslateDictTextUtils.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,197 @@
package org.jeecg.common.util;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.vo.DictModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Component
@Slf4j
public class TranslateDictTextUtils {
    @Lazy
    @Autowired
    private CommonAPI commonApi;
    @Autowired
    private RedisTemplate redisTemplate;
    public void translateField(String field, String value, JSONObject item, String dictCode) {
        if (StringUtils.isBlank(value)) {
            item.put(field + CommonConstant.DICT_TEXT_SUFFIX, null);
            return;
        }
        // å­—典数据列表, key = å­—å…¸code,value=数据列表
        Map<String, List<String>> dataListMap = new HashMap<>(5);
        dataListMap.put(dictCode, this.listAddAllDeduplicate(new ArrayList<>(), Arrays.asList(value.split(","))));
        //step.2 è°ƒç”¨ç¿»è¯‘方法,一次性翻译
        Map<String, List<DictModel>> translText = this.translateAllDict(dataListMap);
        //翻译
        List<DictModel> dictModels = translText.get(dictCode);
        if (CollectionUtil.isEmpty(dictModels)) {
            item.put(field + CommonConstant.DICT_TEXT_SUFFIX, null);
            return;
        }
        String textValue = this.translDictText(dictModels, value);
        item.put(field + CommonConstant.DICT_TEXT_SUFFIX, textValue);
    }
    /**
     * å­—典值替换文本
     *
     * @param dictModels
     * @param values
     * @return
     */
    private String translDictText(List<DictModel> dictModels, String values) {
        List<String> result = new ArrayList<>();
        // å…è®¸å¤šä¸ªé€—号分隔,允许传数组对象
        String[] splitVal = values.split(",");
        for (String val : splitVal) {
            String dictText = val;
            for (DictModel dict : dictModels) {
                if (val.equals(dict.getValue())) {
                    dictText = dict.getText();
                    break;
                }
            }
            result.add(dictText);
        }
        return String.join(",", result);
    }
    /**
     * list åŽ»é‡æ·»åŠ 
     */
    private List<String> listAddAllDeduplicate(List<String> dataList, List<String> addList) {
        // ç­›é€‰å‡ºdataList中没有的数据
        List<String> filterList = addList.stream().filter(i -> !dataList.contains(i)).collect(Collectors.toList());
        dataList.addAll(filterList);
        return dataList;
    }
    /**
     * ä¸€æ¬¡æ€§æŠŠæ‰€æœ‰çš„字典都翻译了
     * 1.  æ‰€æœ‰çš„æ™®é€šæ•°æ®å­—典的所有数据只执行一次SQL
     * 2.  è¡¨å­—典相同的所有数据只执行一次SQL
     *
     * @param dataListMap
     * @return
     */
    private Map<String, List<DictModel>> translateAllDict(Map<String, List<String>> dataListMap) {
        // ç¿»è¯‘后的字典文本,key=dictCode
        Map<String, List<DictModel>> translText = new HashMap<>(5);
        // éœ€è¦ç¿»è¯‘的数据(有些可以从redis缓存中获取,就不走数据库查询)
        List<String> needTranslData = new ArrayList<>();
        //step.1 å…ˆé€šè¿‡redis中获取缓存字典数据
        for (String dictCode : dataListMap.keySet()) {
            List<String> dataList = dataListMap.get(dictCode);
            if (dataList.size() == 0) {
                continue;
            }
            // è¡¨å­—典需要翻译的数据
            List<String> needTranslDataTable = new ArrayList<>();
            for (String s : dataList) {
                String data = s.trim();
                if (data.length() == 0) {
                    continue; //跳过循环
                }
                if (dictCode.contains(",")) {
                    String keyString = String.format("sys:cache:dictTable::SimpleKey [%s,%s]", dictCode, data);
                    if (redisTemplate.hasKey(keyString)) {
                        try {
                            String text = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString));
                            List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>());
                            list.add(new DictModel(data, text));
                        } catch (Exception e) {
                            log.warn(e.getMessage());
                        }
                    } else if (!needTranslDataTable.contains(data)) {
                        // åŽ»é‡æ·»åŠ 
                        needTranslDataTable.add(data);
                    }
                } else {
                    String keyString = String.format("sys:cache:dict::%s:%s", dictCode, data);
                    if (redisTemplate.hasKey(keyString)) {
                        try {
                            String text = oConvertUtils.getString(redisTemplate.opsForValue().get(keyString));
                            List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>());
                            list.add(new DictModel(data, text));
                        } catch (Exception e) {
                            log.warn(e.getMessage());
                        }
                    } else if (!needTranslData.contains(data)) {
                        // åŽ»é‡æ·»åŠ 
                        needTranslData.add(data);
                    }
                }
            }
            //step.2 è°ƒç”¨æ•°æ®åº“翻译表字典
            if (needTranslDataTable.size() > 0) {
                String[] arr = dictCode.split(",");
                String table = arr[0], text = arr[1], code = arr[2];
                String values = String.join(",", needTranslDataTable);
                log.debug("translateDictFromTableByKeys.dictCode:" + dictCode);
                log.debug("translateDictFromTableByKeys.values:" + values);
                List<DictModel> texts = commonApi.translateDictFromTableByKeys(table, text, code, values);
                log.debug("translateDictFromTableByKeys.result:" + texts);
                List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>());
                list.addAll(texts);
                // åš redis ç¼“å­˜
                for (DictModel dict : texts) {
                    String redisKey = String.format("sys:cache:dictTable::SimpleKey [%s,%s]", dictCode, dict.getValue());
                    try {
                        // update-begin-author:taoyan date:20211012 for: å­—典表翻译注解缓存未更新 issues/3061
                        // ä¿ç•™5分钟
                        redisTemplate.opsForValue().set(redisKey, dict.getText(), 300, TimeUnit.SECONDS);
                        // update-end-author:taoyan date:20211012 for: å­—典表翻译注解缓存未更新 issues/3061
                    } catch (Exception e) {
                        log.warn(e.getMessage(), e);
                    }
                }
            }
        }
        //step.3 è°ƒç”¨æ•°æ®åº“进行翻译普通字典
        if (needTranslData.size() > 0) {
            List<String> dictCodeList = Arrays.asList(dataListMap.keySet().toArray(new String[]{}));
            // å°†ä¸åŒ…含逗号的字典code筛选出来,因为带逗号的是表字典,而不是普通的数据字典
            List<String> filterDictCodes = dictCodeList.stream().filter(key -> !key.contains(",")).collect(Collectors.toList());
            String dictCodes = String.join(",", filterDictCodes);
            String values = String.join(",", needTranslData);
            log.debug("translateManyDict.dictCodes:" + dictCodes);
            log.debug("translateManyDict.values:" + values);
            Map<String, List<DictModel>> manyDict = commonApi.translateManyDict(dictCodes, values);
            log.debug("translateManyDict.result:" + manyDict);
            for (String dictCode : manyDict.keySet()) {
                List<DictModel> list = translText.computeIfAbsent(dictCode, k -> new ArrayList<>());
                List<DictModel> newList = manyDict.get(dictCode);
                list.addAll(newList);
                // åš redis ç¼“å­˜
                for (DictModel dict : newList) {
                    String redisKey = String.format("sys:cache:dict::%s:%s", dictCode, dict.getValue());
                    try {
                        redisTemplate.opsForValue().set(redisKey, dict.getText());
                    } catch (Exception e) {
                        log.warn(e.getMessage(), e);
                    }
                }
            }
        }
        return translText;
    }
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -1,13 +1,18 @@
package org.jeecg.modules.eam.controller;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
@@ -21,7 +26,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.*;
 /**
 * @Description: ç‚¹æ£€å·¥å•
@@ -38,6 +43,11 @@
     private IEamInspectionOrderService eamInspectionOrderService;
     @Autowired
     private ISysBusinessCodeRuleService businessCodeRuleService;
     @Autowired
     private ObjectMapper objectMapper;
     @Autowired
     private TranslateDictTextUtils translateDictTextUtils;
    /**
     * åˆ†é¡µåˆ—表查询
@@ -197,12 +207,25 @@
    //@AutoLog(value = "点检工单-通过id查询")
    @ApiOperation(value="点检工单-通过id查询", notes="点检工单-通过id查询")
    @GetMapping(value = "/queryById")
    public Result<EamInspectionOrder> queryById(@RequestParam(name="id",required=true) String id) {
    public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
        EamInspectionOrder eamInspectionOrder = eamInspectionOrderService.getById(id);
        if(eamInspectionOrder==null) {
            return Result.error("未找到对应数据");
        }
        return Result.OK(eamInspectionOrder);
        try {
            String json = objectMapper.writeValueAsString(eamInspectionOrder);
            JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
            translateDictTextUtils.translateField("createBy", eamInspectionOrder.getCreateBy(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("standardId", eamInspectionOrder.getStandardId(), item, "eam_maintenance_standard,standard_name,id");
            translateDictTextUtils.translateField("operator", eamInspectionOrder.getOperator(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("creationMethod", eamInspectionOrder.getCreationMethod(), item, "order_creation_method");
            translateDictTextUtils.translateField("inspectionStatus", eamInspectionOrder.getInspectionStatus(), item, "inspection_status");
            translateDictTextUtils.translateField("confirmUser", eamInspectionOrder.getConfirmUser(), item, "sys_user,realname,username");
            translateDictTextUtils.translateField("confirmDealType", eamInspectionOrder.getConfirmDealType(), item, "approved_rejected");
            return Result.OK(item);
        } catch (JsonProcessingException e) {
            return Result.error("数据转译失败!");
        }
    }
    /**