From 95ccbb1a733a76b35963e1452e6a7364ba92d170 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Fri, 23 Jan 2026 09:20:13 +0800
Subject: [PATCH] update-设备同步（对外）
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
index 6a6b3a6..bb09e0c 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java
@@ -32,6 +32,7 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.common.IdParam;
@@ -99,12 +100,26 @@
}
/**
- * 设备信息 新增或修改
+ * 设备信息 新增或修改(对外)
*/
- @PostMapping("/submit")
+ @PostMapping("/submitExternal")
@ApiOperationSupport(order = 6)
- @ApiOperation(value = "新增或修改", notes = "传入gdManageDevice")
- public R submit(@Valid @RequestBody GdManageDeviceDTO gdManageDevice) throws Exception {
+ @ApiOperation(value = "新增或修改", notes = "传入gdManageDevice，设备编码相同则修改")
+ public R submitExternal(@Valid @RequestBody GdManageDeviceDTO gdManageDevice) throws Exception {
+
+ if (StringUtil.isBlank(gdManageDevice.getDeviceSn())) {
+ return R.fail("设备编码不能为空");
+ }
+
+ QueryWrapper<GdManageDeviceEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(GdManageDeviceEntity::getDeviceSn, gdManageDevice.getDeviceSn());
+
+ GdManageDeviceEntity detail = gdManageDeviceService.getOne(queryWrapper);
+ if (detail != null) {
+ gdManageDevice.setId(detail.getId());
+ }
+
+
return R.status(gdManageDeviceService.saveOrUpdateDevice(GdManageDeviceWrapper.build().entityDTO(gdManageDevice)));
}
--
Gitblit v1.9.3