From 7d7a2c706c5409741e56c4aad32cae7c08e7dbc4 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 26 Sep 2024 10:51:25 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B49=E6=9C=8826=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AF=B9=E6=AF=94=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/face/FaceMain.java |  6 +--
 .../controller/TCompareInfoController.java    | 44 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/face/FaceMain.java b/jeecg-module-main/src/main/java/org/jeecg/modules/face/FaceMain.java
index f50c5d8..32ac03b 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/face/FaceMain.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/face/FaceMain.java
@@ -175,9 +175,9 @@ public class FaceMain {
 	public static void main(String[] args) {
 		// 初始化一个AipFace
 		FaceMain faceMain = new FaceMain();
-		faceMain.APP_ID = "";
-		faceMain.API_KEY = "";
-		faceMain.SECRET_KEY = "";
+		faceMain.APP_ID = "37872563";
+		faceMain.API_KEY = "RBOnlD4HVDnRrdUYNOiykwGz";
+		faceMain.SECRET_KEY = "PeTEGIgcSRXLILoVjQ2GBah1NN2XrWBK";
 		AipFace client = faceMain.creatApiClent();
 
 
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java
index 5353ffa..16b69e0 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java
@@ -326,18 +326,18 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
 			faceMain.runFlag();
 			faceMain.addRunSize(allNum,freshmanMap.keySet().size());
 			//高考信息
-			List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.query().list();
+			List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.lambdaQuery().eq(TGkPicinfo::getNj, year).list();
 			Map<String, TGkPicinfo> gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap(TGkPicinfo::getSfzh,(a) -> a, (a,b) -> a));
 			faceMain.runFlag();
 			//身份证信息
-			List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.query().list();
+			List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.lambdaQuery().eq(TSfzPicinfo::getNj, year).list();
 			Map<String, TSfzPicinfo> sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap(TSfzPicinfo::getSfzh,(a) -> a, (a,b) -> a));
 			faceMain.runFlag();
 			//学籍信息
-			List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.query().list();
+			List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.lambdaQuery().eq(TXjPicinfo::getNj, year).list();
 			Map<String, TXjPicinfo> xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap(TXjPicinfo::getSfzh,(a) -> a, (a,b) -> a));
 			faceMain.runFlag();
-			List<TCompareInfo> compareInfoList = tCompareInfoService.lambdaQuery().list();
+			List<TCompareInfo> compareInfoList = tCompareInfoService.lambdaQuery().eq(TCompareInfo::getNj, year).list();
 			Map<String, TCompareInfo> compareInfoMap = compareInfoList.stream().collect(Collectors.toMap(TCompareInfo::getSfzh,(a) -> a, (a,b) -> a));
 			faceMain.runFlag();
 
@@ -465,23 +465,23 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
 							continue;
 						}
 						String resStr = res.toString();
-						log.info(resStr);
+						log.info("对比学籍-身份证，返回结果（字符串版纯享版）：{}", resStr);
 						//判断是否调用成功
-						Integer errorCode = res.getInt("error_code");
-						String errorMsg = res.getString("error_msg");
+						boolean codeIsExist = !res.isNull("error_code");
+						Integer errorCode = codeIsExist?res.getInt("error_code"):-1;
 
 						compareInfo.setCompareResult1(String.valueOf(errorCode));//返回对比分数（100%）
-						compareInfo.setCompareRemark1(errorMsg);//接口返回总结果
+						compareInfo.setCompareRemark1(resStr);//接口返回总结果
 						if(errorCode == 0){
 							JSONObject result = res.getJSONObject("result");
 							Object sScore = result.get("score");
 							Integer score = 0;
 							if(StringUtils.isNotBlank(sScore.toString())){
 								Double d = Double.parseDouble(sScore.toString());
-								score =  d.intValue();
+								score = d.intValue();
 							}
 							compareInfo.setCompareResult1(String.valueOf(score));//返回对比分数（100%）
-							compareInfo.setCompareRemark1(result.toString());//接口返回总结果
+							compareInfo.setCompareRemark1(resStr);//接口返回总结果
 						}else if(errorCode == 17){
 							//终止循环，保存结果
 							log.info("出现调用次数用尽错误码，停止本次对比，保存结果！其中新增{}个，修改{}个",aCinfoList.size(),uCinfoList.size());
@@ -553,24 +553,24 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
 							continue;
 						}
 						String resStr = res.toString();
-						log.info(resStr);
+						log.info("对比学籍-高考，返回结果（字符串版纯享版）：{}", resStr);
 						//判断是否调用成功
 
-						Integer errorCode = res.getInt("error_code");
-						String errorMsg = res.getString("error_msg");
+						boolean codeIsExist = !res.isNull("error_code");
+						Integer errorCode = codeIsExist?res.getInt("error_code"):-1;
 
 						compareInfo.setCompareResult2(String.valueOf(errorCode));//返回对比分数（100%）
-						compareInfo.setCompareRemark2(errorMsg);//接口返回总结果
+						compareInfo.setCompareRemark2(resStr);//接口返回总结果
 						if(errorCode == 0){
 							JSONObject result = res.getJSONObject("result");
 							Object sScore = result.get("score");
 							Integer score = 0;
 							if(StringUtils.isNotBlank(sScore.toString())){
 								Double d = Double.parseDouble(sScore.toString());
-								score =  d.intValue();
+								score = d.intValue();
 							}
 							compareInfo.setCompareResult2(String.valueOf(score));//返回对比分数（100%）
-							compareInfo.setCompareRemark2(result.toString());//接口返回总结果
+							compareInfo.setCompareRemark2(resStr);//接口返回总结果
 						}else if(errorCode == 17){
 							//终止循环，保存结果
 							log.info("出现调用次数用尽错误码，停止本次对比，保存结果！其中新增{}个，修改{}个",aCinfoList.size(),uCinfoList.size());
@@ -641,15 +641,15 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
 							compareInfo.setCompareRemark1("对比接口无响应");//接口返回总结果
 							continue;
 						}
-						//String resStr = res.toString();
-						//log.info("对比接口返回结果：{}",resStr);
+						String resStr = res.toString();
+						log.info("对比身份证-高考，返回结果（字符串版纯享版）：{}", resStr);
 						//判断是否调用成功
 
-						Integer errorCode = res.getInt("error_code");
-						String errorMsg = res.getString("error_msg");
+						boolean codeIsExist = !res.isNull("error_code");
+						Integer errorCode = codeIsExist?res.getInt("error_code"):-1;
 
 						compareInfo.setCompareResult3(String.valueOf(errorCode));//返回对比分数（100%）
-						compareInfo.setCompareRemark3(errorMsg);//接口返回总结果
+						compareInfo.setCompareRemark3(resStr);//接口返回总结果
 						if(errorCode == 0){
 							JSONObject result = res.getJSONObject("result");
 							Object sScore = result.get("score");
@@ -659,7 +659,7 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
 								score =  d.intValue();
 							}
 							compareInfo.setCompareResult3(String.valueOf(score));//返回对比分数（100%）
-							compareInfo.setCompareRemark3(result.toString());//接口返回总结果
+							compareInfo.setCompareRemark3(resStr);//接口返回总结果
 						}else if(errorCode == 17){
 							//终止循环，保存结果
 							log.info("出现调用次数用尽错误码，停止本次对比，保存结果！其中新增{}个，修改{}个",aCinfoList.size(),uCinfoList.size());