From e339917989dcd29c08a0000deb41f10ded43dd5d Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 29 五月 2024 09:27:29 +0800 Subject: [PATCH] 增加联机状态,更改json文件位置 --- hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java index c17d927..257bc80 100644 --- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java +++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java @@ -2,7 +2,6 @@ import com.mes.utils.Result; -import com.mes.workstation.entity.GlassInfo; import com.mes.workstation.entity.UpWorkstation; import com.mes.workstation.service.UpWorkstationService; import io.swagger.annotations.ApiOperation; @@ -26,9 +25,9 @@ public class UpWorkstationController { @Autowired private UpWorkstationService upWorkstationService; - private GlassInfo glassInfo; @ApiOperation("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅") @GetMapping("/list") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅 + @ResponseBody public Result<List<UpWorkstation>> list() { List<UpWorkstation> glass = upWorkstationService.list(); log.info("鏄剧ず宸ヤ綅涓婄殑鐜荤拑淇℃伅:{}", glass); @@ -40,15 +39,22 @@ @ApiOperation("淇敼宸ヤ綅琛ㄥ鍔犵幓鐠冧俊鎭垨鑰呭垹闄ょ幓鐠冧俊鎭�,浼犻�扷pworkstation绫�,鍙慨鏀瑰楂樺帤鏁伴噺鑶滅郴") @PostMapping("/updateGlassMessage") @ResponseBody - public void updateGlassMessage(@RequestBody UpWorkstation upwork) { + public Result<List<UpWorkstation>> updateGlassMessage(@RequestBody UpWorkstation upwork) { upWorkstationService.updateGlassMessage(upwork); + List<UpWorkstation> glass = upWorkstationService.list(); + return Result.build(200, "", glass); } - @ApiOperation("寮�濮嬩笂鐗囦换鍔�") - @PostMapping("/selectPriority") //寮�濮嬩笂鐗囦换鍔� + + + @ApiOperation("淇敼涓婄墖mes鑱斿姩璇锋眰瀛�") + @PostMapping("/updateMesInkageLoad") @ResponseBody - public void selectPriority() { - upWorkstationService.selectPriority(); + public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) { + String result = upWorkstationService.updateMesInkageLoad(inKageWord); + return Result.success(result); + } + } -- Gitblit v1.8.0