From c2538085f897faa67abf32f23fc006e816df3c09 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 18 七月 2024 18:20:23 +0800
Subject: [PATCH] 文件采集完成 - 数采
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index 1edd34a..38e1c96 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -1,7 +1,7 @@
package com.yuanchu.mom.service.impl;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -85,17 +85,34 @@
public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
Integer id;
try {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery().eq(StructureItemParameter::getInspectionItem, inspectionItem).eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass).last("limit 1").select(StructureItemParameter::getId)).getId();
+ if (ObjectUtils.isEmpty(inspectionItemSubclass)) {
+ id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+ .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+ .last("limit 1").select(StructureItemParameter::getId)).getId();
+ }else {
+ id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+ .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+ .eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
+ .last("limit 1").select(StructureItemParameter::getId)).getId();
+ }
} catch (Exception e) {
return null;
}
- List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery().eq(Device::getDeviceStatus, 0).isNotNull(Device::getInsProductIds));
+ List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery()
+ .eq(Device::getDeviceStatus, 0)
+ .isNotNull(Device::getInsProductIds));
List<Device> devices2 = new ArrayList<>();
for (Device device : devices) {
- List<Integer> ids = JSON.parseArray(device.getInsProductIds(), Integer.class);
- for (Integer i : ids) {
- if (i == id) {
+ String[] ids = device.getInsProductIds().split(",");
+ for (String i : ids) {
+ if (i.equals(id + "")) {
+ if (ObjectUtils.isEmpty(device.getFileType()) || ObjectUtils.isEmpty(device.getCollectUrl())) {
+ device.setIsItADataAcquisitionDevice(false);
+ } else {
+ device.setIsItADataAcquisitionDevice(true);
+ }
devices2.add(device);
+ break;
}
}
}
--
Gitblit v1.9.3