From 0d930cdcf56bb92e67afabf45ec860689baf0282 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 13:07:22 +0800
Subject: [PATCH] 人员修改
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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 1097201..46a9b91 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,6 +1,7 @@
package com.yuanchu.mom.service.impl;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -55,6 +56,12 @@
private DataConfigService dataConfigService;
@Override
+ public List<User> selectUserList() {
+ List<User> users = userMapper.selectList(new LambdaQueryWrapper<User>().like(User::getDepartLimsId, "1"));
+ return users;
+ }
+
+ @Override
public Map<String, Object> selectDeviceParameter(Page page, DeviceDto itemParameter) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(DeviceDto.class));
@@ -105,17 +112,25 @@
@Override
public List<Device> selectDeviceByCategory(String inspectionItem, String inspectionItemSubclass) {
- Integer id;
+ List<Integer> id;
try {
if (ObjectUtils.isEmpty(inspectionItemSubclass)) {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
+
}else {
- id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// id = structureItemParameterMapper.selectOne(Wrappers.<StructureItemParameter>lambdaQuery()
+// .eq(StructureItemParameter::getInspectionItem, inspectionItem)
+// .eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
+// .last("limit 1").select(StructureItemParameter::getId)).getId();
+ id = structureItemParameterMapper.selectList(Wrappers.<StructureItemParameter>lambdaQuery()
.eq(StructureItemParameter::getInspectionItem, inspectionItem)
.eq(StructureItemParameter::getInspectionItemSubclass, inspectionItemSubclass)
- .last("limit 1").select(StructureItemParameter::getId)).getId();
+ .select(StructureItemParameter::getId)).stream().map(StructureItemParameter::getId).collect(Collectors.toList());
}
} catch (Exception e) {
return null;
@@ -127,9 +142,11 @@
for (Device device : devices) {
String[] ids = device.getInsProductIds().split(",");
for (String i : ids) {
- if (i.equals(id + "")) {
- devices2.add(device);
- break;
+ if (ObjectUtils.isNotEmpty(i)) {
+ if (id.contains(Integer.parseInt(i))) {
+ devices2.add(device);
+ break;
+ }
}
}
}
@@ -172,17 +189,12 @@
.orderBy(false, false, DataConfig::getId));
list1.addAll(list);
});
+ List<DataConfig> collect = list1.stream().distinct().collect(Collectors.toList());
// 3銆侀噰闆嗭紝鍙栨暟鎹�
- Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(list1, device.get(0), entrustCode, sampleCode, ip);
+ Map<String, Object> map = DataAcquisition.dataAcquisitionEntrance(collect, device.get(0), entrustCode, sampleCode, ip);
// 4銆侀�犲惊鐜鏁帮紝鍙備笌鍏紡璁＄畻
if (ObjectUtils.isNotEmpty(map)) {
- Object result;
Map<String, Object> frequency = DataAcquisition.createFrequency(entrustCode, sampleCode, map);
-// if (ObjectUtils.isEmpty(device.get(0).getEntrustCode()) && ObjectUtils.isEmpty(device.get(0).getSampleCode())) {
-// result = formulaCalculation(frequency, true);
-// } else {
-// result = formulaCalculation(frequency, false);
-// }
return Result.success(frequency);
} else {
return Result.success(null);
--
Gitblit v1.9.3