From 527cbd85e37842d93d081f33916dca5c6f7156e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 24 九月 2023 09:53:58 +0800
Subject: [PATCH] 修改 9.22
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
index 736da38..175cb11 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java
@@ -1,12 +1,9 @@
package com.yuanchu.mom.service.impl;
-import cn.hutool.extra.qrcode.BufferedImageLuminanceSource;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.zxing.*;
-import com.google.zxing.common.HybridBinarizer;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.pojo.vo.RawInsProductVo;
@@ -15,12 +12,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@@ -50,21 +42,11 @@
//鏂板鍘熸潗鏂欐楠屽崟
@Override
@Transactional(rollbackFor = Exception.class)
- public String addRawInspects(String userId, RawInspectVo rawInspectVo) throws Exception {
+ public String addRawInspects(String userId, RawInspectVo rawInspectVo) {
//鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
rawInspectVo.setUserName(userMapper.selectById(userId).getName());
//鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
- /*for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
- char internal = rawInsProductVo.getInternal().charAt(0);
- char required = rawInsProductVo.getRequired().charAt(0);
- if (internal != '>' && internal != '<' && internal != '=') {
- return "鍐呮帶鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- if (required != '>' && required != '<' && required != '=') {
- return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
- }
- }*/
/*鏂板鍘熸潗鏂欐楠屽崟*/
RawInspect rawInspect = new RawInspect();
BeanUtils.copyProperties(rawInspectVo, rawInspect);
@@ -83,8 +65,14 @@
String required = rawInsProduct.getRequired();//鏍囧噯鍊�
String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
+ char req = required.charAt(0);
List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
- int values = checkValues(required, internal, s);
+ int values=2;
+ if (req == '>' || req == '<' || req == '=') {
+ values = checkValues(required, internal, s);
+ }else {
+ values = conValues(required, internal, s);
+ }
return values;
}).collect(Collectors.toList());
if (list.contains(0)) {
@@ -152,12 +140,13 @@
.build();
inspectUnacceptedMapper.insert(rawUnaccepted);
}
- return "涓婃姤鎴愬姛!";
+ return rawInspect.getJudgeState().toString();
}
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
- private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ //濡傛灉鏄辩殑鎿嶄綔
+ private int conValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
double standVar = Double.parseDouble(standardValueStr);
double controlVar = Double.parseDouble(controlValueStr);
double detecVar = Double.parseDouble(detectionValueStr);
@@ -167,14 +156,17 @@
return 1;
}
return 0;
- /*boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ }
+ //濡傛灉鏄�> , < ,=鐨勬搷浣�
+ private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
+ boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
if (isStandardValueSatisfied && isControlValueSatisfied) {
return 1;
} else {
return 0;
- }*/
+ }
}
private boolean isValueSatisfied(String valueStr, String detectionValueStr) {
--
Gitblit v1.9.3