From 3b97f4ff54e1d7162486d57023985339baed8208 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 13:30:17 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java | 4 ++--
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 8 ++++----
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java | 5 +++--
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 10 +++++-----
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
index bda04df..1c192e7 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsProduct.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +25,7 @@
* 涓婚敭id
*/
@TableId(type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("椤圭洰鍙傛暟id")
private Integer structureItemParameterId;
@@ -180,7 +181,7 @@
private Integer insBushId;
@ApiModelProperty("鏍囧噯鏂规硶id")
- private Integer standardMethodListId;
+ private Long standardMethodListId;
//杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
@TableField(exist = false ,select = false)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 39879ab..7168206 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -359,7 +359,7 @@
insContext.forEach((k, v) -> {
JSONObject jo = JSON.parseObject(JSON.toJSONString(v));
InsProduct insProduct = new InsProduct();
- insProduct.setId(Integer.parseInt(k));
+ insProduct.setId(Long.valueOf(Integer.parseInt(k)));
InsProduct product = insProductMapper.selectById(insProduct.getId());
if (currentTable.equals(product.getTemplateId()) && currentSampleId.equals(product.getInsSampleId())) {
List<InsProductResult> oldResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
@@ -466,7 +466,7 @@
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
- insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
+ insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), Math.toIntExact(insProduct.getId())));
insSample.setInsState(1);
Long l = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
@@ -823,8 +823,8 @@
// 7.鏍￠獙涓�涓媟esult琛�(閬垮厤鍑虹幇澶氫釜妫�楠岄」缁撴灉)
threadPoolTaskExecutor.execute(() -> {
- List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
- for (Integer ip : ips) {
+ List<Long> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
+ for (Long ip : ips) {
List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
.eq(InsProductResult::getInsProductId, ip));
if (insProductResults.size() > 1) {
@@ -879,7 +879,7 @@
InsOrderRates insOrderRates = new InsOrderRates();
insOrderRates.setInsOrderId(orderId);
insOrderRates.setInsSampleId(insProduct.getInsSampleId());
- insOrderRates.setInsProductId(insProduct.getId());
+ insOrderRates.setInsProductId(Math.toIntExact(insProduct.getId()));
insOrderRates.setSampleCode(insProduct.getSampleCode());
insOrderRates.setEntrustCode(order.getEntrustCode());
insOrderRates.setInspectionItemClass(insProduct.getInspectionItemClass());
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index 18b8a22..ab3572e 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -192,14 +192,14 @@
auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
auxiliaryOutputWorkingHours.setPrice(insProduct.getPrice());//鍗曚环
auxiliaryOutputWorkingHours.setSampleId(insProduct.getInsSampleId());//鏍峰搧id
- auxiliaryOutputWorkingHours.setInsProductId(insProduct.getId());//妫�楠岄」id
+ auxiliaryOutputWorkingHours.setInsProductId(Math.toIntExact(insProduct.getId()));//妫�楠岄」id
return auxiliaryOutputWorkingHours;
}).collect(Collectors.toList());
// 鍒濇鍒嗛厤妫�楠屼汉锛屽悇涓楠岄」榛樿璁㈠崟鐨勬楠屼汉
List<Integer> insProductIds = insProductList.stream().map(insproduct -> {
- return insproduct.getId();
+ return Math.toIntExact(insproduct.getId());
}).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(insProductIds)){
insProductMapper.batchUpdateInsProductCheckUserId(insProductIds, userId);
@@ -309,7 +309,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getInsulating().getStandardMethodListId()));
}
addInsProductMethod(a.getId(), ip2);
}
@@ -327,7 +327,7 @@
ip2.addAll(insProducts);
}
for (InsProduct product : ip2) {
- product.setStandardMethodListId(a.getAuxiliaryWireCore().getStandardMethodListId());
+ product.setStandardMethodListId(Long.valueOf(a.getAuxiliaryWireCore().getStandardMethodListId()));
}
addInsProductMethod(a.getId(), ip2);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index b94b604..54a80ed 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -182,7 +182,7 @@
for (InsProduct product : insProducts) {
for (InsProduct insProduct1 : insProductBindingList) {
insProduct1.setId(null);
- insProduct1.setBindingProductId(product.getId());
+ insProduct1.setBindingProductId(Math.toIntExact(product.getId()));
insProduct1.setCableTag(product.getCableTag());
}
this.saveBatch(insProductBindingList);
@@ -232,7 +232,7 @@
List<InsProductDto> insProductDtoList = insProductDto.getInsProductDtoList();
for (InsProductDto productDto : insProductDtoList) {
InsProduct insProduct = new InsProduct();
- insProduct.setId(productDto.getInsProductId());
+ insProduct.setId(Long.valueOf(productDto.getInsProductId()));
insProduct.setCheckUserId(productDto.getCheckUserId());
insProductMapper.updateById(insProduct);
}
--
Gitblit v1.9.3