From c63a72a68bc6739f3617a00bc15a187b59f06bae Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 15 十月 2024 15:53:21 +0800
Subject: [PATCH] 1、解决引入milo-spring-boot-starter依赖系统无法启动异常 2、opc服务可配置开关服务，避免无opc环境下系统启动报错 3、删除无用的opc代码
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 73cc34b..cb9a49f 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
@@ -33,13 +33,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,17 +42,18 @@
return Result.build(200, "", glass);
}
- @ApiOperation("//閽㈠寲鐮存崯")
+ @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.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);
}
--
Gitblit v1.8.0