From d17bfc830729d53d0ca3ccdb9160e0145479cdcf Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期六, 13 七月 2024 15:10:49 +0800
Subject: [PATCH] 数采配置添加完成

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   71 ++++++++++++++++++++++++++++-------
 1 files changed, 57 insertions(+), 14 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 a0e7e8c..14e33c1 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
@@ -1,27 +1,34 @@
 package com.yuanchu.mom.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.DataConfigDto;
 import com.yuanchu.mom.dto.DeviceDto;
-import com.yuanchu.mom.dto.DeviceDto1;
+import com.yuanchu.mom.pojo.DataConfig;
 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;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,6 +43,9 @@
 
     @Value("${file.path}")
     private String filePath;
+
+    @Autowired
+    private DataConfigService dataConfigService;
 
     @ValueClassify("璁惧")
     @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@@ -134,22 +144,55 @@
         return Result.success(deviceService.selectDeviceByCode(code));
     }
 
-    @ValueClassify("璁惧")
-    @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
-    @PostMapping("/getNumberCollect")
-    public Result<?> getNumberCollect(Integer id) {
-        DeviceDto1 deviceDto1 = new DeviceDto1();
-        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
-        return Result.success(deviceDto1);
+//    @ValueClassify("璁惧")
+//    @ApiOperation(value = "鏌ヨ鏁伴噰閰嶇疆")
+//    @PostMapping("/getNumberCollect")
+//    public Result<?> getNumberCollect(Integer id) {
+//        DeviceDto1 deviceDto1 = new DeviceDto1();
+//        BeanUtils.copyProperties(deviceService.getById(id),deviceDto1);
+//        return Result.success(deviceDto1);
+//    }
+//
+//    @ValueClassify("璁惧")
+//    @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
+//    @PostMapping("/numberCollect")
+//    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
+//        Device device = new Device();
+//        BeanUtils.copyProperties(deviceDto1,device);
+//        return Result.success(deviceService.updateById(device));
+//    }
+
+    @ValueAuth
+    @ApiModelProperty("/鏁伴噰")
+    @GetMapping("/text")
+    public Result<?> text(HttpServletRequest request) {
+        return Result.success(DataAcquisition.dataAcquisitionEntrance(request, new Device()));
     }
 
     @ValueClassify("璁惧")
     @ApiOperation(value = "缁存姢鏁伴噰閰嶇疆")
-    @PostMapping("/numberCollect")
-    public Result<?> numberCollect(@RequestBody DeviceDto1 deviceDto1) {
-        Device device = new Device();
-        BeanUtils.copyProperties(deviceDto1,device);
-        return Result.success(deviceService.updateById(device));
+    @PostMapping("/saveDataAcquisitionConfiguration")
+    public Result<?> saveDataAcquisitionConfiguration(@RequestBody DataConfigDto dataConfigList) {
+        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 = "鍒犻櫎鏁伴噰閰嶇疆")
+    @DeleteMapping("/deleteDataAcquisitionConfiguration")
+    public Result<?> deleteDataAcquisitionConfiguration(@RequestParam("id") Integer id) {
+        dataConfigService.removeById(id);
+        return Result.success();
     }
 }
 

--
Gitblit v1.9.3