From e206ea8f7dbb655c0d8868996dae8ff1ff5ed11a Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期四, 12 六月 2025 16:41:19 +0800
Subject: [PATCH] 修改看板大屏，动态获取数据
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
index d10e76f..5b9cd83 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/TaskingLogController.java
@@ -1,12 +1,14 @@
package com.mes.md.controller;
-
import com.mes.md.service.TaskingLogService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -23,6 +25,57 @@
@Autowired
TaskingLogService taskingLogService;
+
+ @ApiOperation("鏌ヨ鎶ヨ〃")
+ @PostMapping("/mechanicalReport")
+ @ResponseBody
+ public Result mechanicalReport(
+ @RequestParam(required = false) Integer dayCount,
+ @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startDate,
+ @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endDate,
+ @RequestParam(required = false) String taskType,
+ @RequestParam(required = false) String operationRecord,
+ @RequestParam(required = false) String lineType) {
+ try {
+ List<Map> result = taskingLogService.selectMechanicalReport(
+ dayCount,
+ startDate,
+ endDate,
+ taskType,
+ operationRecord,
+ lineType
+ );
+ return Result.build(200, "鏌ヨ鎴愬姛", result);
+ } catch (Exception e) {
+ return Result.build(199, "鏌ヨ寮傚父", null);
+ }
+ }
+
+ @ApiOperation("鏌ヨ鍗曞皬鏃朵骇閲�")
+ @PostMapping("/findHourlyOutput")
+ @ResponseBody
+ public Result findHourlyOutput(@RequestBody Map<String, String> map) {
+ try {
+ int dayCount = Integer.valueOf(map.get("dayCount").toString());
+ Map<String, Object> result = taskingLogService.findHourlyOutput(dayCount);
+ return Result.build(200, "鏌ヨ鎴愬姛", result);
+ } catch (Exception e) {
+ return Result.build(199, "鏌ヨ澶辫触: " + e.getMessage(), null);
+ }
+ }
+
+ @ApiOperation("鏌ヨ搴撲綅鏁版嵁")
+ @PostMapping("/selectWareHouse")
+ @ResponseBody
+ public Result selectWareHouse(@RequestBody Map<String, String> map) {
+ try {
+ int dayCount = Integer.valueOf(map.get("dayCount").toString());
+ List<Map<String, Object>> result = taskingLogService.selectWareHouse(dayCount);
+ return Result.build(200, "鏌ヨ鎴愬姛", result);
+ } catch (Exception e) {
+ return Result.build(199, "鏌ヨ澶辫触: " + e.getMessage(), null);
+ }
+ }
@ApiOperation("鎻愪氦鏃ュ織浠ュ強鎶ュ伐鏁版嵁鍒颁節鐗ф暟鎹簱")
@PostMapping("/reportTaskingLog")
@@ -59,6 +112,5 @@
return Result.build(199,"鎻愪氦寮傚父",map);
}
}
-
}
--
Gitblit v1.8.0