From f813d91421ff6a24b30ef3d1b5d123c08e8331a5 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 14 五月 2025 10:21:46 +0800 Subject: [PATCH] art: 设备管理-数据库设计文件修改 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java index 720c5f7..dd72f20 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java @@ -6,6 +6,7 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.mdc.entity.MdcEquipment; import org.jeecg.modules.mdc.service.IMdcBoardService; +import org.jeecg.modules.mdc.vo.MdcBoardEquRealTImeVo; import org.jeecg.modules.system.entity.MdcProduction; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -30,57 +31,54 @@ @Resource private IMdcBoardService mdcBoardService; - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-璁惧杩愯鐘舵�佺粺璁�", notes = "MDC棣栭〉鎺ュ彛-璁惧杩愯鐘舵�佺粺璁�") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-璁惧杩愯鐘舵�佺粺璁�", notes = "MDC鐪嬫澘鎺ュ彛-璁惧杩愯鐘舵�佺粺璁�") @GetMapping("/equipmentStatusStatistics") public Result<?> equipmentStatusStatistics(String productionId) { Map<String, Object> result = mdcBoardService.equipmentStatusStatistics(productionId); return Result.OK(result); } - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-鑾峰彇杞﹂棿鍒嗙粍", notes = "MDC棣栭〉鎺ュ彛-鑾峰彇杞﹂棿鍒嗙粍") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-鑾峰彇杞﹂棿鍒嗙粍", notes = "MDC鐪嬫澘鎺ュ彛-鑾峰彇杞﹂棿鍒嗙粍") @GetMapping("/proList") public Result<?> proList(String productionId) { List<MdcProduction> result = mdcBoardService.proList(productionId); return Result.OK(result); } - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-鐜囧垎鏋愯蛋鍔垮浘", notes = "MDC棣栭〉鎺ュ彛-鐜囧垎鏋愯蛋鍔垮浘") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-鐜囧垎鏋愯蛋鍔垮浘", notes = "MDC鐪嬫澘鎺ュ彛-鐜囧垎鏋愯蛋鍔垮浘") @GetMapping("/rateAnalysisTrend") public Result<?> rateAnalysisTrend(String productionId) { Map<String, Object> result = mdcBoardService.rateAnalysisTrend(productionId); return Result.OK(result); } - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-璁惧鍒楄〃", notes = "MDC棣栭〉鎺ュ彛-璁惧鍒楄〃") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-璁惧鍒楄〃", notes = "MDC鐪嬫澘鎺ュ彛-璁惧鍒楄〃") @GetMapping("/equipmentList") public Result<?> equipmentList(@RequestParam(name = "productionId", required = true) String productionId) { List<MdcEquipment> result = mdcBoardService.equipmentList(productionId); return Result.OK(result); } - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-璁惧鏃ョ巼鍒嗘瀽", notes = "MDC棣栭〉鎺ュ彛-璁惧鏃ョ巼鍒嗘瀽") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-璁惧鏃ョ巼鍒嗘瀽", notes = "MDC鐪嬫澘鎺ュ彛-璁惧鏃ョ巼鍒嗘瀽") @GetMapping("/rateAnalysisTrendDay") public Result<?> rateAnalysisTrendDay(@RequestParam(name = "equipmentId", required = true) String equipmentId) { Map<String, Object> result = mdcBoardService.rateAnalysisTrendDay(equipmentId); return Result.OK(result); } - @ApiOperation(value = "MDC棣栭〉鎺ュ彛-璁惧鏈堢巼鍒嗘瀽鍚堟牸鐜�", notes = "MDC棣栭〉鎺ュ彛-璁惧鏈堢巼鍒嗘瀽鍚堟牸鐜�") + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-璁惧鏈堢巼鍒嗘瀽鍚堟牸鐜�", notes = "MDC鐪嬫澘鎺ュ彛-璁惧鏈堢巼鍒嗘瀽鍚堟牸鐜�") @GetMapping("/rateAnalysisTrendMonth") public Result<?> rateAnalysisTrendMonth(@RequestParam(name = "equipmentId", required = true) String equipmentId) { Map<String, Object> result = mdcBoardService.rateAnalysisTrendMonth(equipmentId); return Result.OK(result); } -// @ApiOperation(value = "MDC棣栭〉鎺ュ彛-璁惧浜у搧鍚堟牸鐜�", notes = "MDC棣栭〉鎺ュ彛-璁惧浜у搧鍚堟牸鐜�") -// @GetMapping("/passRate") -// public Result<?> passRate(@RequestParam(name = "equipmentId", required = true) String equipmentId) { -// Map<String, Object> result = mdcBoardService.passRate(equipmentId); -// return Result.OK(result); -// } - - - + @ApiOperation(value = "MDC鐪嬫澘鎺ュ彛-璁惧杩愯鐘舵�佸強杩愯鍙傛暟淇℃伅", notes = "MDC鐪嬫澘鎺ュ彛-璁惧杩愯鐘舵�佸強杩愯鍙傛暟淇℃伅") + @GetMapping("/equipmentRealTimeDetail") + public Result<?> equipmentRealTimeDetail(@RequestParam(name = "equipmentId", required = true) String equipmentId) { + MdcBoardEquRealTImeVo result = mdcBoardService.equipmentRealTimeDetail(equipmentId); + return Result.OK(result); + } } -- Gitblit v1.9.3