From 95831e5932a2571feaeb8cbc9bba3bfbdb1667fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 31 八月 2023 10:58:42 +0800
Subject: [PATCH] 修改
---
sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java | 2 +-
sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java | 4 ++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java | 1 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 5 ++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java | 5 +++++
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
index 64d49bb..0eb5ece 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProduct.java
@@ -29,6 +29,7 @@
* 椤圭洰id
**/
@TableId(type = IdType.AUTO)
+ @TableField("id")
private Integer id;
/**
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
index 089d728..ec69439 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
@@ -10,6 +10,11 @@
@Data
public class InsProductVo implements Serializable {
+
+ @JsonSerialize
+ private Integer id;
+
+
/**
* 椤圭洰鍚嶇О
**/
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index acc2f3f..0780007 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -239,8 +239,10 @@
BeanUtils.copyProperties(inspectionMaterial, inspectDetailVo);
/*鏌ヨ妫�楠屽崟閲岄潰鐨勬楠岄」鐩�,骞跺皝瑁呭埌RawInspectVo瀵硅薄涓�*/
LambdaQueryWrapper<InspectionProduct> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
+ queryWrapper
+ .eq(InspectionProduct::getInspectionMaterialId, inspectionMaterial.getId());
List<InspectionProduct> inspectionProducts = inspectionProductMapper.selectList(queryWrapper);
+ System.out.println(inspectionProducts);
//杩欓噷鏌ュ埌鐨勮澶噄d鍜屾楠屽憳id瑕佹煡璇㈠悕绉�
List<InsProductVo> insProductVos = inspectionProducts.stream().map(insProduct -> {
//灏嗕竴涓璞＄殑鍊艰祴鍊肩粰鍙︿竴涓璞�
@@ -258,6 +260,7 @@
}
//椤圭洰鍏宠仈鐗╂枡id
insProductVo.setInspectionMaterialId(inspectionMaterial.getId());
+ insProductVo.setId(insProduct.getId());
return insProductVo;
}).collect(Collectors.toList());
inspectDetailVo.setInsProducts(insProductVos);
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java b/sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java
index 5a2b1ef..8d1a317 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/commandLineRunner/ResolutionRequestsCommandLineRunner.java
@@ -41,7 +41,7 @@
@SneakyThrows
@Override
- public void run(String... args) throws Exception {
+ public void run(String... args){
log.info("瀹瑰櫒鐢熸垚涔嬪悗鎵ц");
List<Class<?>> classList = MyClassUtil.getClassList("com.yuanchu.limslaboratory.controller");
List<Map<String, String>> requestListInfo = new ArrayList<Map<String, String>>();
diff --git a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
index a200a24..9e892da 100644
--- a/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
+++ b/sys/src/test/java/com/yuanchu/limslaboratory/SysApplicationTests.java
@@ -44,11 +44,11 @@
@Test
void TT2(){
- String adminMD5 = SecureUtil.md5(SecureUtil.md5("admin"));
+ String adminMD5 = SecureUtil.md5(SecureUtil.md5("Fixiaobai"));
System.out.println(adminMD5);
// 鏋勫缓
AES aes = SecureUtil.aes(adminMD5.getBytes(StandardCharsets.UTF_8));
- String admins = aes.encryptHex("admin");
+ String admins = aes.encryptHex("Fixiaobai");
System.out.println(SecureUtil.md5(admins));
}
--
Gitblit v1.9.3