From 4d9364da736f322cfeeec2815e83f2a3f6534223 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 44 insertions(+), 5 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 f96c1bb..af19300 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
@@ -10,8 +10,10 @@
 import com.yuanchu.mom.dto.DeviceDto;
 import com.yuanchu.mom.pojo.DataConfig;
 import com.yuanchu.mom.pojo.Device;
+import com.yuanchu.mom.pojo.PkMaster;
 import com.yuanchu.mom.service.DataConfigService;
 import com.yuanchu.mom.service.DeviceService;
+import com.yuanchu.mom.service.PkMasterService;
 import com.yuanchu.mom.utils.DataAcquisition;
 import com.yuanchu.mom.utils.JackSonUtil;
 import com.yuanchu.mom.vo.Result;
@@ -49,6 +51,9 @@
     @Autowired
     private DataConfigService dataConfigService;
 
+    @Autowired
+    private PkMasterService pkMasterService;
+
     @ValueClassify("璁惧")
     @ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
     @PostMapping("/selectDeviceParameter")
@@ -57,18 +62,21 @@
         DeviceDto itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), DeviceDto.class);
         return Result.success(deviceService.selectDeviceParameter(page, itemParameter));
     }
+
     @ValueClassify("璁惧")
     @ApiOperation(value = "娣诲姞璁惧璇︽儏鍙傛暟")
     @PostMapping("/addDeviceParameter")
     public Result addDeviceParameter(@RequestBody Device itemParameter) {
         return Result.success(deviceService.addDeviceParameter(itemParameter));
     }
+
     @ValueClassify("璁惧")
     @ApiOperation(value = "鍒犻櫎璁惧璇︽儏鍙傛暟")
     @PostMapping("/delDeviceParameter")
     public Result<?> delDeviceParameter(Integer id) {
         return Result.success(deviceService.delDeviceParameter(id));
     }
+
     @ValueClassify("璁惧")
     @ApiOperation(value = "淇敼璁惧璇︽儏鍙傛暟")
     @PostMapping("/upDeviceParameter")
@@ -169,8 +177,8 @@
     @ApiOperation("/鏁伴噰-鏁版嵁閲囬泦")
     @GetMapping("/dataCollection")
     public Result<?> dataAcquisition(HttpServletRequest request, @RequestParam("id") Integer id,
-                          @RequestParam("entrustCode") String entrustCode,
-                          @RequestParam("sampleCode") String sampleCode) {
+                                     @RequestParam("entrustCode") String entrustCode,
+                                     @RequestParam("sampleCode") String sampleCode) {
         return deviceService.dataAcquisition(request, id, entrustCode, sampleCode);
     }
 
@@ -203,6 +211,8 @@
             device.setStorageUrl(dataConfigList.getStorageUrl());
             device.setIp(dataConfigList.getIp());
             device.setFileType(dataConfigList.getFileType());
+            device.setMdbEntrustCode(dataConfigList.getMdbEntrustCode());
+            device.setMdbSampleCode(dataConfigList.getMdbSampleCode());
             deviceService.updateById(device);
         } else {
             dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
@@ -229,9 +239,9 @@
                                                        @RequestParam(value = "inspectionItemSubclass", required = false) String inspectionItemSubclass) {
         if (isDevice) {
             List<DataConfig> list = dataConfigService.list(Wrappers.<DataConfig>lambdaQuery()
-                .eq(DataConfig::getDeviceId, deviceId)
-                .eq(DataConfig::getInspectionItem, inspectionItem)
-                .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
+                    .eq(DataConfig::getDeviceId, deviceId)
+                    .eq(DataConfig::getInspectionItem, inspectionItem)
+                    .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
             return Result.success(list);
         } else {
             return Result.success(dataConfigService.selectDataConfigList(deviceId));
@@ -247,5 +257,34 @@
         dataConfigService.removeBatchByIds(collect);
         return Result.success();
     }
+
+    @ValueAuth
+    @ApiOperation(value = "鑿滃崟")
+    @PostMapping("/menu")
+    public Result menu() {
+        return Result.success(deviceService.menu());
+    }
+
+
+    @ValueClassify("璁惧")
+    @ApiOperation(value = "娓╁害寰幆鏁伴噰")
+    @PostMapping("/temDataAcquisition")
+    public Result<?> temDataAcquisition(@RequestBody PkMaster pkMaster) {
+        return Result.success(pkMasterService.temDataAcquisition(pkMaster));
+    }
+
+    @ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
+    @GetMapping("/treeDevice")
+    @ValueAuth
+    public Result treeDevice(String deviceName) {
+        return Result.success(deviceService.treeDevice(deviceName));
+    }
+
+
+    @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
+    @PostMapping("/temDataAcquisition2")
+    public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
+        return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
+    }
 }
 

--
Gitblit v1.9.3