From a26b51820af00beb5ee73c821907598e2eae7178 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 22 五月 2024 10:19:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
index 1a95fea..c4c802d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java
@@ -2,6 +2,7 @@
import com.mes.edgstoragecage.entity.EdgStorageCage;
import com.mes.edgstoragecage.entity.EdgStorageCageDetails;
+import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.edgstoragecage.service.EdgStorageCageService;
import com.mes.edgstoragecage.service.impl.EdgStorageCageServiceImpl;
import com.mes.taskcache.entity.TaskCache;
@@ -33,6 +34,9 @@
@Autowired
private EdgStorageCageService edgStorageCageService;
+ @Autowired
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
+
@ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()")
@PostMapping("/selectEdgStorageCage")
@ResponseBody
@@ -54,6 +58,7 @@
boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
return Result.build(200,"銆愬惎鐢�/绂佺敤銆戞垚鍔�",1);
}
+
@ApiOperation("纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄�/鏇存崲/缁戝畾銆� EdgStorageCage鏍煎瓙淇℃伅,EdgStorageCageDetails 鐜荤拑淇℃伅 ")
@PostMapping("/edgStorageCageGlass")
@ResponseBody
@@ -62,5 +67,15 @@
return Result.build(200,"銆愭竻闄�/鏇存崲/缁戝畾銆戞垚鍔�",1);
}
+ @ApiOperation("纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
+ @PostMapping("/edgReportStatus")
+ @ResponseBody
+ public Result edgReportStatus(@RequestBody Map<String, String> arguments) {
+ String edgStorageCageDetailsId=arguments.get("glassId");
+ int controlsId=Integer.valueOf(arguments.get("controlsId"));
+ boolean isSucess=edgStorageCageDetailsService.identWorn(edgStorageCageDetailsId,controlsId);
+ return Result.build(200,"銆愮牬鎹�/鎷胯蛋銆戞垚鍔�",1);
+ }
+
}
--
Gitblit v1.8.0