Merge branch 'develop_master' into FOTON

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<String, Object> newMap = new HashMap<>();
+            newMap.put("textStatus", verifyObj(textStatusStand));
+            Map<String, Object> 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;
+    }
+
 
     /**
      * 获取属性字段

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<String, Object> newMap = new HashMap<>();
+            newMap.put("textStatus", verifyObj(textStatusStand));
+            Map<String, Object> 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;
+    }
+
 
     /**
      * 获取属性字段

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<String, Object> newMap = new HashMap<>();
+            newMap.put("textStatus", verifyObj(textStatusStand));
+            Map<String, Object> 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();

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<String, Object> newMap = new HashMap<>();
+            newMap.put("textStatus", verifyObj(textStatusStand));
+            Map<String, Object> 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();