yangjun
/
dbsd_sfhy_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2024年11月2日 修复身份核验的时候保存的结果1被覆盖的问题

This commit is contained in:
bai 2024-11-02 04:08:10 +08:00
parent f3dd522749
commit bf322250c5
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jeecg-module-main/src/main/java/org/jeecg/modules/student/tCompareInfo/controller/TCompareInfoController.java
View File

@ -287,7 +287,8 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
@ApiOperation(value="计算人脸数据比值", notes="计算人脸数据比值")
@GetMapping(value = "/calcAllFaceData")
public Result<?> calcAllFaceData(@RequestParam(name="year",required=true) String year,
@RequestParam(name="type",defaultValue="all") String type
@RequestParam(name="type",defaultValue="all") String type,
@RequestParam(name="sfzh",required=false) String caclSfzh
//@RequestParam(name="fillUrl",required=true) String fillUrl
) {
log.info("开始批量对比！");
@ -321,23 +322,23 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
//int yearI = Integer.parseInt(year);
//核心学生信息
List<TFreshman> freshmanList = tFreshmanService.lambdaQuery().eq(TFreshman::getNj,year).list();
List<TFreshman> freshmanList = tFreshmanService.lambdaQuery().eq(TFreshman::getNj,year).eq(StringUtils.isNotBlank(caclSfzh), TFreshman::getSfzh, caclSfzh).list();
Map<String, TFreshman> freshmanMap = freshmanList.stream().collect(Collectors.toMap(TFreshman::getSfzh,(a) -> a, (a,b) -> a));
faceMain.runFlag();
faceMain.addRunSize(allNum,freshmanMap.keySet().size());
faceMain.addRunSize(allNum,freshmanMap.size());
//高考信息
List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.lambdaQuery().eq(TGkPicinfo::getNj, year).list();
List<TGkPicinfo> gkPicinfoList = tGkPicinfoService.lambdaQuery().eq(TGkPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TGkPicinfo::getSfzh, caclSfzh).list();
Map<String, TGkPicinfo> gkPicinfoMap = gkPicinfoList.stream().collect(Collectors.toMap(TGkPicinfo::getSfzh,(a) -> a, (a,b) -> a));
faceMain.runFlag();
//身份证信息
List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.lambdaQuery().eq(TSfzPicinfo::getNj, year).list();
List<TSfzPicinfo> sfzPicinfoList = tSfzPicinfoService.lambdaQuery().eq(TSfzPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TSfzPicinfo::getSfzh, caclSfzh).list();
Map<String, TSfzPicinfo> sfzPicinfoMap = sfzPicinfoList.stream().collect(Collectors.toMap(TSfzPicinfo::getSfzh,(a) -> a, (a,b) -> a));
faceMain.runFlag();
//学籍信息
List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.lambdaQuery().eq(TXjPicinfo::getNj, year).list();
List<TXjPicinfo> xjPicinfoList = tXjPicinfoService.lambdaQuery().eq(TXjPicinfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TXjPicinfo::getSfzh, caclSfzh).list();
Map<String, TXjPicinfo> xjPicinfoMap = xjPicinfoList.stream().collect(Collectors.toMap(TXjPicinfo::getSfzh,(a) -> a, (a,b) -> a));
faceMain.runFlag();
List<TCompareInfo> compareInfoList = tCompareInfoService.lambdaQuery().eq(TCompareInfo::getNj, year).list();
List<TCompareInfo> compareInfoList = tCompareInfoService.lambdaQuery().eq(TCompareInfo::getNj, year).eq(StringUtils.isNotBlank(caclSfzh), TCompareInfo::getSfzh, caclSfzh).list();
Map<String, TCompareInfo> compareInfoMap = compareInfoList.stream().collect(Collectors.toMap(TCompareInfo::getSfzh,(a) -> a, (a,b) -> a));
faceMain.runFlag();
@ -352,7 +353,7 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
for (String sfzh: freshmanMap.keySet()) {
allNum++;
faceMain.runFlag();
faceMain.addRunSize(allNum,freshmanMap.keySet().size());
faceMain.addRunSize(allNum,freshmanMap.size());
log.info("身份证号为：{}",sfzh);
//读取redis flag，标记为退出，则退出循环保存结果
if(faceMain.isStop()){
@ -548,8 +549,8 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
JSONObject res = faceMain.matchBySystemFileUrl(base64Img1, base64Img2);
log.info("对比学籍-高考，对比结果：{}",res);
if (res == null) {
compareInfo.setCompareResult1(null);//返回对比分数（100%）
compareInfo.setCompareRemark1("对比接口无响应");//接口返回总结果
compareInfo.setCompareResult2(null);//返回对比分数（100%）
compareInfo.setCompareRemark2("对比接口无响应");//接口返回总结果
continue;
}
String resStr = res.toString();
@ -637,8 +638,8 @@ public class TCompareInfoController extends JeecgController<TCompareInfo, ITComp
JSONObject res = faceMain.matchBySystemFileUrl(base64Img1, base64Img2);
log.info("对比身份证-高考，对比结果：{}",res);
if (res == null) {
compareInfo.setCompareResult1(null);//返回对比分数（100%）
compareInfo.setCompareRemark1("对比接口无响应");//接口返回总结果
compareInfo.setCompareResult3(null);//返回对比分数（100%）
compareInfo.setCompareRemark3("对比接口无响应");//接口返回总结果
continue;
}
String resStr = res.toString();