From 0087434cc70ca8cee692be654d9e1c6ec82c3da7 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 21:09:21 +0800
Subject: [PATCH] 数采bug调整
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 23 +++++++++++++++++------
1 files changed, 17 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 6a73257..71f8b14 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
@@ -8,10 +8,12 @@
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
+import com.yuanchu.mom.exception.ErrorException;
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;
@@ -176,11 +178,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,12 +198,17 @@
@PostMapping("/saveDataAcquisitionConfiguration")
public Result<?> saveDataAcquisitionConfiguration(@RequestParam(value = "deviceId") Integer deviceId, @RequestBody DataConfigDto dataConfigList) {
if (dataConfigList.getIsDevice()) {
+ Device one = deviceService.getOne(Wrappers.<Device>lambdaQuery()
+ .eq(Device::getIp, dataConfigList.getIp()));
+ if (ObjectUtils.isNotEmpty(one)) {
+ throw new ErrorException("璇P锛�" + dataConfigList.getIp() + "宸茬粡缁戝畾浜嗚澶囷細" + one.getDeviceName());
+ }
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());
@@ -222,11 +231,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