From 72b7d2c5ea19ed2047ee896b7f36da20d04bcea6 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 22 Jan 2026 17:22:15 +0800
Subject: [PATCH] 事件数量tab接口
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/controller/GdManageDeviceController.java | 69 ++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 24 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 bfe24ed..f03217d 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
@@ -16,34 +16,38 @@
*/
package org.sxkj.gd.workorder.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
-import org.sxkj.gd.workorder.vo.GdManageDeviceVO;
-import org.sxkj.gd.workorder.excel.GdManageDeviceExcel;
-import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper;
-import org.sxkj.gd.workorder.service.IGdManageDeviceService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
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;
+import org.sxkj.gd.workorder.dto.GdManageDeviceDTO;
+import org.sxkj.gd.workorder.entity.GdManageDeviceEntity;
+import org.sxkj.gd.workorder.excel.GdManageDeviceExcel;
+import org.sxkj.gd.workorder.service.IGdManageDeviceService;
+import org.sxkj.gd.workorder.vo.GdManageDeviceVO;
+import org.sxkj.gd.workorder.wrapper.GdManageDeviceWrapper;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 设备信息 控制器
@@ -65,8 +69,11 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdManageDevice")
- public R<GdManageDeviceVO> detail(GdManageDeviceEntity gdManageDevice) {
- GdManageDeviceEntity detail = gdManageDeviceService.getOne(Condition.getQueryWrapper(gdManageDevice));
+ public R<GdManageDeviceVO> detail(@Valid IdParam manageDevice) {
+ GdManageDeviceEntity detail = gdManageDeviceService.getOne(Condition.getQueryWrapper(GenericConverter.convert(manageDevice, GdManageDeviceEntity.class)));
+ if (detail == null) {
+ return R.fail("该设备不存在");
+ }
return R.data(GdManageDeviceWrapper.build().entityVO(detail));
}
@@ -93,13 +100,27 @@
}
/**
- * 设备信息 新增或修改
+ * 设备信息 新增或修改(对外)
*/
- @PostMapping("/submit")
+ @PostMapping("/submitExternal")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdManageDevice")
- public R submit(@Valid @RequestBody GdManageDeviceEntity gdManageDevice) {
- return R.status(gdManageDeviceService.saveOrUpdate(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