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 | 3 ++-
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 7 +++++++
2 files changed, 9 insertions(+), 1 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 6a73257..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
@@ -194,12 +194,13 @@
@PostMapping("/saveDataAcquisitionConfiguration")
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(device.getFileType());
+ device.setFileType(dataConfigList.getFileType());
deviceService.updateById(device);
} else {
dataConfigService.saveOrUpdateBatch(dataConfigList.getDataConfigList());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index bc840f3..79c81a2 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -113,6 +113,13 @@
return num == 1 ? Result.success() : Result.fail("鎻愪氦澶辫触锛岄儴鍒嗛」鐩繕鏈繘琛屾楠�");
}
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "鏄惁鍏佽淇敼閲囬泦鍊�")
+ @DeleteMapping("/isItAllowedToModifyTheCollectedValues")
+ public Result<?> isItAllowedToModifyTheCollectedValues() {
+ return Result.success();
+ }
+
@ApiOperation(value = "淇濆瓨妫�楠屽唴瀹�")
@PostMapping("/saveInsContext")
@ValueAuth
--
Gitblit v1.9.3