From f9a9fb9090c2e9e1a4e00374d48181efe2463a56 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 09 五月 2025 11:10:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java | 93 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 93 insertions(+), 0 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 new file mode 100644 index 0000000..6285356 --- /dev/null +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcBoardController.java @@ -0,0 +1,93 @@ +package org.jeecg.modules.mdc.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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.system.entity.MdcProduction; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * @Author: Lius + * @CreateTime: 2025-05-06 + * @Description: 鐪嬫澘鎺ュ彛 + */ +@Slf4j +@Api(tags = "MDC鐪嬫澘鎺ュ彛") +@RestController +@RequestMapping("/mdc/board") +public class MdcBoardController { + + @Resource + private IMdcBoardService mdcBoardService; + + @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鐪嬫澘鎺ュ彛-鑾峰彇杞﹂棿鍒嗙粍") + @GetMapping("/proList") + public Result<?> proList(String productionId) { + List<MdcProduction> result = mdcBoardService.proList(productionId); + return Result.OK(result); + } + + @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鐪嬫澘鎺ュ彛-璁惧鍒楄〃") + @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鐪嬫澘鎺ュ彛-璁惧鏃ョ巼鍒嗘瀽") + @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鐪嬫澘鎺ュ彛-璁惧鏈堢巼鍒嗘瀽鍚堟牸鐜�") + @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("/equipmentRealTimeDetail") + public Result<?> equipmentRealTimeDetail(@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); +// } + + + + + +} -- Gitblit v1.9.3