From f32e75ed3d34f31da74c0199d53139268e9cd560 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 28 八月 2023 11:53:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 4 ++++
sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 4 ----
pom.xml | 2 +-
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java | 5 ++++-
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
index d49897a..b5abe93 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -37,6 +37,10 @@
@JsonSerialize
private String conclusion;
+ @ApiModelProperty(value = "妫�楠岀被鍨�")
+ @JsonSerialize
+ private int type;
+
@ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃 3:涓嶉�氳繃")
@JsonSerialize
private Integer status;
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
index 83e1b27..8dd7601 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
@@ -70,7 +70,6 @@
int finalI = i;
mapList.stream().filter(m->Objects.equals(String.valueOf(m.get("type")),String.valueOf(TYPE_INT_LIST.get(finalI))))
.forEach(m->{
- System.out.println(m.get("type"));
if(Objects.equals(m.get("inspectionStatus"),0)){
integerNoPass.incrementAndGet();
}
@@ -89,7 +88,6 @@
list.add(mapNoPass);
mapResult.put("series",list);
mapResult.put("noData",true);
- System.out.println("鎵ц缁撴潫getTestSampleStatistics________________>"+mapResult);
//System.out.println(mapResult);
return mapResult;
}
@@ -153,7 +151,6 @@
seriesDtoList.add(seriesDto2);
allMap.put("series", seriesDtoList);
allMap.put("noData",true);
- System.out.println("getSupplierNoPassStatistics缁撴灉++++++++++++++++>"+allMap);
return allMap;
}
@@ -194,7 +191,6 @@
allMap.put("legend",NameList);
allMap.put("series",doubleList);
allMap.put("noData",true);
- System.out.println("getNoPassProjectStatistics缁撴灉==========================>"+allMap);
return allMap;
}
diff --git a/pom.xml b/pom.xml
index e7451ca..ac09719 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<commons.lang3>3.12.0</commons.lang3>
<hutool.version>5.8.18</hutool.version>
<!-- 鎵撳寘鍚庡鍑虹殑璺緞 -->
- <package.path>${project.build.directory}/LIMS</package.path>
+ <package.path>C:/LIMS</package.path>
</properties>
<dependencies>
diff --git a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
index fd0b5fe..6654f39 100644
--- a/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
+++ b/sys/src/main/java/com/yuanchu/limslaboratory/aop/AuthRequestAspect.java
@@ -93,7 +93,7 @@
//throw new AuthException("400","鏃犳潈闄�");
}
}else {
- throw new AuthException("401","鐧婚檰杩囨湡");
+// throw new AuthException("401","鐧婚檰杩囨湡");
}
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
index 42b669d..c1c4e18 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.limslaboratory.exception.AuthException;
import com.yuanchu.limslaboratory.mapper.MenuMapper;
import com.yuanchu.limslaboratory.mapper.RoleManageMapper;
import com.yuanchu.limslaboratory.pojo.Menu;
@@ -147,6 +148,9 @@
public Map<String, Object> getUrlType(String url) {
String type=null;
Map<String, Object> stringIntegerMap = roleManageMapper.selctInterFaceType(url);
+ if(Objects.isNull(stringIntegerMap)){
+ throw new AuthException("403","娌℃湁璇ヨ祫婧�");
+ }
String of = String.valueOf(stringIntegerMap.get("type"));
switch (of) {
case "0":
@@ -165,7 +169,6 @@
break;
}
stringIntegerMap.put("type",type);
- System.out.println(type);
return stringIntegerMap;
}
--
Gitblit v1.9.3