From c29fa5d90112f6d13647ebe8ebd7cf4638137240 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 17 四月 2025 16:24:12 +0800
Subject: [PATCH] 设备添加使用授权界面

---
 cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java |   77 ++++++++++++++++++++++++--------------
 1 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
index cde5054..b7a30f7 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DataConfigServiceImpl.java
@@ -1,8 +1,10 @@
 package com.ruoyi.device.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.device.dto.DataConfigDto;
@@ -33,44 +35,61 @@
 
     private DataConfigMapper dataConfigMapper;
 
+    /**
+     * 缁存姢璁惧鏂囦欢閰嶇疆
+     * @param dataConfigList
+     */
     @Override
-    public void deleteDataConfig() {
-        List<Integer> integers = dataConfigMapper.deleteDataConfig();
-        if (!integers.isEmpty()) {
-            dataConfigMapper.deleteBatchIds(integers);
+    public void saveDeviceFileConfiguration(DataConfigDto dataConfigList) {
+        if (dataConfigList.getDeviceId() == null) {
+            throw new RuntimeException("缂哄皯璁惧Id");
         }
+
+        Device device = new Device();
+        BeanUtils.copyProperties(dataConfigList, device);
+        device.setId(dataConfigList.getDeviceId());
+        deviceMapper.updateById(device);
     }
 
+    /**
+     * 鏁伴噰閰嶇疆
+     * @param dataConfigList
+     */
     @Override
-    public void saveDataAcquisitionConfiguration(Integer deviceId, DataConfigDto dataConfigList) {
-        if (dataConfigList.getIsDevice()) {
-            Device device = new Device();
-            BeanUtils.copyProperties(dataConfigList, device);
-            device.setId(deviceId);
-            deviceMapper.updateById(device);
-        } else {
-            this.saveOrUpdateBatch(dataConfigList.getDataConfigList());
+    public void saveDataAcquisitionConfiguration(DataConfigDto dataConfigList) {
+        if (dataConfigList.getDeviceId() == null) {
+            throw new RuntimeException("缂哄皯璁惧id");
         }
+
+        for (DataConfig dataConfig : dataConfigList.getDataConfigList()) {
+            if (dataConfig.getStructureItemParameterId() == null) {
+                throw new RuntimeException("缂哄皯妫�楠岄」id");
+            }
+            dataConfig.setDeviceId(dataConfigList.getDeviceId());
+        }
+
+        this.saveOrUpdateBatch(dataConfigList.getDataConfigList());
+
     }
 
     @Override
     public Result<?> queryDataAcquisitionConfiguration(DataConfig dataConfig) {
-        if (dataConfig.getIsDevice()) {
-            LambdaQueryWrapper<DataConfig> wrapper = Wrappers.<DataConfig>lambdaQuery()
-                    .eq(DataConfig::getDeviceId, dataConfig.getDeviceId())
-                    .eq(DataConfig::getInspectionItem, dataConfig.getInspectionItem())
-                    .eq(DataConfig::getInspectionItemSubclass, dataConfig.getInspectionItemSubclass());
-            if (StringUtils.isNotBlank(dataConfig.getInspectionItemClass())) {
-                wrapper.eq(DataConfig::getInspectionItemClass, dataConfig.getInspectionItemClass());
-            }
-            if (dataConfig.getStructureItemParameterId() != null) {
-                wrapper.eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId());
-            }
-            List<DataConfig> list = baseMapper.selectList(wrapper);
-            return Result.success(list);
-        } else {
-            return Result.success(dataConfigMapper.selectDataConfigList(dataConfig.getDeviceId()));
+        return Result.success(dataConfigMapper.selectDataConfigList(dataConfig.getDeviceId()));
+
+    }
+
+    /**
+     * 鏌ヨ妫�楠岄」鏁伴噰閰嶇疆
+     * @param dataConfig
+     * @return
+     */
+    @Override
+    public Result<?> queryProductConfiguration(DataConfig dataConfig) {
+        if (dataConfig.getStructureItemParameterId() == null) {
+            throw new RuntimeException("缂哄皯妫�娴嬮」id");
         }
+        List<DataConfig> list = baseMapper.selectList(Wrappers.<DataConfig>lambdaQuery().eq(DataConfig::getStructureItemParameterId, dataConfig.getStructureItemParameterId()));
+        return Result.success(list);
     }
 
     /**
@@ -79,7 +98,7 @@
      * @return
      */
     @Override
-    public List<DataConfig> getNoConfigProduct(Integer deviceId) {
-        return baseMapper.getNoConfigProduct(deviceId);
+    public IPage<DataConfig> getNoConfigProduct(Page page, Integer deviceId) {
+        return baseMapper.getNoConfigProduct(page, deviceId);
     }
 }

--
Gitblit v1.9.3