From 5ad6234b30f68ae65d6ffc345e874af09c56f4e3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 21 二月 2025 15:15:54 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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
index 4d0abc8..465ec44 100644
--- 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
@@ -1,9 +1,12 @@
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.glassinfo.entity.GlassInfo;
import com.mes.temperingglass.entity.TemperingGlassInfo;
+import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.utils.Result;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +18,7 @@
/**
* @author SNG-010
*/
+@Api(tags = "閽㈠寲鏄剧ず")
@RestController
@RequestMapping("/temperingGlassInfo")
@Slf4j
@@ -26,6 +30,7 @@
@Autowired
private DamageService damageService;
+
@ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�")
@GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
public Result <List<TemperingGlassInfo>> selectWaitingGlass() {
@@ -33,13 +38,7 @@
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() {
@@ -48,16 +47,34 @@
return Result.build(200, "", glass);
}
- @ApiOperation("//閽㈠寲鐮存崯")
+ @ApiOperation("//閽㈠寲鐮存崯鎷胯蛋鏀惧洖")
@PostMapping("/updateTemperingState") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <Integer> updateTemperingState(@RequestBody Damage damage) {
- damageService.insertDamage(damage);
TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
temperingGlassInfo.setState(damage.getStatus());
temperingGlassInfo.setGlassId(damage.getGlassId());
int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
+// if(damage.getStatus()>5) {
+// damage.setType(damage.getStatus());
+// damage.setStatus(1);
+// damageService.insertDamage(damage);
+// }
return Result.build(200, "鐮存崯鎴愬姛", result);
}
+ @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿")
+ @PostMapping("/selectTempering") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿
+ public Result<GlassInfo> selectTempering(@RequestBody GlassInfo glassInfo) {
+ GlassInfo glass = temperingGlassInfoService.selectTempering(glassInfo);
+ return Result.build(200, "鏌ヨ鎴愬姛", glass);
+ }
+
+ @ApiOperation("//鏌ヨ褰撳墠宸ョ▼鍙风殑閽㈠寲鐗堝浘")
+ @PostMapping("/selectTemperingGlass") //鏌ヨ褰撳墠宸ョ▼鍙锋墍鏈夌殑鐐夊彿
+ public Result<List<GlassInfo>> selectTemperingGlass(@RequestBody GlassInfo glassInfo) {
+ List<GlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
+ return Result.build(200, "鏌ヨ鎴愬姛", glass);
+ }
+
}
--
Gitblit v1.8.0