From 2ef63ef8751532c0ca7c2a539753976e6c4fe78d Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 19 Aug 2022 17:26:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=9B=B4=E6=96=B0LOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/UpdateStateBussSyncFz.java | 26 ++++++++++++++++ .../server/UpdateStateBussSyncSsAndYx.java | 25 ++++++++++++++++ .../server/UpdateStateStandSyncFz.java | 30 +++++++++++++++++++ .../server/UpdateStateStandSyncSsAndYx.java | 29 ++++++++++++++++++ 4 files changed, 110 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java index bdcce2e5..965bda7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java @@ -1,6 +1,7 @@ package com.adc.da.scheduledState.server; import com.adc.da.common.GetBeanUtil; +import com.adc.da.common.SarTypeEnum; import com.adc.da.mq.CreateStandMQService; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.search.bean.SearchCenter; @@ -11,6 +12,7 @@ import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -55,6 +57,9 @@ public class UpdateStateBussSyncFz implements Runnable { private ISarBussStandAttrInfoService sarBussStandAttrInfoService; private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + + private ISarUpdLogService sarUpdLogEOService; + /** * 根据配置文件设置是否开启定时器 */ @@ -68,6 +73,7 @@ public class UpdateStateBussSyncFz implements Runnable { dicTypeEODao = GetBeanUtil.getApplicationContext().getBean(DicTypeEODao.class); personCollectEOService = GetBeanUtil.getApplicationContext().getBean(IPersonCollectEOService.class); sarBussStandAttrInfoEODao = GetBeanUtil.getApplicationContext().getBean(SarBussStandAttrInfoDao.class); + sarUpdLogEOService = GetBeanUtil.getApplicationContext().getBean(ISarUpdLogService.class); } @@ -150,6 +156,8 @@ public class UpdateStateBussSyncFz implements Runnable { } createStandMQService.sendBussStandMQ(info,"update"); + saveUpdateLog(info,textStatusStand); + // 只批量更新文本字段 SarBussionessStand newInfo = new SarBussionessStand(); newInfo.setTextStatusBuss(textStatusStand); @@ -163,6 +171,24 @@ public class UpdateStateBussSyncFz implements Runnable { } } + public void saveUpdateLog(SarBussionessStand sarStandardsInfoEO, String textStatusStand){ + try { + Map newMap = new HashMap<>(); + newMap.put("textStatus", verifyObj(textStatusStand)); + Map oldMap = new HashMap<>(); + oldMap.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatusBuss())); + + String content = sarStandardsInfoEO.getStandCode() + " 《" + sarStandardsInfoEO.getStandName() + "》"; + sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content); + }catch (Exception e){ + System.out.println(e.getMessage()); + } + } + + private Object verifyObj(Object str) { + return str == null ? "" : str; + } + /** * 获取属性字段 diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java index 4e92432d..edcb7719 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncSsAndYx.java @@ -1,6 +1,7 @@ package com.adc.da.scheduledState.server; import com.adc.da.common.GetBeanUtil; +import com.adc.da.common.SarTypeEnum; import com.adc.da.mq.CreateStandMQService; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.scheduledState.utils.Util; @@ -11,6 +12,7 @@ import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -57,6 +59,8 @@ public class UpdateStateBussSyncSsAndYx implements Runnable { private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao; + private ISarUpdLogService sarUpdLogEOService; + /** * 根据配置文件设置是否开启定时器 */ @@ -70,6 +74,7 @@ public class UpdateStateBussSyncSsAndYx implements Runnable { dicTypeEODao = GetBeanUtil.getApplicationContext().getBean(DicTypeEODao.class); personCollectEOService = GetBeanUtil.getApplicationContext().getBean(IPersonCollectEOService.class); sarBussStandAttrInfoEODao = GetBeanUtil.getApplicationContext().getBean(SarBussStandAttrInfoDao.class); + sarUpdLogEOService = GetBeanUtil.getApplicationContext().getBean(ISarUpdLogService.class); } @@ -175,6 +180,8 @@ public class UpdateStateBussSyncSsAndYx implements Runnable { } createStandMQService.sendBussStandMQ(info,"update"); + saveUpdateLog(info,textStatusStand); + // 只批量更新文本字段 SarBussionessStand newInfo = new SarBussionessStand(); newInfo.setTextStatusBuss(textStatusStand); @@ -188,6 +195,24 @@ public class UpdateStateBussSyncSsAndYx implements Runnable { } } + public void saveUpdateLog(SarBussionessStand sarStandardsInfoEO, String textStatusStand){ + try { + Map newMap = new HashMap<>(); + newMap.put("textStatus", verifyObj(textStatusStand)); + Map oldMap = new HashMap<>(); + oldMap.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatusBuss())); + + String content = sarStandardsInfoEO.getStandCode() + " 《" + sarStandardsInfoEO.getStandName() + "》"; + sarUpdLogEOService.createUpdateLog(SarTypeEnum.BUSINESS.getValue(),sarStandardsInfoEO.getId(),oldMap,newMap,content); + }catch (Exception e){ + System.out.println(e.getMessage()); + } + } + + private Object verifyObj(Object str) { + return str == null ? "" : str; + } + /** * 获取属性字段 diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java index 4ab1d670..be8a481e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncFz.java @@ -13,6 +13,8 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; +import com.adc.da.slrs.sysLog.entity.SysLog; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -58,6 +60,8 @@ public class UpdateStateStandSyncFz implements Runnable { private ISarStandAttrInfoService sarStandAttrInfoEOService; + private ISarUpdLogService sarUpdLogEOService; + /** * 根据配置文件设置是否开启定时器 @@ -75,6 +79,7 @@ public class UpdateStateStandSyncFz implements Runnable { sarStandardsInfoDao = GetBeanUtil.getApplicationContext().getBean(SarStandardsInfoDao.class); iSarStandardsInfoService = GetBeanUtil.getApplicationContext().getBean(ISarStandardsInfoService.class); sarStandAttrInfoEOService = GetBeanUtil.getApplicationContext().getBean(ISarStandAttrInfoService.class); + sarUpdLogEOService = GetBeanUtil.getApplicationContext().getBean(ISarUpdLogService.class); } @@ -231,6 +236,7 @@ public class UpdateStateStandSyncFz implements Runnable { standFunc(info); createStandMQService.sendStandMQ(info,"update"); + saveUpdateLog(info,textStatusStand); // 只批量更新文本字段 SarStandardsInfo newInfo = new SarStandardsInfo(); newInfo.setTextStatus(textStatusStand); @@ -244,6 +250,30 @@ public class UpdateStateStandSyncFz implements Runnable { } } + public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, String textStatusStand){ + try { + Map newMap = new HashMap<>(); + newMap.put("textStatus", verifyObj(textStatusStand)); + Map oldMap = new HashMap<>(); + oldMap.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatus())); + + // 增加关联事件 + String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { + number += "-" + sarStandardsInfoEO.getStandYear(); + } + String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》"; + sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); + }catch (Exception e){ + System.out.println(e.getMessage()); + } + } + + private Object verifyObj(Object str) { + return str == null ? "" : str; + } + + private void standFunc(SarStandardsInfo sarStandardsInfoEO) throws Exception { attrInfoSearchDetails(sarStandardsInfoEO); FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java index 4721244c..1e17fa14 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java +++ b/adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateStandSyncSsAndYx.java @@ -13,6 +13,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; +import com.adc.da.slrs.sarUpdLog.service.ISarUpdLogService; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.utils.util.FieldConvertUtil; import com.adc.da.utils.util.InitStandAttrUtil; @@ -63,6 +64,8 @@ public class UpdateStateStandSyncSsAndYx implements Runnable { private ISarStandAttrInfoService sarStandAttrInfoEOService; + private ISarUpdLogService sarUpdLogEOService; + /** * 根据配置文件设置是否开启定时器 @@ -79,6 +82,7 @@ public class UpdateStateStandSyncSsAndYx implements Runnable { sarStandardsInfoDao = GetBeanUtil.getApplicationContext().getBean(SarStandardsInfoDao.class); iSarStandardsInfoService = GetBeanUtil.getApplicationContext().getBean(ISarStandardsInfoService.class); sarStandAttrInfoEOService = GetBeanUtil.getApplicationContext().getBean(ISarStandAttrInfoService.class); + sarUpdLogEOService = GetBeanUtil.getApplicationContext().getBean(ISarUpdLogService.class); } @@ -175,6 +179,8 @@ public class UpdateStateStandSyncSsAndYx implements Runnable { standFunc(info); createStandMQService.sendStandMQ(info,"update"); + saveUpdateLog(info,textStatusStand); + // 只批量更新文本字段 SarStandardsInfo newInfo = new SarStandardsInfo(); newInfo.setTextStatus(textStatusStand); @@ -188,6 +194,29 @@ public class UpdateStateStandSyncSsAndYx implements Runnable { } } + public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, String textStatusStand){ + try { + Map newMap = new HashMap<>(); + newMap.put("textStatus", verifyObj(textStatusStand)); + Map oldMap = new HashMap<>(); + oldMap.put("textStatus", verifyObj(sarStandardsInfoEO.getTextStatus())); + + // 增加关联事件 + String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber(); + if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) { + number += "-" + sarStandardsInfoEO.getStandYear(); + } + String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》"; + sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content); + }catch (Exception e){ + System.out.println(e.getMessage()); + } + } + + private Object verifyObj(Object str) { + return str == null ? "" : str; + } + private void standFunc(SarStandardsInfo sarStandardsInfoEO) throws Exception { attrInfoSearchDetails(sarStandardsInfoEO); FindSarItemsPageReqDTO pageInfo = new FindSarItemsPageReqDTO();