Skip to content

Y
YeeAmosFireAutoSysRoot
Commit d6a39927 authored by 吴江's avatar 吴江
Browse files
Options

规则修改适配

parent 2bf1a013
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 181 deletions
YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/TimeLineController.java
View file @ d6a39927
//package com.yeejoin.amos.fas.business.controller; package com.yeejoin.amos.fas.business.controller;
//
//
//import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance; import com.yeejoin.amos.fas.business.service.intfc.IContingencyInstance;
//import com.yeejoin.amos.fas.business.service.intfc.IContingencyOriginalDataService; 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.CommonPageable;
//import com.yeejoin.amos.fas.core.common.request.CommonRequest; import com.yeejoin.amos.fas.core.common.request.CommonRequest;
//import com.yeejoin.amos.fas.core.util.CommonResponse; import com.yeejoin.amos.fas.core.util.CommonResponse;
//import com.yeejoin.amos.fas.core.util.CommonResponseUtil; import com.yeejoin.amos.fas.core.util.CommonResponseUtil;
//import io.swagger.annotations.Api; import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
//import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
//import org.slf4j.Logger; import org.slf4j.Logger;
//import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
//import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
//import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
//import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
//
//import java.util.HashMap; import java.util.HashMap;
//import java.util.LinkedList; import java.util.LinkedList;
//import java.util.List; import java.util.List;
//import java.util.Map; import java.util.Map;
//
//@RestController @RestController
//@RequestMapping(value = "/api/timeline") @RequestMapping(value = "/api/timeline")
//@Api(tags="时间轴") @Api(tags="时间轴")
//public class TimeLineController extends BaseController{ public class TimeLineController extends BaseController{
//
// private static final Logger log = LoggerFactory.getLogger(TimeLineController.class); private static final Logger log = LoggerFactory.getLogger(TimeLineController.class);
//
// @Autowired @Autowired
// IContingencyOriginalDataService iContingencyOriginalDataService; IContingencyOriginalDataService iContingencyOriginalDataService;
//
// static LinkedList<Map<String,String >> fireQueue = new LinkedList<>(); static LinkedList<Map<String,String >> fireQueue = new LinkedList<>();
//
//
// //@Authorization(ingore = true) //@Authorization(ingore = true)
// @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴") @ApiOperation(httpMethod = "GET",value = "根据批次号查询时间轴", notes = "根据批次号查询时间轴")
// @RequestMapping(value = "/{instanceNo}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET) @RequestMapping(value = "/{instanceNo}", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
// public CommonResponse queryPoint(@PathVariable String instanceNo,@RequestParam("recordType") String recordType) throws Exception{ public CommonResponse queryPoint(@PathVariable String instanceNo,@RequestParam("recordType") String recordType) throws Exception{
// return CommonResponseUtil.success(); return CommonResponseUtil.success();
//// return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo,recordType)); // return CommonResponseUtil.success(iContingencyInstance.queryForTimeLine(instanceNo,recordType));
// } }
//
//
// //@Authorization(ingore = true) //@Authorization(ingore = true)
// @ApiOperation(httpMethod = "PUT",value = "点击按钮", notes = "点击按钮") @ApiOperation(httpMethod = "PUT",value = "点击按钮", notes = "点击按钮")
// @RequestMapping(value = "/fire", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT) @RequestMapping(value = "/fire", produces = "application/json;charset=UTF-8", method = RequestMethod.PUT)
// public CommonResponse fire(@RequestParam("batchNo") String batchNo, public CommonResponse fire(@RequestParam("batchNo") String batchNo,
// @RequestParam("stepCode") String stepCode, @RequestParam("stepCode") String stepCode,
// @RequestParam("buttonCode") String buttonCode, @RequestParam("buttonCode") String buttonCode,
// @RequestParam("confirm") String confirm, @RequestParam("confirm") String confirm,
// @RequestParam("contingencyPlanId") String contingencyPlanId, @RequestParam("contingencyPlanId") String contingencyPlanId,
// @RequestParam("stepState") String stepState) throws Exception{ @RequestParam("stepState") String stepState) throws Exception{
//
//
// Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
// map.put("batchNo",batchNo); map.put("batchNo",batchNo);
// map.put("stepCode",stepCode); map.put("stepCode",stepCode);
// map.put("buttonCode",buttonCode); map.put("buttonCode",buttonCode);
// map.put("confirm",confirm); map.put("confirm",confirm);
// map.put("contingencyPlanId",contingencyPlanId); map.put("contingencyPlanId",contingencyPlanId);
// map.put("stepState",stepState); map.put("stepState",stepState);
// fireQueue.addLast(map); fireQueue.addLast(map);
//
// return CommonResponseUtil.success("SUCCESS"); return CommonResponseUtil.success("SUCCESS");
// } }
//
//
// @Scheduled(cron = "*/2 * * * * ?") @Scheduled(cron = "*/2 * * * * ?")
// private void runFireQueue() throws Exception private void runFireQueue() throws Exception
// { {
//
// if(fireQueue.size() == 0) if(fireQueue.size() == 0)
// return; return;
//
// Map<String,String> map = fireQueue.getFirst(); Map<String,String> map = fireQueue.getFirst();
//
// String batchNo = map.get("batchNo"); String batchNo = map.get("batchNo");
// String stepCode = map.get("stepCode"); String stepCode = map.get("stepCode");
// String buttonCode = map.get("buttonCode"); String buttonCode = map.get("buttonCode");
// String confirm = map.get("confirm"); String confirm = map.get("confirm");
// String contingencyPlanId = map.get("contingencyPlanId"); String contingencyPlanId = map.get("contingencyPlanId");
// String stepState = map.get("stepState"); String stepState = map.get("stepState");
// try try
// { {
// log.info("fireQueue-size:"+fireQueue.size()); log.info("fireQueue-size:"+fireQueue.size());
// log.info("stepCode:" + map.get("stepCode")); log.info("stepCode:" + map.get("stepCode"));
// log.info("buttonCode:" + map.get("buttonCode")); log.info("buttonCode:" + map.get("buttonCode"));
// log.info("confirm:" + map.get("confirm")); log.info("confirm:" + map.get("confirm"));
// log.info("stepState:" + map.get("stepState")); log.info("stepState:" + map.get("stepState"));
//
//// iContingencyInstance.setButtonExecuted(batchNo,contingencyPlanId,buttonCode,confirm); // iContingencyInstance.setButtonExecuted(batchNo,contingencyPlanId,buttonCode,confirm);
//// iContingencyInstance.fire(batchNo,stepCode,contingencyPlanId,buttonCode,confirm,stepState); // iContingencyInstance.fire(batchNo,stepCode,contingencyPlanId,buttonCode,confirm,stepState);
// }catch (Exception e) }catch (Exception e)
// { {
// //iContingencyInstance.setButtonWait(batchNo,contingencyPlanId,confirm); //iContingencyInstance.setButtonWait(batchNo,contingencyPlanId,confirm);
// throw e; throw e;
// }finally { }finally {
// fireQueue.removeFirst(); fireQueue.removeFirst();
// } }
// } }
//
//
//
//
//
//
//
//
//
// // @Authorization(ingore = true) // @Authorization(ingore = true)
// @ApiOperation(httpMethod = "POST",value = "查询预案记录", notes = "查询预案记录") @ApiOperation(httpMethod = "POST",value = "查询预案记录", notes = "查询预案记录")
// @RequestMapping(value = "/contingency/page", produces = "application/json;charset=UTF-8", method = RequestMethod.POST) @RequestMapping(value = "/contingency/page", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
// public CommonResponse contingencyRecord( public CommonResponse contingencyRecord(
// @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests, @ApiParam(value = "查询条件", required = false) @RequestBody(required = false) List<CommonRequest> queryRequests,
// @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable @ApiParam(value = "分页参数", required = true) CommonPageable commonPageable
// ) { ) {
// //CommonPageable commonPageable = new CommonPageable(pageNumber,pageSize); //CommonPageable commonPageable = new CommonPageable(pageNumber,pageSize);
//
// String contingencyName = null; String contingencyName = null;
// String equipmentId = null; String equipmentId = null;
// String createTime = null; String createTime = null;
// if(!CollectionUtils.isEmpty(queryRequests)) if(!CollectionUtils.isEmpty(queryRequests))
// { {
// for(CommonRequest request:queryRequests) for(CommonRequest request:queryRequests)
// { {
// if("contingencyName".equals(request.getName())) if("contingencyName".equals(request.getName()))
// { {
// contingencyName = String.valueOf(request.getValue()); contingencyName = String.valueOf(request.getValue());
// } }
// if("equipmentId".equals(request.getName())) if("equipmentId".equals(request.getName()))
// { {
// equipmentId = String.valueOf(request.getValue()); equipmentId = String.valueOf(request.getValue());
// } }
// if("createTime".equals(request.getName())) if("createTime".equals(request.getName()))
// { {
// createTime = String.valueOf(request.getValue()); createTime = String.valueOf(request.getValue());
// } }
// } }
// } }
//
// return CommonResponseUtil.success(iContingencyOriginalDataService.queryForPage(contingencyName,equipmentId,createTime,commonPageable)); return CommonResponseUtil.success(iContingencyOriginalDataService.queryForPage(contingencyName,equipmentId,createTime,commonPageable));
// } }
//
//
//
//
//
//
//
//
//
//
//
// String operate = "{" + String operate = "{" +
// " \"type\": \"button\"," + " \"type\": \"button\"," +
// " \"operate\": [" + " \"operate\": [" +
// " {" + " {" +
// " \"title\": \"确认着火\"," + " \"title\": \"确认着火\"," +
// " \"paramName\": \"batchNo\"," + " \"paramName\": \"batchNo\"," +
// " \"paramValue\": \"11\"," + " \"paramValue\": \"11\"," +
// " \"requestUrl\": \"url\"," + " \"requestUrl\": \"url\"," +
// " \"icon\": \"querenzhuohuo\"," + " \"icon\": \"querenzhuohuo\"," +
// " \"confirm\": true," + " \"confirm\": true," +
// " \"state\": \"executed\"" + " \"state\": \"executed\"" +
// " }," + " }," +
// " {" + " {" +
// " \"title\": \"消除误报\"," + " \"title\": \"消除误报\"," +
// " \"paramName\": \"batchNo\"," + " \"paramName\": \"batchNo\"," +
// " \"paramValue\": \"11\"," + " \"paramValue\": \"11\"," +
// " \"requestUrl\": \"url\"," + " \"requestUrl\": \"url\"," +
// " \"icon\": \"xiaochuwubao\"," + " \"icon\": \"xiaochuwubao\"," +
// " \"confirm\": true," + " \"confirm\": true," +
// " \"state\": \"wait\"" + " \"state\": \"wait\"" +
// " }" + " }" +
// " ]" + " ]" +
// "}"; "}";
//
//} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment