From 9f11eb78b0da5c6130f011bcdbc943434c54d56a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 11:22:06 +0800
Subject: [PATCH] 修改bug5.0 9.9
---
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java | 11 +++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java | 6 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java | 16 ++++++++++++++--
3 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
index 0e75f40..9bdff45 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInsProductController.java
@@ -57,5 +57,16 @@
rawInsProductService.updaterawInsProduct(userId,rpId,testValue,devId);
return Result.success();
}
+
+ @ApiOperation(value = "鏇存敼璁惧")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "rpId", value = "鍘熸潗鏂欐楠岄」鐩甶d", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "DevId", value = "璁惧id", dataTypeClass = Integer.class,required = true)
+ })
+ @PostMapping("/updateDevByRpId")
+ public Result updateDevByRpId(Integer rpId ,Integer devId) {
+ rawInsProductService.updateDevByRpId(rpId,devId);
+ return Result.success();
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
index 3b4f62d..7b18939 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/RawInsProductService.java
@@ -22,5 +22,11 @@
void updaterawInsProduct(int userId, Integer rpId ,String testValue,Integer devId);
+ /**
+ * 鍙洿鏀硅澶�,涔嬪墠鐨勬楠屽�煎垹鎺�
+ * @param rpId
+ * @param devId
+ */
+ void updateDevByRpId(Integer rpId, Integer devId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
index 31bc55f..98ea903 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInsProductServiceImpl.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.yuanchu.mom.service.RawInsProductService;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Date;
@@ -32,7 +33,7 @@
//鏇存柊妫�楠岄」鐩�(濉啓妫�楠屽��,妫�楠岃澶�)
@Override
- public void updaterawInsProduct(int userId,Integer rpId ,String testValue,Integer devId) {
+ public void updaterawInsProduct(int userId, Integer rpId, String testValue, Integer devId) {
RawInsProduct rawInsProduct = rawInsProductMapper.selectById(rpId);
//璧嬪�艰澶�
rawInsProduct.setDeviceId(devId);
@@ -49,7 +50,7 @@
if (list.contains(0)) {
//濡傛灉鍏朵腑涓�涓楠屽�间笉鍚堟牸鍒欒椤圭洰妫�楠屼笉鍚堟牸
rawInsProduct.setTestState(0);
- }else {
+ } else {
rawInsProduct.setTestState(1);
}
/*鏇存柊鍘熸潗鏂欐楠岄」鐩〃*/
@@ -60,6 +61,17 @@
rawInspectMapper.updateById(rawInspect);
}
+ //鍙洿鏀硅澶�,涔嬪墠鐨勬楠屽�煎垹鎺�
+ @Override
+ public void updateDevByRpId(Integer rpId, Integer devId) {
+ RawInsProduct rawInsProduct = new RawInsProduct();
+ rawInsProduct.setId(rpId);
+ rawInsProduct.setDeviceId(devId);
+ rawInsProduct.setTestValue(null);
+ rawInsProduct.setTestState(null);
+ rawInsProductMapper.updateById(rawInsProduct);
+ }
+
/*鍒ゆ柇妫�娴嬪�兼槸鍚︽弧瓒虫爣鍑嗗�煎拰鍐呮帶鍊肩殑瑕佹眰,濡傛灉涓嶆弧瓒冲垯妫�楠岀粨璁轰负涓嶅悎鏍�*/
private int checkValues(String standardValueStr, String controlValueStr, String detectionValueStr) {
boolean isStandardValueSatisfied = isValueSatisfied(standardValueStr, detectionValueStr);
--
Gitblit v1.9.3