From c583e5683bac5d11750be01b8a3c4147e8f16026 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 06 十一月 2024 23:21:53 +0800
Subject: [PATCH] 1、opc订阅服务为阻塞模式，配置需要开启多线程 2、新增订阅回调函数，用于执行任务，完成任务时调用 3、目前测试效果来看，一个定时任务只能有一个订阅任务，可订阅多个节点，当某个节点发生变化时，回调任务仅获取变化节点的信息
---
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