From a7d22d463d51ac2db72a3ec7d0ff58c018cf9042 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Sun, 27 Jan 2019 15:02:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=85=8D=E7=BD=AE-stream?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=87=BA-=E9=98=BB=E6=96=AD?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=AD=20=E9=98=BB=E6=96=AD=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20=E5=B0=81=E5=A0=B5=EF=BC=88=E4=B8=A2=E5=BC=83?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/excel/ExcelCsv.java | 8 ++++++++ src/main/java/com/nis/util/excel/ExportExcel.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/main/java/com/nis/util/excel/ExcelCsv.java b/src/main/java/com/nis/util/excel/ExcelCsv.java index 4dbee6de1..9cb812f03 100644 --- a/src/main/java/com/nis/util/excel/ExcelCsv.java +++ b/src/main/java/com/nis/util/excel/ExcelCsv.java @@ -297,6 +297,14 @@ public class ExcelCsv { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr); //如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了 val = msgProp.getProperty(dict,dict); + //业务配置-stream 阻断类型中 阻断 改为 封堵（丢弃） + if("block_type".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "serviceId").toString().equals("35") + || Reflections.invokeGetter(e, "serviceId").toString().equals("33") + || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){ + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } } } diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index d9ada668d..2d0e613e2 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -2266,6 +2266,14 @@ public class ExportExcel { String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr); //如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了 val = msgProp.getProperty(dict,dict); + //业务配置-stream 阻断类型中 阻断 改为 封堵（丢弃） + if("block_type".equals(ef.title()) && dict.equals("action_reject") + && (Reflections.invokeGetter(e, "serviceId").toString().equals("35") + || Reflections.invokeGetter(e, "serviceId").toString().equals("33") + || Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){ + dict="block_drop"; + val = msgProp.getProperty(dict,dict); + } } }