item：应急处置解决动作执行实时性问题

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/ContingencyAction.java

@@ -52,8 +52,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -353,6 +352,7 @@ public class ContingencyAction implements CustomerAction {
      * @param paramObj 预案对象
      */
     @RuleMethod(methodLabel = "执行记录", project = "换流站消防专项预案")
+    @Transactional
     public void messageRecord(@MethodParam(paramLabel = "消息内容") String content, @MethodParam(paramLabel = "对象") Object paramObj) {
         ContingencyRo contingencyRo = (ContingencyRo) paramObj;
         String batchNo = contingencyRo.getBatchNo();
@@ -372,36 +372,30 @@ public class ContingencyAction implements CustomerAction {
             content = instedParams(content, contingencyRo);
             iContingencyInstance.createInstanceRecord(contingencyRo.getBatchNo(), "", "DEFAULT", content, "MESSAGE", "");
 
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-                @Override
-                public void afterCommit() {
-                    // 事物提交后业务逻辑
-                    SafteyPlanResult result = new SafteyPlanResult();
-                    Map<String, Object> tempmap1 = new HashMap<>();
-                    try {
-                        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                        List<ContingencyPlanInstance> list = iContingencyInstance.queryForTimeLine(contingencyRo.getBatchNo(), "MESSAGE");
-                        ArrayList records = new ArrayList<>();
-                        if (!ObjectUtils.isEmpty(list)) {
-                            list.forEach(action -> {
-                                HashMap map = new HashMap();
-                                map.put("time", sdf1.format(action.getCreateDate().getTime()));
-                                map.put("stepName", action.getContent());
-                                records.add(map);
-                            });
-                        }
-                        tempmap1.put("content", records);
-                        tempmap1.put("status", PlanRecordStatusEnum.OPERATION.getCode());
-                    } catch (Exception e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                    }
-                    result.add(tempmap1);
-                    System.out.println("--------------------messageRecord----------------------" + result);
-                    sendcmd("recordarea", paramObj, result);
-                    sendweb("recordarea", paramObj, result);
+            SafteyPlanResult result = new SafteyPlanResult();
+            Map<String, Object> tempmap1 = new HashMap<>();
+            try {
+                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                List<ContingencyPlanInstance> list = iContingencyInstance.queryForTimeLine(contingencyRo.getBatchNo(), "MESSAGE");
+                ArrayList records = new ArrayList<>();
+                if (!ObjectUtils.isEmpty(list)) {
+                    list.forEach(action -> {
+                        HashMap map = new HashMap();
+                        map.put("time", sdf1.format(action.getCreateDate().getTime()));
+                        map.put("stepName", action.getContent());
+                        records.add(map);
+                    });
                 }
-            });
+                tempmap1.put("content", records);
+                tempmap1.put("status", PlanRecordStatusEnum.OPERATION.getCode());
+            } catch (Exception e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            result.add(tempmap1);
+            System.out.println("--------------------messageRecord----------------------" + result);
+            sendcmd("recordarea", paramObj, result);
+            sendweb("recordarea", paramObj, result);
         }
     }