From dd301742784e570ec01098907f56e5c9c19b5a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 23 七月 2024 17:26:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 79d817d..8c51007 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -3,7 +3,6 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -22,10 +21,11 @@
import com.deepoove.poi.data.*;
import com.deepoove.poi.data.style.*;
import com.deepoove.poi.util.TableTools;
-import com.deepoove.poi.xwpf.WidthScalePattern;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.*;
+import com.yuanchu.mom.dto.ExcelDto;
+import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -34,22 +34,17 @@
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.utils.RedisUtil;
-import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
-import com.yuanchu.mom.vo.InsOrderPlanVO;
-import com.yuanchu.mom.vo.ProductVo;
-import com.yuanchu.mom.vo.SampleVo;
+import com.yuanchu.mom.vo.*;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.*;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblWidth;
-import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTblWidth;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.io.*;
-import java.math.BigInteger;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
@@ -132,7 +127,6 @@
@Resource
private InsOrderFileMapper insOrderFileMapper;
-
@Override
public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
Map<String, Object> map = new HashMap<>();
@@ -197,7 +191,7 @@
}
@Override
- public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory) {
+ public List<InsProduct> getInsProduct(Integer id, Integer type, String laboratory, HttpServletRequest request) {
List<InsProduct> insProducts = new ArrayList<>();
switch (type) {
case 0:
@@ -210,6 +204,9 @@
insProducts = insSampleMapper.getInsProduct3(id);
break;
}
+ // 鏁伴噰鏂板
+ getDeviceMessage(insProducts, request);
+
Set<Integer> set = new HashSet<>();
Map<Integer, String> map2 = new HashMap<>();
if (BeanUtil.isEmpty(insProducts)) return null;
@@ -217,6 +214,30 @@
return insProducts;
}
+ private List<InsProduct> getDeviceMessage(List<InsProduct> insProducts, HttpServletRequest request) {
+ String ipAddress = request.getRemoteAddr();
+ // 闃叉鍥炵幆鍦板潃鍙樹负IPv6
+ String ip = ipAddress.equals("0:0:0:0:0:0:0:1") ? "127.0.0.1" : ipAddress;
+ insProducts.forEach(i -> {
+ Map<String, Object> devices = baseMapper.getDeviceMessage(ip, i.getInspectionItem());
+ if (ObjectUtils.isNotEmpty(devices)) {
+ InsProductResult insProductResult = i.getInsProductResult();
+ List<Object> list = new ArrayList<>();
+ Map<Object, Object> hashMap = new HashMap<>();
+ hashMap.put("v", devices.get("device_name"));
+ list.add(hashMap);
+ insProductResult.setEquipName(JSON.toJSON(list).toString());
+ List<Object> listValue = new ArrayList<>();
+ Map<Object, Object> hashMapValue = new HashMap<>();
+ hashMapValue.put("v", devices.get("management_number"));
+ listValue.add(hashMapValue);
+ insProductResult.setEquipName(JSON.toJSON(list).toString());
+ insProductResult.setEquipValue(JSON.toJSON(listValue).toString());
+ }
+ });
+ return insProducts;
+ }
+
@Override
public List<String> checkSubmitPlan(Integer orderId, String laboratory) {
List<String> collect = new ArrayList<>();
--
Gitblit v1.9.3