From d1ea726be5628c46fb6be700a0197002d55d39f1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 13:14:24 +0800
Subject: [PATCH] 修改2.0 9.25
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java | 104 +++++++++++++++++++++++++++++++--------------------
1 files changed, 63 insertions(+), 41 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
index e0a13f1..248bef1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectionItemServiceImpl.java
@@ -1,26 +1,24 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.InspectionItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.mom.mapper.InspectionItemMapper;
+import com.yuanchu.mom.mapper.TechniqueMapper;
+import com.yuanchu.mom.pojo.InspectionItem;
+import com.yuanchu.mom.pojo.RawInsProduct;
import com.yuanchu.mom.pojo.dto.InspectionItemDto;
import com.yuanchu.mom.pojo.dto.UpdateInspectionItemDto;
import com.yuanchu.mom.service.DeviceService;
import com.yuanchu.mom.service.InspectionItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.service.SpecificationsService;
-import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.utils.MyUtil;
-import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -36,53 +34,77 @@
@Resource
private InspectionItemMapper inspectionItemMapper;
- @Autowired
- private DeviceService deviceService;
+
+
+ //鏂板鎸夐挳-->2銆佹煡璇㈡墍鏈夋楠岄」鐩�
@Override
- public void insertList(Integer finishInspectId, List<Map<String, Object>> list) {
- List<InspectionItem> list1 = new ArrayList<>();
- for (Map<String, Object> map : list){
- try {
- InspectionItem inspectionItem = JackSonUtil.unmarshal(JackSonUtil.marshal(map), InspectionItem.class);
- inspectionItem.setFinishInspectId(finishInspectId);
- list1.add(inspectionItem);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- inspectionItemMapper.insertBatchSomeColumn(list1);
+ public List<InspectionItemDto> selectInspectionItem(Integer id, Integer type) {
+ return inspectionItemMapper.selectInspectionItem(id,type);
}
+ //鏇存敼璁惧
@Override
- public List<InspectionItemDto> selectInspectionItem(Integer finishInspectId) {
- return inspectionItemMapper.selectInspectionItem(finishInspectId);
+ public void updateDevByInsId(Integer id, Integer type, Integer devId) {
+ LambdaUpdateWrapper<InspectionItem> updateWrapper = Wrappers.<InspectionItem>lambdaUpdate()
+ .eq(InspectionItem::getId, id)
+ .eq(InspectionItem::getType, type)
+ .set(InspectionItem::getDeviceId, devId)
+ .set(InspectionItem::getInspectionValue, null)
+ .set(InspectionItem::getResult, null);
+ inspectionItemMapper.update(new InspectionItem(), updateWrapper);
}
+ //鏂板鎸夐挳-->2銆佹楠岄」鐩�-->澶卞幓鐒︾偣鍙戣捣璇ヨ姹�
@Override
public Integer addProcessInspectionSheet(String username, UpdateInspectionItemDto updateInspectionItemDto) {
- LambdaUpdateWrapper<InspectionItem> wrapper = new LambdaUpdateWrapper<>();
- wrapper.eq(InspectionItem::getId, updateInspectionItemDto.getInspectionItemId());
- wrapper.set(InspectionItem::getInspectionValue, updateInspectionItemDto.getInspectionValue());
- wrapper.set(InspectionItem::getDeviceId, updateInspectionItemDto.getDeviceId());
- int i = checkValues(updateInspectionItemDto.getRequired(), updateInspectionItemDto.getInternal(), updateInspectionItemDto.getInspectionValue());
- wrapper.set(InspectionItem::getResult, i);
- wrapper.set(InspectionItem::getUsername, username);
- int update = inspectionItemMapper.update(new InspectionItem(), wrapper);
- if (update > 0){
- return i;
+ //鏌ヨ鍐呮帶鍊煎拰鏍囧噯鍊�
+ InspectionItem inspectionItem = inspectionItemMapper.selectById(updateInspectionItemDto.getInspectionItemId());
+ inspectionItem.setInspectionValue(updateInspectionItemDto.getInspectionValue());
+ inspectionItem.setDeviceId(updateInspectionItemDto.getDeviceId());
+ if (updateInspectionItemDto.getInspectionValue().equals("杩�")){
+ inspectionItem.setResult(1);
+ }else if (updateInspectionItemDto.getInspectionValue().equals("涓嶈繃")){
+ inspectionItem.setResult(0);
+ }else {
+ char req = inspectionItem.getRequired().charAt(0);
+ List<Integer> list = Arrays.stream(updateInspectionItemDto.getInspectionValue().split(",")).map(s -> {
+ int values=2;
+ if (req == '>' || req == '<' || req == '=') {
+ values = checkValues(inspectionItem.getRequired(), inspectionItem.getInternal(), s);
+ }else {
+ values = conValues(inspectionItem.getRequired(), inspectionItem.getInternal(), s);
+ }
+ return values;
+ }).collect(Collectors.toList());
+ if (list.contains(0)) {
+ //濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
+ inspectionItem.setResult(0);
+ } else {
+ inspectionItem.setResult(1);
+ }
}
- return 2;
+ inspectionItem.setUsername(username);
+ inspectionItemMapper.updateById(inspectionItem);
+ //杩斿洖妫�楠岄」鐩殑缁撹
+ return inspectionItem.getResult();
}
- @Override
- public List<Map<String, Object>> selectDeviceIdAndName() {
- LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(Device::getId, Device::getName);
- return deviceService.listMaps(wrapper);
- }
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
+ //濡傛灉鏄辩殑鎿嶄綔
+ private int conValues(String standardValueStr, String controlValueStr, String 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;
+ }
+ //濡傛灉鏄�> , < ,=鐨勬搷浣�
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
boolean isControlValueSatisfied = isValueSatisfied(controlValueStr, detectionValueStr);
--
Gitblit v1.9.3