From efe98e89b2d03f053aad877678f46f7512c63248 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 九月 2025 16:12:35 +0800
Subject: [PATCH] 修改数据库连接密码为强密码2

---
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceServiceImpl.java |   33 +++++++++++++++++++--------------
 1 files changed, 19 insertions(+), 14 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..ba01fa4 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
@@ -35,6 +35,7 @@
 import lombok.AllArgsConstructor;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -44,6 +45,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 +95,6 @@
     @Transactional(rollbackFor = Exception.class)
     @Override
     public int upDeviceParameter(Device itemParameter) {
-        // 鍒犻櫎鏁伴噰闆嗛厤缃暟鎹�
-        dataConfigService.deleteDataConfig();
-        // 闇�瑕佸悓鏃舵洿鏀� device琛�
-
 
         return deviceMapper.updateById(itemParameter);
     }
@@ -114,11 +112,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
@@ -202,6 +195,8 @@
     @Override
     public Result<?> dataAcquisition(HttpServletRequest request, DeviceCollectionDto dto) {
 
+
+
         // 鏌ヨ妫�楠岄」
         List<Integer> itemIds = dto.getItemIds();
         if (CollectionUtils.isEmpty(itemIds)) {
@@ -242,18 +237,26 @@
         // 鏁伴噰杩斿洖淇℃伅
         Map<String, Object> map = new HashMap<>();
         for (Device device : deviceList) {
+
+            Device device1 = deviceMapper.selectById(device.getId());
+            dto.setDbUserName(device1.getDbUserName());
+            dto.setDbPassword(device1.getDbPassword());
+            dto.setDbTable(device1.getDbTable());
             String ip = device.getIp();
+
             // 鏍规嵁妫�楠岄」鑾峰彇config
             List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                     .in(DataConfig::getStructureItemParameterId, itemParameterIds)
                     .eq(DataConfig::getDeviceId, device.getId()));
 
             // 鑾峰彇璁惧閰嶇疆绫�
-            // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗�
+            // 鍒ゆ柇璁惧鏄惁鏄暟瀛楃洿妗CZX-ZB-ER02022
             if (device.getManagementNumber().equals("JCZX-ZB-ER02022")) {
                 map.putAll(dataCollectBridge(list, device, dto.getEntrustCode()));
+
             } else {
-                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag()));
+                map.putAll(DataAcquisition.dataAcquisitionEntrance(list, device, dto.getEntrustCode(), dto.getEntrustCode(), ip, insProducts.get(0).getCableTag(),dto.getDbUserName(),dto.getDbPassword(),dto.getDbTable()));
+
             }
         }
 
@@ -361,6 +364,7 @@
             template.write(os);
             os.flush();
             os.close();
+            inputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("瀵煎嚭澶辫触");
@@ -405,11 +409,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 +500,7 @@
             template.write(os);
             os.flush();
             os.close();
+            inputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("瀵煎嚭澶辫触");

--
Gitblit v1.9.3