From aae6afdaa70a313cb3b8a282301ea1ba18e59630 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 24 Jan 2022 10:48:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?local=20=E4=B8=8D=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/filter/LogMsgSendFilter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java index 33807f7f08..d0ba1f61de 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/filter/LogMsgSendFilter.java @@ -48,6 +48,10 @@ public class LogMsgSendFilter extends LevelFilter { if (event.getLevel().isGreaterOrEqual(Level.ERROR)) { try { getServerInfo(); + if (EnvEnum.LOCAL.getName().equals(activeEnv)){ + //交给其他filter继续向下处理 + return super.decide(event); + } StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("【日志告警】\n"); @@ -62,7 +66,6 @@ public class LogMsgSendFilter extends LevelFilter { } if (StringUtils.isNotBlank(activeEnv)) { - stringBuilder.append("告警环境：").append(activeEnv); stringBuilder.append("\n"); } @@ -109,6 +112,7 @@ public class LogMsgSendFilter extends LevelFilter { if (!flag) { logger.warn("msgSender.sendMsg fail,param：{}", stringBuilder.toString()); } + stringBuilder.append("告警环境：").append(activeEnv); } catch (Exception e) { logger.warn("decide exception", e); } From 69407626f21674d8545ab62adde376367001e62f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 24 Jan 2022 14:13:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=201.=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E6=90=9C=E7=B4=A2(=E5=B1=85=E6=B0=91)=EF=BC=9Aconditi?= =?UTF-8?q?ons=E4=B8=BAnull=E7=9A=84bug=202.=E7=A4=BE=E5=8C=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2(=E6=88=BF=E5=B1=8B)=EF=BC=9A=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 2 +- .../main/java/com/epmet/controller/IcResiUserController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 7411fb6575..01e2276fac 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -130,7 +130,7 @@ LEFT JOIN ic_building_unit d on a.BUILDING_UNIT_ID = d.ID and d.DEL_FLAG = '0' - AND c.AGENCY_PIDS like CONCAT(#{pids},'%') + AND CONCAT(c.AGENCY_PIDS,':',c.AGENCY_ID) like CONCAT(#{pids},'%') AND a.BUILDING_ID = #{buildingId} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 9c2113a603..1350ce159f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -660,6 +660,7 @@ public class IcResiUserController { input.setCustomerId(loginUser.getCustomerId()); input.setStaffId(loginUser.getUserId()); input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); + input.setConditions(new ArrayList<>()); if (input.getPageNo() == null) { input.setPageNo(NumConstant.ONE); }