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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 96f6c17..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;
@@ -176,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);
@@ -194,7 +197,6 @@
@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());
@@ -223,11 +225,13 @@
@GetMapping("/queryDataAcquisitionConfiguration")
public Result<?> queryDataAcquisitionConfiguration(@RequestParam("deviceId") Integer deviceId,
@RequestParam("isDevice") Boolean isDevice,
- @RequestParam(value = "insProductItem", required = false) String insProductItem) {
+ @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));
+ .eq(DataConfig::getInspectionItem, inspectionItem)
+ .eq(DataConfig::getInspectionItemSubclass, inspectionItemSubclass));
return Result.success(list);
} else {
return Result.success(dataConfigService.selectDataConfigList(deviceId));
--
Gitblit v1.9.3