更新

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/ContingencyPlanController.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.fas.business.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.fas.business.service.impl.EmergencyTaskServiceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyPlanService;
+import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.vo.*;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil2;
@@ -30,7 +31,7 @@ public class ContingencyPlanController extends BaseController {
     private IContingencyPlanService contingencyPlanService;
 
     @Autowired
-    private EmergencyTaskServiceImpl emergencyTaskService;
+    private IEmergencyTaskService emergencyTaskService;
 
     /**
      * 创建数字预案

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java

 package com.yeejoin.amos.fas.business.controller;
 
 import com.yeejoin.amos.fas.business.service.impl.EmergencyTaskServiceImpl;
+import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.util.StringUtil;
 import com.yeejoin.amos.fas.business.vo.ContingencyPlanInstanceVO;
@@ -45,7 +46,7 @@ public class PlanVisual3dController extends BaseController {
     private IPlanVisual3dService planVisual3dService;
 
     @Autowired
-    private EmergencyTaskServiceImpl emergencyTaskService;
+    private IEmergencyTaskService emergencyTaskService;
 
     @Autowired
     HttpServletResponse response;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ContingencyInstanceImpl.java

@@ -151,7 +151,7 @@ public class ContingencyInstanceImpl implements IContingencyInstance {
     private ApplicationEventPublisher applicationContext;
 
     @Autowired
-    private EmergencyTaskServiceImpl emergencyTaskService;
+    private IEmergencyTaskService emergencyTaskService;
 
     @Autowired
     JcsFeign jcsFeign;

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/EmergencyTaskServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.CollectionUtils;
@@ -43,10 +44,8 @@ import java.util.*;
 @Service
 public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
 
-    public static final Logger log = LoggerFactory.getLogger(EmergencyTaskServiceImpl.class);
-
     @Autowired
-    EmergencyTaskMapper emergencyTaskMapper;
+    private EmergencyTaskMapper emergencyTaskMapper;
 
     @Autowired
     private IContingencyInstance iContingencyInstance;
@@ -121,8 +120,8 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
         return emergencyTaskMapper.getPersonIds(obligationId);
     }
 
-    @Override
     @Async
+    @Override
     public void saveTask(String stepCode, String batchId) {
         List<EmergencyTaskContentVo> list = emergencyTaskMapper.getContentList(stepCode);
         if (0 < list.size()) {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/PlanVisual3dServiceImpl.java

@@ -15,6 +15,7 @@ import com.yeejoin.amos.fas.business.feign.JcsFeign;
 import com.yeejoin.amos.fas.business.feign.PrivilegeFeign;
 import com.yeejoin.amos.fas.business.feign.RemoteSecurityService;
 import com.yeejoin.amos.fas.business.service.intfc.IDictService;
+import com.yeejoin.amos.fas.business.service.intfc.IEmergencyTaskService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanStepService;
 import com.yeejoin.amos.fas.business.service.intfc.IPlanVisual3dService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
@@ -124,7 +125,7 @@ public class PlanVisual3dServiceImpl implements IPlanVisual3dService {
     JcsFeign jcsFeign;
 
     @Autowired
-    private EmergencyTaskServiceImpl emergencyTaskService;
+    private IEmergencyTaskService emergencyTaskService;
 
     @Override
     public void uploadTextPlan(String appId, Map<String, String> pathNameMap) {