From 44dd454d11a25d11494cf32737df1456cae47bf3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 24 七月 2024 13:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
new file mode 100644
index 0000000..73cc34b
--- /dev/null
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java
@@ -0,0 +1,66 @@
+package com.mes.temperingglass.controller;
+import com.mes.damage.entity.Damage;
+import com.mes.damage.service.DamageService;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
+import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.utils.Result;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * @author SNG-010
+ */
+@RestController
+@RequestMapping("/temperingGlassInfo")
+@Slf4j
+// TidyUpGlassModule 閽㈠寲妯″潡
+public class TemperingGlassInfoController {
+
+ @Autowired
+ private TemperingGlassInfoService temperingGlassInfoService;
+ @Autowired
+ private DamageService damageService;
+
+ @ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�")
+ @GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
+ public Result <List<TemperingGlassInfo>> selectWaitingGlass() {
+ List<TemperingGlassInfo> glass = temperingGlassInfoService.selectWaitingGlass();
+ log.info("绛夊緟涓殑鐜荤拑淇℃伅{}",glass);
+ return Result.build(200, "", glass);
+ }
+// @ApiOperation("鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�")
+// @GetMapping("/selectIntoGlass") // 鏌ヨ杩涚倝涓殑閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佸叏涓�1鐨勪负宸插埌銆�
+// public Result <List<TemperingGlassInfo>> selectIntoGlass() {
+// List<TemperingGlassInfo> glass = temperingAgoService.selectIntoGlass();
+// log.info("杩涚倝涓殑鐜荤拑鐗堝浘淇℃伅{}",glass);
+// return Result.build(200, "", glass);
+// }
+ @ApiOperation("//閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅銆�")
+ @GetMapping("/selectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ public Result <List<TemperingGlassInfo>> selectOutGlass() {
+ List<TemperingGlassInfo> glass = temperingGlassInfoService.selectOutGlass();
+ log.info("閽㈠寲鍑虹倝鍚庣殑鐜荤拑淇℃伅{}",glass);
+ return Result.build(200, "", glass);
+ }
+
+ @ApiOperation("//閽㈠寲鐮存崯")
+ @PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
+ public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
+ damageService.insertDamage(damage);
+ TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
+ if(damage.getStatus()==2){
+ temperingGlassInfo.setState(5);
+
+ }
+ temperingGlassInfo.setGlassId(damage.getGlassId());
+ int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
+ return Result.build(200, "鐮存崯鎴愬姛", result);
+ }
+
+
+}
--
Gitblit v1.8.0