From b7bbb981103d865be75a16b95d188326015b8aa6 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期五, 06 六月 2025 13:54:28 +0800 Subject: [PATCH] 1、系统配置表新增钢化/中空间隙配置 2、钢化/中空新增厚度选择,按照厚度自动匹配对应的间隙,完成进入格子的片数的要求 --- hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java index 9b29cc1..43e8ebb 100644 --- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java +++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java @@ -4,14 +4,13 @@ import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask; import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest; import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService; +import com.mes.largenscreen.entity.DailyProductionVO; +import com.mes.largenscreen.entity.RunTime; import com.mes.utils.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -34,4 +33,16 @@ public Result<Page<BigStorageCageHistoryTask>> queryBigStorageCageHistoryTask(@RequestBody @Validated BigStorageCageHistoryRequest request) { return Result.build(200, "鏌ヨ鎴愬姛", bigStorageCageHistoryTaskService.queryBigStorageCageHistoryTask(request)); } + + @ApiOperation(value = "鏌ヨ鏈潯绾垮巻鍙叉寚瀹氭棩鏈熺殑鏃ョ敓浜ф暟鎹�", notes = "鏌ヨ鏈潯绾垮巻鍙叉寚瀹氭棩鏈熺殑鏃ョ敓浜ф暟鎹�") + @PostMapping("/queryBigDailyProduction") + public Result<DailyProductionVO> queryBigDailyProduction(@RequestBody BigStorageCageHistoryRequest request) { + return Result.success(bigStorageCageHistoryTaskService.queryBigDailyProduction(request)); + } + + @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�") + @GetMapping("/queryRunTimes") + public Result<List<RunTime>> queryRunTimes(String days) { + return Result.success(bigStorageCageHistoryTaskService.queryRunTimes(days)); + } } -- Gitblit v1.8.0