网关白名单放入nacos配置&支持模糊匹配

RuoYi

2020-09-13 dbadce31c6fa6038423dab044cf5209677dbf132

 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -4,7 +4,6 @@
import java.io.InputStream;

import java.io.OutputStream;

import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.math.BigDecimal;

import java.text.DecimalFormat;

import java.util.ArrayList;

@@ -14,6 +13,7 @@
import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.Set;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;

import org.apache.poi.hssf.usermodel.HSSFDateUtil;

@@ -96,6 +96,16 @@
     * 注解列表

     */

    private List<Object[]> fields;



    /**

     * 统计列表

     */

    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();



    /**

     * 数字格式

     */

    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");



    /**

     * 实体对象

@@ -194,7 +204,10 @@
                    // 设置类的私有字段属性可访问.

                    field.setAccessible(true);

                    Integer column = cellMap.get(attr.name());

                    fieldsMap.put(column, field);

                    if (column != null)

                    {

                        fieldsMap.put(column, field);

                    }

                }

            }

            for (int i = 1; i < rows; i++)

@@ -265,7 +278,7 @@
                        }

                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        {

                            val = reverseByExp(String.valueOf(val), attr.readConverterExp());

                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());

                        }

                        ReflectUtils.invokeSetter(entity, propertyName, val);

                    }

@@ -334,6 +347,7 @@
                if (Type.EXPORT.equals(type))

                {

                    fillExcelData(index, row);

                    addStatisticsRow();

                }

            }

            wb.write(outputStream);

@@ -436,6 +450,15 @@
        headerFont.setColor(IndexedColors.WHITE.getIndex());

        style.setFont(headerFont);

        styles.put("header", style);

        
        style = wb.createCellStyle();

        style.setAlignment(HorizontalAlignment.CENTER);

        style.setVerticalAlignment(VerticalAlignment.CENTER);

        Font totalFont = wb.createFont();

        totalFont.setFontName("Arial");

        totalFont.setFontHeightInPoints((short) 10);

        style.setFont(totalFont);

        styles.put("total", style);



        return styles;

    }

@@ -465,7 +488,7 @@
    {

        if (ColumnType.STRING == attr.cellType())

        {

            cell.setCellType(CellType.NUMERIC);

            cell.setCellType(CellType.STRING);

            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());

        }

        else if (ColumnType.NUMERIC == attr.cellType())

@@ -525,19 +548,25 @@
                Object value = getTargetValue(vo, field, attr);

                String dateFormat = attr.dateFormat();

                String readConverterExp = attr.readConverterExp();

                String separator = attr.separator();

                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))

                {

                    cell.setCellValue(DateUtils.parseDateToStr(dateFormat, (Date) value));

                }

                else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))

                {

                    cell.setCellValue(convertByExp(String.valueOf(value), readConverterExp));

                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));

                }

                else if (value instanceof BigDecimal && -1 != attr.scale())

                {

                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());

                }

                else

                {

                    // 设置列类型

                    setCellVo(value, attr, cell);

                }

                addStatisticsData(column, Convert.toStr(value), attr);

            }

        }

        catch (Exception e)

@@ -609,28 +638,36 @@
     * 

     * @param propertyValue 参数值

     * @param converterExp 翻译注解

     * @param separator 分隔符

     * @return 解析后值

     * @throws Exception

     */

    public static String convertByExp(String propertyValue, String converterExp) throws Exception

    public static String convertByExp(String propertyValue, String converterExp, String separator)

    {

        try

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        for (String item : convertSource)

        {

            String[] convertSource = converterExp.split(",");

            for (String item : convertSource)

            String[] itemArray = item.split("=");

            if (StringUtils.containsAny(separator, propertyValue))

            {

                String[] itemArray = item.split("=");

                for (String value : propertyValue.split(separator))

                {

                    if (itemArray[0].equals(value))

                    {

                        propertyString.append(itemArray[1] + separator);

                        break;

                    }

                }

            }

            else

            {

                if (itemArray[0].equals(propertyValue))

                {

                    return itemArray[1];

                }

            }

        }

        catch (Exception e)

        {

            throw e;

        }

        return propertyValue;

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**

@@ -638,28 +675,83 @@
     * 

     * @param propertyValue 参数值

     * @param converterExp 翻译注解

     * @param separator 分隔符

     * @return 解析后值

     * @throws Exception

     */

    public static String reverseByExp(String propertyValue, String converterExp) throws Exception

    public static String reverseByExp(String propertyValue, String converterExp, String separator)

    {

        try

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        for (String item : convertSource)

        {

            String[] convertSource = converterExp.split(",");

            for (String item : convertSource)

            String[] itemArray = item.split("=");

            if (StringUtils.containsAny(separator, propertyValue))

            {

                String[] itemArray = item.split("=");

                for (String value : propertyValue.split(separator))

                {

                    if (itemArray[1].equals(value))

                    {

                        propertyString.append(itemArray[0] + separator);

                        break;

                    }

                }

            }

            else

            {

                if (itemArray[1].equals(propertyValue))

                {

                    return itemArray[0];

                }

            }

        }

        catch (Exception e)

        return StringUtils.stripEnd(propertyString.toString(), separator);

    }



    /**

     * 合计统计信息

     */

    private void addStatisticsData(Integer index, String text, Excel entity)

    {

        if (entity != null && entity.isStatistics())

        {

            throw e;

            Double temp = 0D;

            if (!statistics.containsKey(index))

            {

                statistics.put(index, temp);

            }

            try

            {

                temp = Double.valueOf(text);

            }

            catch (NumberFormatException e)

            {

            }

            statistics.put(index, statistics.get(index) + temp);

        }

        return propertyValue;

    }



    /**

     * 创建统计行

     */

    public void addStatisticsRow()

    {

        if (statistics.size() > 0)

        {

            Cell cell = null;

            Row row = sheet.createRow(sheet.getLastRowNum() + 1);

            Set<Integer> keys = statistics.keySet();

            cell = row.createCell(0);

            cell.setCellStyle(styles.get("total"));

            cell.setCellValue("合计");



            for (Integer key : keys)

            {

                cell = row.createCell(key);

                cell.setCellStyle(styles.get("total"));

                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));

            }

            statistics.clear();

        }

    }



    /**

@@ -706,9 +798,9 @@
        if (StringUtils.isNotEmpty(name))

        {

            Class<?> clazz = o.getClass();

            String methodName = "get" + name.substring(0, 1).toUpperCase() + name.substring(1);

            Method method = clazz.getMethod(methodName);

            o = method.invoke(o);

            Field field = clazz.getDeclaredField(name);

            field.setAccessible(true);

            o = field.get(o);

        }

        return o;

    }

@@ -814,7 +906,7 @@
                    {

                        if ((Double) val % 1 > 0)

                        {

                            val = new DecimalFormat("0.00").format(val);

                            val = new BigDecimal(val.toString());

                        }

                        else

                        {