From af0635b1fe65174141620258d23bd9a7afe0bc2f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 14 三月 2025 17:42:52 +0800
Subject: [PATCH] 设备bug解决、文件管理bug解决
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java | 3 ++-
basic-server/src/main/resources/mapper/StructureTestMapper.xml | 1 +
cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java | 3 +++
cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java | 4 ++--
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java | 6 +++++-
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/StructureTestMapper.xml b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
index 05c7ae7..a17b51a 100644
--- a/basic-server/src/main/resources/mapper/StructureTestMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -31,6 +31,7 @@
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
+
</select>
</mapper>
diff --git a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
index 2e1f23f..bb70b52 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/controller/DeviceController.java
@@ -155,8 +155,8 @@
@ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
@PostMapping("/saveDataAcquisitionConfiguration")
- public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
- dataConfigService.saveDataAcquisitionConfiguration(deviceId, dataConfigList);
+ public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
+ dataConfigService.saveDataAcquisitionConfiguration(dataConfigList.getDeviceId(), dataConfigList);
return Result.success();
}
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java
index ea630ea..c8a3721 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DataConfigDto.java
@@ -33,4 +33,7 @@
@ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О")
private String dbFileName;
+
+ @ApiModelProperty("璁惧ID")
+ private Integer deviceId;
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
index f23bc8d..0d5c223 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentAlterController.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -69,7 +70,7 @@
@ApiOperation(value = "瀹℃牳鏂囦欢鍙樻洿")
@PostMapping("/checkManageDocumentAlter")
- public Result checkManageDocumentAlter(@RequestBody ManageDocumentAlter manageDocumentAlter){
+ public Result checkManageDocumentAlter(ManageDocumentAlter manageDocumentAlter){
return Result.success(manageDocumentAlterService.checkManageDocumentAlter(manageDocumentAlter));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
index 86333c7..009c780 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentAlterServiceImpl.java
@@ -12,6 +12,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.UserMapper;
@@ -184,8 +185,11 @@
System.err.println("闄勪欢涓婁紶閿欒");
return 0;
}
+ if(StringUtils.isNotEmpty(oldManageDocumentAlter.getMethod())){
+
+ }
/*鍏朵綑鐩稿叧澶勭悊*/
- if (oldManageDocumentAlter.getMethod().equals("浣滃簾")){
+ if ("浣滃簾".equals(oldManageDocumentAlter.getMethod())){
//鏂板鍒颁綔搴熺敵璇烽噷闈�
ManageDocumentCancel manageDocumentCancel = new ManageDocumentCancel();
manageDocumentCancel.setDocumentCode(oldManageDocumentAlter.getAlterBeforeCode());
--
Gitblit v1.9.3