From ec33a306d97e52eb725b47f48d337ce357a8ef6a Mon Sep 17 00:00:00 2001 From: whyclxw <810412026@qq.com> Date: 星期一, 22 四月 2024 14:09:10 +0800 Subject: [PATCH] 设备告警接口全改为stationId --- src/main/java/com/whyc/controller/WorkflowLinkController.java | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/whyc/controller/WorkflowLinkController.java b/src/main/java/com/whyc/controller/WorkflowLinkController.java index c493875..07a797f 100644 --- a/src/main/java/com/whyc/controller/WorkflowLinkController.java +++ b/src/main/java/com/whyc/controller/WorkflowLinkController.java @@ -2,8 +2,10 @@ import com.whyc.dto.Response; import com.whyc.dto.WorkflowLinkDTO; +import com.whyc.pojo.UserInf; import com.whyc.pojo.WorkflowLink; import com.whyc.service.WorkflowLinkService; +import com.whyc.util.ActionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +16,7 @@ @RestController @RequestMapping("workflowLink") @Api(tags = "鍗曟嵁瀹℃壒") -public class WorkflowLinkController { +public class WorkflowLinkController extends BaseController{ @Autowired private WorkflowLinkService service; @@ -25,11 +27,18 @@ return new Response<List<WorkflowLink>>().set(1, service.getWorkflowInfo(mainId)); } - @PutMapping("linkOfDischargePlanTemp") + @PostMapping("linkOfDischargePlanTemp") @ApiOperation(value = "鏇存柊鑺傜偣-鏀剧數璁″垝", notes = "浼犲弬link瀵硅薄鍐�,浼犲叆id,mainId,processLevel,status,dealReason鎴栬�卍ealRejectReason;" + "瀛楁status:5-閫氳繃,8-椹冲洖") public Response updateLinkOfDischargePlanTemp(@RequestBody WorkflowLinkDTO linkDTO) { return service.updateLinkOfDischargePlanTemp(linkDTO); + } + + @PostMapping("link") + @ApiOperation(value = "鏇存柊鑺傜偣", notes = "浼犲弬link瀵硅薄鍐�,浼犲叆id,mainId,processLevel,status,dealReason鎴栬�卍ealRejectReason;type浼�3" + + "瀛楁status:5-閫氳繃,8-椹冲洖") + public Response updateLink(@RequestBody WorkflowLinkDTO linkDTO) { + return service.updateLink(linkDTO); } @PostMapping("linkOfTemp") @@ -40,9 +49,10 @@ } @GetMapping("searchTmp") - @ApiOperation(value = "鏌ヨ鑺傜偣(闄ゆ斁鐢佃鍒掍箣澶栫殑)") + @ApiOperation(value = "鏌ヨ鑺傜偣(闄ゆ斁鐢佃鍒掍箣澶栫殑)", notes = "status:0鍏ㄩ儴锛�1瀹℃壒涓紝2瀹℃壒閫氳繃锛�3椹冲洖锛泃ype:0鍏ㄩ儴锛�2浜屾鏀剧數锛�3鍛婅闅愭偅") public Response searchTmp(@RequestParam int type, @RequestParam int status, @RequestParam int pageNum, @RequestParam int pageSize) { - return service.searchTmp(type, status, pageNum, pageSize); + UserInf uinf = ActionUtil.getUser(); + return service.searchTmp(uinf.getUId().intValue(), uinf.getURole(), type, status, pageNum, pageSize); } @GetMapping("searchLastHrById") @@ -51,9 +61,16 @@ return service.searchLastHrById(mid); } - @GetMapping("getFlowMain") - @ApiOperation(value = "鏌ヨ鑷繁鐢宠鐨勫伐鍗�(鍘婚櫎鏀剧數璁″垝)") + @GetMapping("searcFaultById") + @ApiOperation(value = "鑺傜偣涓烘晠闅滈殣鎮�") + public Response searcFaultById(@RequestParam int mid) { + return service.searcFaultById(mid); + } + + @GetMapping("getFlowMainByUid") + @ApiOperation(value = "鏌ヨ鑷繁鐢宠鐨勫伐鍗�(鍘婚櫎鏀剧數璁″垝)", notes = "status:0鍏ㄩ儴锛�1瀹℃壒涓紝2瀹℃壒閫氳繃锛�3椹冲洖锛泃ype:0鍏ㄩ儴锛�2浜屾鏀剧數锛�3鍛婅闅愭偅") public Response getFlowMainByUid(@RequestParam int type, @RequestParam int status, @RequestParam int pageNum, @RequestParam int pageSize) { - return service.getFlowMainByUid(type, status, pageNum, pageSize); + UserInf uinf = ActionUtil.getUser(); + return service.getFlowMainByUid(uinf.getUId().intValue(), type, status, pageNum, pageSize); } } -- Gitblit v1.9.1