From 21a76af55c4da5f1999e9dd24690b2449a7a18a7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 05 六月 2025 14:19:41 +0800
Subject: [PATCH] 磨边模块大屏代码迁移
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/controller/EdgStorageCageController.java | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 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 3e49ae0..b1ac0a5 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
@@ -1,25 +1,23 @@
package com.mes.edgstoragecage.controller;
+import com.mes.damage.entity.request.DamageRequest;
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;
-import com.mes.taskcache.service.impl.TaskCacheServiceImpl;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.awt.image.ImageProducer;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -33,33 +31,28 @@
@Autowired
private EdgStorageCageService edgStorageCageService;
- @ApiOperation("鏌ヨ纾ㄨ竟缂撳瓨鐞嗙墖绗煎唴璇︽儏 鍙傛暟()")
- @PostMapping("/selectEdgStorageCage")
- @ResponseBody
- public Result selectEdgStorageCage () {
- List<Map<String, Object>> list=edgStorageCageService.selectEdgStorageCages();
- return Result.build(200,"鎴愬姛",list);
- }
-// @ApiOperation("娣诲姞纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氱鍐呯粦瀹氱幓鐠� 鍙傛暟(EdgStorageCage edgStorageCage)")
-// @PostMapping("/insertEdgStorageCage")
-// @ResponseBody
-// public Result insertEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
-// boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
-// return Result.build(200,"娣诲姞鎴愬姛",1);
-// }
+ @Autowired
+ private EdgStorageCageDetailsService edgStorageCageDetailsService;
+
@ApiOperation("淇敼纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸杩涜銆愬惎鐢�/绂佺敤銆�")
@PostMapping("/updateEdgStorageCage")
- @ResponseBody
public Result updateEdgStorageCage(@RequestBody EdgStorageCage edgStorageCage) {
- boolean isSucess=edgStorageCageService.updateEdgStorageCage(edgStorageCage);
- return Result.build(200,"鏇存崲鎴愬姛",1);
+ String isSucess = edgStorageCageService.updateEdgStorageCage(edgStorageCage) ? "鎴愬姛" : "澶辫触";
+ return Result.build(200, "銆愬惎鐢�/绂佺敤銆�" + isSucess, 1);
}
+
@ApiOperation("纾ㄨ竟缂撳瓨鐞嗙墖绗间俊鎭� 鍔熻兘锛氬绗煎唴鏍呮牸鐜荤拑杩涜銆愭竻闄�/鏇存崲/缁戝畾銆� EdgStorageCage鏍煎瓙淇℃伅,EdgStorageCageDetails 鐜荤拑淇℃伅 ")
@PostMapping("/edgStorageCageGlass")
- @ResponseBody
- public Result edgStorageCageGlass(@RequestBody EdgStorageCage edgStorageCage,@RequestBody EdgStorageCageDetails edgStorageCageDetails) {
- boolean isSucess=edgStorageCageService.updateEdgStorageCageDetails(edgStorageCage,edgStorageCageDetails);
- return Result.build(200,"鍒犻櫎鎴愬姛",1);
+ public Result edgStorageCageGlass(@RequestBody EdgStorageCageDetails edgStorageCageDetails, int edgStorageCageId) {
+
+ String isSucess = edgStorageCageService.updateEdgStorageCageDetails(edgStorageCageId, edgStorageCageDetails) ? "鎴愬姛" : "澶辫触";
+ return Result.build(200, "銆愭竻闄�/鏇存崲/缁戝畾銆�" + isSucess, 1);
+ }
+
+ @ApiOperation("纾ㄨ竟妯″潡姹囨姤鐜荤拑鐘舵�� 鍔熻兘锛氬纾ㄨ竟闃熷垪鐜荤拑杩涜銆愮牬鎹�/鎷胯蛋銆� ")
+ @PostMapping("/edgReportStatus")
+ public Result edgReportStatus(@RequestBody @Validated DamageRequest request) {
+ return Result.build(200, "銆愮牬鎹�/鎷胯蛋銆�" + edgStorageCageDetailsService.edgReportStatus(request), 1);
}
}
--
Gitblit v1.8.0