From 8a76767b0a7ad271c8487a02063590b956deb5df Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 25 七月 2024 14:30:30 +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 | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 3496554..73cc34b 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,13 +1,13 @@
package com.mes.temperingglass.controller;
-import com.mes.temperingglass.service.TemperingAgoService;
+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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -22,12 +22,14 @@
public class TemperingGlassInfoController {
@Autowired
- private TemperingAgoService temperingAgoService;
+ private TemperingGlassInfoService temperingGlassInfoService;
+ @Autowired
+ private DamageService damageService;
@ApiOperation("鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�")
@GetMapping("/selectWaitingGlass") // 鏌ヨ閽㈠寲绛夌墖涓殑鐗堝浘淇℃伅,鐘舵�佷负1鐨勪负宸插埌,鐘舵�佷负0鐨勪负绛夊緟涓�
public Result <List<TemperingGlassInfo>> selectWaitingGlass() {
- List<TemperingGlassInfo> glass = temperingAgoService.selectWaitingGlass();
+ List<TemperingGlassInfo> glass = temperingGlassInfoService.selectWaitingGlass();
log.info("绛夊緟涓殑鐜荤拑淇℃伅{}",glass);
return Result.build(200, "", glass);
}
@@ -41,10 +43,24 @@
@ApiOperation("//閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅銆�")
@GetMapping("/selectOutGlass") //閽㈠寲鍚庢樉绀哄嚭鐐夌殑鐗堝浘淇℃伅
public Result <List<TemperingGlassInfo>> selectOutGlass() {
- List<TemperingGlassInfo> glass = temperingAgoService.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