From e9ab447fd70e0a84190bc1031a8330b893c21b87 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 07 七月 2025 18:00:04 +0800
Subject: [PATCH] 改解
---
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
index fdb5a55..d07704c 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java
@@ -44,6 +44,7 @@
import java.io.OutputStream;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -93,10 +94,6 @@
@Transactional(rollbackFor = Exception.class)
@Override
public int upDeviceParameter(Device itemParameter) {
- // 鍒犻櫎鏁伴噰闆嗛厤缃暟鎹�
- dataConfigService.deleteDataConfig();
- // 闇�瑕佸悓鏃舵洿鏀� device琛�
-
return deviceMapper.updateById(itemParameter);
}
@@ -114,11 +111,6 @@
@Override
public List<Device> search(Integer status, String deviceName, String specificationModel, String largeCategory) {
return deviceMapper.search(status, deviceName, specificationModel, largeCategory);
- }
-
- @Override
- public List<Device> selectDevicePrincipal() {
- return deviceMapper.selectDevicePrincipal();
}
@Override
@@ -249,11 +241,19 @@
.eq(DataConfig::getDeviceId, device.getId()));
// 鑾峰彇璁惧閰嶇疆绫�
- // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗�
+ // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗CZX-ZB-ER02022
if (device.getManagementNumber().equals("JCZX-ZB-ER02022")) {
map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));
+// list锛氬寘鍚澶囬厤缃俊鎭殑 DataConfig 鍒楄〃銆�
+// device锛氬綋鍓嶇殑璁惧瀵硅薄銆�
+// dto.getEntrustCode()锛氫粠 DeviceCollectionDto 瀵硅薄涓幏鍙栫殑濮旀墭缂栫爜
} else {
map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag()));
+// list锛氬寘鍚澶囬厤缃俊鎭殑 DataConfig 鍒楄〃銆�
+// device锛氬綋鍓嶇殑璁惧瀵硅薄銆�
+// dto.getEntrustCode()锛氬鎵樼紪鐮侊紝姝ゅ浼犲叆涓ゆ銆�
+// ip锛氬綋鍓嶈澶囩殑 IP 鍦板潃銆�
+// insProducts.get(0).getCableTag()锛氫粠 insProducts 鍒楄〃鐨勭涓�涓厓绱犱腑鑾峰彇鐨勭數缂嗘爣绛�
}
}
@@ -361,6 +361,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
@@ -405,11 +406,11 @@
DeviceMaintenance deviceMaintenance = deviceMaintenanceList.get(i);
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
// 缁翠慨鏃ユ湡
- deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getDate().format(dateTimeFormatter));
+ deviceMetricRecordAndMaintenanceDto.setMaintenanceDateString(deviceMaintenance.getMaintenanceDate().format(dateTimeFormatter));
// 澶勭悊鏂规硶
- deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getContent());
+ deviceMetricRecordAndMaintenanceDto.setHandlingMethod(deviceMaintenance.getMaintenanceContent());
// 澶囨敞
- deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getComments());
+ deviceMetricRecordAndMaintenanceDto.setComments(deviceMaintenance.getRemark());
}
deviceMetricRecordAndMaintenanceDtoList.add(deviceMetricRecordAndMaintenanceDto);
@@ -496,6 +497,7 @@
template.write(os);
os.flush();
os.close();
+ inputStream.close();
} catch (Exception e) {
e.printStackTrace();
throw new RuntimeException("瀵煎嚭澶辫触");
--
Gitblit v1.9.3