规则修改适配

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

 package com.yeejoin.amos.fas.business.controller;
 
 
+import com.yeejoin.amos.fas.business.service.impl.ContingencyInstanceImpl;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
 import com.yeejoin.amos.fas.business.service.intfc.IContingencyOriginalDataService;
 import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.request.CommonRequest;
 import com.yeejoin.amos.fas.core.util.CommonResponse;
 import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -17,10 +19,8 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import javax.xml.bind.ValidationEvent;
+import java.util.*;
 
 @RestController
 @RequestMapping(value = "/api/timeline")
@@ -28,6 +28,8 @@ import java.util.Map;
 public class TimeLineController extends BaseController{
 
     private static final Logger log = LoggerFactory.getLogger(TimeLineController.class);
+    @Autowired
+    IContingencyInstance iContingencyInstance;
 
     @Autowired
     IContingencyOriginalDataService iContingencyOriginalDataService;
@@ -39,8 +41,8 @@ public class TimeLineController extends BaseController{
     @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
     @RequestMapping(value = "/{instanceNo}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse queryPoint(@PathVariable String  instanceNo,@RequestParam("recordType") String recordType) throws Exception{
-        return CommonResponseUtil.success();
-//        return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo,recordType));
+
+        return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo,recordType));
     }
 
 
@@ -91,8 +93,8 @@ public class TimeLineController extends BaseController{
             log.info("confirm:" + map.get("confirm"));
             log.info("stepState:" + map.get("stepState"));
 
-//            iContingencyInstance.setButtonExecuted(batchNo,contingencyPlanId,buttonCode,confirm);
-//            iContingencyInstance.fire(batchNo,stepCode,contingencyPlanId,buttonCode,confirm,stepState);
+            iContingencyInstance.setButtonExecuted(batchNo,contingencyPlanId,buttonCode,confirm);
+            iContingencyInstance.fire(batchNo,stepCode,contingencyPlanId,buttonCode,confirm,stepState);
         }catch (Exception e)
         {
             //iContingencyInstance.setButtonWait(batchNo,contingencyPlanId,confirm);