item：重点设备预案流程优化，状态修改

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

@@ -8,8 +8,11 @@ import com.yeejoin.amos.fas.business.service.intfc.IRuleRunningSnapshotService;
 import com.yeejoin.amos.fas.config.Permission;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
+import com.yeejoin.amos.fas.core.enums.NumberEnum;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+import com.yeejoin.amos.fas.core.util.DateUtil;
+import com.yeejoin.amos.fas.dao.entity.Equipment;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -22,10 +25,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/timeline")
@@ -94,7 +94,15 @@ public class TimeLineController extends BaseController{
 
         Map<String,String> map = new HashMap<>();
         redisTemplate.delete(RiskSourceServiceImpl.cacheKeyForCanBeRunning());
-        iContingencyInstance.fire(batchNo,stepCode,"",buttonCode,confirm,stepState);
+        Optional<Equipment> equipment = iContingencyInstance.fire(batchNo,stepCode,"",buttonCode,confirm,stepState);
+        //  结束预案，更新设备重点设备参数
+        equipment.ifPresent(equip -> {
+            equip.setStartTime(DateUtil.getDateNow());
+            equip.setEndTime(null);
+            equip.setReserveSource(NumberEnum.ONE.getValue());
+            equip.setStatus(NumberEnum.ONE.getValue());
+            equipmentService.save(equip);
+        });
         return CommonResponseUtil.success("SUCCESS");
     }
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyInstance.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
 import java.util.List;
+import java.util.Optional;
 
+import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
 import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+import com.yeejoin.amos.fas.dao.entity.Equipment;
 
 public interface IContingencyInstance {
 
@@ -17,7 +20,7 @@ public interface IContingencyInstance {
     void setButtonWait(String batchNo,String contingencyPlanId,String buttonState) throws Exception;
 
 
-    void fire(String batchNo,String stepCode, String contingencyPlanId, String buttonCode,String buttonState,String stepStateOnbutton) throws Exception;
+    Optional<Equipment> fire(String batchNo, String stepCode, String contingencyPlanId, String buttonCode, String buttonState, String stepStateOnbutton) throws Exception;
 
     void updateStep(String step, String batchNo);
 }