From c9a7198eb87bcd7ac8d2b21d6cf9d977e726fdd2 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 10:31:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index eb36cf3..96f6c17 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -26,9 +26,11 @@
 import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 璁惧(DeviceController)琛ㄦ帶鍒跺眰
@@ -190,26 +192,55 @@
     @ValueClassify("璁惧")
     @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
     @PostMapping("/saveDataAcquisitionConfiguration")
-    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
-        dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
+    public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
+        if (dataConfigList.getIsDevice()) {
+            System.out.println();
+            Device device = new Device();
+            device.setId(deviceId);
+            device.setCollectUrl(dataConfigList.getCollectUrl());
+            device.setStorageUrl(dataConfigList.getStorageUrl());
+            device.setIp(dataConfigList.getIp());
+            device.setFileType(dataConfigList.getFileType());
+            deviceService.updateById(device);
+        } else {
+            dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
+        }
         return Result.success();
     }
+
+//    @ValueClassify("璁惧")
+//    @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+//    @GetMapping("/queryDataAcquisitionConfiguration")
+//    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
+//        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
+//                .eq(DataConfig::getDeviceId, deviceId)
+//                .eq(DataConfig::getInsProductItem, insProductItem));
+//        return Result.success(list);
+//    }
 
     @ValueClassify("璁惧")
     @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
     @GetMapping("/queryDataAcquisitionConfiguration")
-    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId, @RequestParam("insProductItem") String insProductItem) {
-        List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
+    public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId,
+                                                       @RequestParam("isDevice") Boolean isDevice,
+                                                       @RequestParam(value = "insProductItem", required = false) String insProductItem) {
+        if (isDevice) {
+            List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                 .eq(DataConfig::getDeviceId, deviceId)
                 .eq(DataConfig::getInsProductItem, insProductItem));
-        return Result.success(list);
+            return Result.success(list);
+        } else {
+            return Result.success(dataConfigService.selectDataConfigList(deviceId));
+        }
     }
 
     @ValueClassify("璁惧")
     @ApiOperation(value = "鍒犻櫎鏁伴噰閰嶇疆")
     @DeleteMapping("/deleteDataAcquisitionConfiguration")
-    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
-        dataConfigService.removeById(id);
+    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("ids") String ids) {
+        List<String> split = Arrays.asList(ids.split(","));
+        List<String> collect = split.stream().distinct().collect(Collectors.toList());
+        dataConfigService.removeBatchByIds(collect);
         return Result.success();
     }
 }

--
Gitblit v1.9.3