From 97dea6f6d32e26d3d61db8467d0e208b498437bd Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 九月 2023 11:34:24 +0800
Subject: [PATCH] 修改2.0 9.20
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java | 61 +++++++++++++++++++-----------
1 files changed, 38 insertions(+), 23 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 5df5261..736da38 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,24 +1,26 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.hutool.extra.qrcode.BufferedImageLuminanceSource;
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;
+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;
import com.yuanchu.mom.pojo.vo.RawInspectVo;
import com.yuanchu.mom.service.*;
-import com.yuanchu.mom.utils.MyUtil;
-import org.apache.logging.log4j.util.Strings;
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;
@@ -48,12 +50,12 @@
//鏂板鍘熸潗鏂欐楠屽崟
@Override
@Transactional(rollbackFor = Exception.class)
- public String addRawInspects(String userId, RawInspectVo rawInspectVo) {
+ public String addRawInspects(String userId, RawInspectVo rawInspectVo) throws Exception {
//鎶ユ浜�(鏂板妫�楠屽崟鐨勪汉)
rawInspectVo.setUserName(userMapper.selectById(userId).getName());
//鏍￠獙鏍囧噯鍊�,鍐呮帶鍊兼牸寮�
List<RawInsProductVo> rawInsProductVos = rawInspectVo.getRawInsProducts();
- for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
+ /*for (RawInsProductVo rawInsProductVo : rawInsProductVos) {
char internal = rawInsProductVo.getInternal().charAt(0);
char required = rawInsProductVo.getRequired().charAt(0);
if (internal != '>' && internal != '<' && internal != '=') {
@@ -62,7 +64,7 @@
if (required != '>' && required != '<' && required != '=') {
return "鏍囧噯鍊艰緭鍏ユ牸寮忔湁闂!";
}
- }
+ }*/
/*鏂板鍘熸潗鏂欐楠屽崟*/
RawInspect rawInspect = new RawInspect();
BeanUtils.copyProperties(rawInspectVo, rawInspect);
@@ -72,19 +74,25 @@
RawInsProduct rawInsProduct = new RawInsProduct();
BeanUtils.copyProperties(rawInsProVo, rawInsProduct);
if (ObjectUtils.isNotEmpty(rawInsProduct.getTestValue())) {
- //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
- String required = rawInsProduct.getRequired();//鏍囧噯鍊�
- String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
- String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
- List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
- int values = checkValues(required, internal, s);
- return values;
- }).collect(Collectors.toList());
- if (list.contains(0)) {
- //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ if (rawInsProduct.getTestValue().equals("杩�")) {
+ rawInsProduct.setTestState(1);
+ } else if (rawInsProduct.getTestValue().equals("涓嶈繃")) {
rawInsProduct.setTestState(0);
} else {
- rawInsProduct.setTestState(1);
+ //鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�0
+ String required = rawInsProduct.getRequired();//鏍囧噯鍊�
+ String internal = rawInsProduct.getInternal();//鍐呮帶鍊�
+ String testValue = rawInsProduct.getTestValue();//妫�娴嬪��
+ List<Integer> list = Arrays.stream(testValue.split(",")).map(s -> {
+ int values = checkValues(required, internal, s);
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ rawInsProduct.setTestState(0);
+ } else {
+ rawInsProduct.setTestState(1);
+ }
}
rawInsProduct.setUserId(Integer.parseInt(userId));
}
@@ -106,8 +114,6 @@
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@Override
public Map<String, Object> selectRawInspectsListById(Integer id) {
- Map<String, Object> map = rawInspectMapper.selectRawInspectsListById(id);
- MyUtil.PrintLog(map.toString());
return rawInspectMapper.selectRawInspectsListById(id);
}
@@ -152,14 +158,23 @@
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
- boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
+ double standVar = Double.parseDouble(standardValueStr);
+ double controlVar = Double.parseDouble(controlValueStr);
+ double detecVar = Double.parseDouble(detectionValueStr);
+ double a = standVar + controlVar;
+ double b = standVar - controlVar;
+ if (detecVar >= b && detecVar <= a) {
+ return 1;
+ }
+ return 0;
+ /*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