From dbe3740fba28955b8134839c294cbe3e2ed8def4 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期日, 14 四月 2024 17:06:59 +0800
Subject: [PATCH] 初次提交权限相关功能
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
index 8fa7876..a0f9941 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingController.java
@@ -1,12 +1,12 @@
-package com.mes.controller;
+package com.mes.temperingglass.controller;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import com.mes.common.Result;
-import com.mes.entity.Tempering;
-import com.mes.service.TemperingOverService;
-import com.mes.service.TemperingService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingOverService;
+import com.mes.temperingglass.service.TemperingService;
+import com.mes.utils.Result;
@RestController
@@ -24,25 +24,25 @@
@GetMapping("/SelectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
@ResponseBody
public Result SelectWaitingGlass(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<Tempering> glass = temperingService.SelectWaitingGlass();
+ List<TemperingGlassInfo> glass = temperingService.SelectWaitingGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
@GetMapping("/SelectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
@ResponseBody
public Result SelectIntoGlass(String ProcessId) {
- List<Tempering> glass = temperingService.SelectIntoGlass();
+ List<TemperingGlassInfo> glass = temperingService.SelectIntoGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
@GetMapping("/SelectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
@ResponseBody
public Result SelectOutGlass(String ProcessId) {
- List<Tempering> glass = temperingOverService.SelectOutGlass();
+ List<TemperingGlassInfo> glass = temperingOverService.SelectOutGlass();
System.out.println(glass);
- return Result.seccess(glass);
+ return Result.build(200,"", glass);
}
--
Gitblit v1.8.0