From 2de0bc2174bbec2a48db059d3850f0529c0539fc Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 七月 2024 23:09:05 +0800
Subject: [PATCH] 数采bug调整

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 11 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..f96c1bb 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
@@ -12,6 +12,7 @@
 import com.yuanchu.mom.pojo.Device;
 import com.yuanchu.mom.service.DataConfigService;
 import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.utils.DataAcquisition;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
@@ -26,9 +27,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)琛ㄦ帶鍒跺眰
@@ -174,11 +177,13 @@
     @ValueAuth
     @ApiOperation(value = "鍒ゆ柇璇ヨ澶囨槸鍚﹀彲浠ユ暟閲�")
     @GetMapping("/determineWhetherToCollectData")
-    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber) {
+    public Result<?> determineWhetherToCollectData(@RequestParam("managementNumber") String managementNumber, HttpServletRequest request) {
+        String ip = DataAcquisition.getIp(request);
         Device device = deviceService.getOne(Wrappers.<Device>lambdaQuery()
-                .eq(Device::getManagementNumber, managementNumber));
+                .eq(Device::getManagementNumber, managementNumber)
+                .eq(Device::getIp, ip));
         if (ObjectUtils.isEmpty(device)) {
-            return Result.fail("璁惧缂栧彿閿欒锛�");
+            return Result.success(false);
         }
         if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
             return Result.success(false);
@@ -190,26 +195,56 @@
     @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()) {
+            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 = "inspectionItem", required = false) String inspectionItem,
+                                                       @RequestParam(value = "inspectionItemSubclass", required = false) String inspectionItemSubclass) {
+        if (isDevice) {
+            List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
                 .eq(DataConfig::getDeviceId, deviceId)
-                .eq(DataConfig::getInsProductItem, insProductItem));
-        return Result.success(list);
+                .eq(DataConfig::getInspectionItem, inspectionItem)
+                .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
+            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