diff --git a/face-common/src/main/java/com/dkha/common/enums/ApiUrlEnum.java b/face-common/src/main/java/com/dkha/common/enums/ApiUrlEnum.java index 6d2c68a..5a9aaa7 100644 --- a/face-common/src/main/java/com/dkha/common/enums/ApiUrlEnum.java +++ b/face-common/src/main/java/com/dkha/common/enums/ApiUrlEnum.java @@ -17,6 +17,10 @@ import org.springframework.beans.factory.annotation.Value; public enum ApiUrlEnum { // @Value("${api.server.prefix}") 请求前缀维护在face-common的faceApiUrl.properties 中 // String link; +//口罩人脸识别项目所用的接口地址重新定义 +FACE_SEARCH("message/mask", "人脸检测"), +FACE_COMPARISON("compare", "一比一比对"), + ALARM_POSTURL("alarm", "查看单个报警任务(业务场景卡口)post"), ALARMS_POSTURL("alarms", "查看批量报警post"), @@ -28,9 +32,9 @@ public enum ApiUrlEnum { TASK_POSTURL("control", "任务操作"), TASK_VEDIO_POSTURL("controlVedio", "视频比对任务操作"), FACE_SEARCH_LIB("faceSearchLib", "人脸库检索"), - FACE_SEARCH("faceSearch", "人脸检测"), + //FACE_SEARCH("faceSearch", "人脸检测"), FACE_GROUP("faceGroup", "分组检索"), - FACE_COMPARISON("faceComparison", "一比一比对"), + //FACE_COMPARISON("faceComparison", "一比一比对"), CAMERA("camera", "摄像头操作"); private String url; private String message; diff --git a/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java b/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java index c5f145d..a196db0 100644 --- a/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java +++ b/face-server/src/main/java/com/dkha/server/services/impl/CompareServiceImpl.java @@ -107,28 +107,21 @@ public class CompareServiceImpl implements ICompareService { if (compareRequestVo.getUrlList().size() != comparePicSize) { throw new DkException("请上传1:1比对的两张图片"); } -// String apiUrl = apiServerPrefix + ApiUrlEnum.FACE_COMPARISON.getUrl(); + + //String apiUrl = apiServerPrefix + ApiUrlEnum.FACE_COMPARISON.getUrl(); String apiUrltest = "http://192.168.1.196:5001/compare"; FaceCompareVO faceCompareVO = new FaceCompareVO(); faceCompareVO.setImage1(compareRequestVo.getUrlList().get(0)); faceCompareVO.setImage2(compareRequestVo.getUrlList().get(1)); + System.out.println(); ReturnVO returnVO = (ReturnVO)httpUtil.post(apiUrltest, faceCompareVO, ReturnVO.class); ApiFaceOneSearchReturnFaceVO apiFaceOneSearchReturnFaceVO = JsonUtil.string2Obj(JsonUtil.obj2String(returnVO.getData()), new TypeReference() {}); //返回结果集 OneToOneResultVo oneToOneResultVo = new OneToOneResultVo(); - if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO)){ + if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO)) { oneToOneResultVo.getUrls().add(faceCompareVO.getImage1()); oneToOneResultVo.getUrls().add(faceCompareVO.getImage2()); oneToOneResultVo.setScore(apiFaceOneSearchReturnFaceVO.getHitSimilarity()); - if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO)) { -// if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO.getFaces())) { -// for (ApiFaceOneSearchFaceVO apiFaceOneSearchFaceVO : apiFaceOneSearchReturnFaceVO.getFaces()) { -// oneToOneResultVo.getUrls().add(apiFaceOneSearchFaceVO.getUrl()); -// } - oneToOneResultVo.getUrls().add(faceCompareVO.getImage1()); - oneToOneResultVo.getUrls().add(faceCompareVO.getImage1()); - oneToOneResultVo.setScore(apiFaceOneSearchReturnFaceVO.getHitSimilarity()); -// } } // if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO)) { // if (UtilValidate.isNotEmpty(apiFaceOneSearchReturnFaceVO.getFaces())) { @@ -177,10 +170,8 @@ public class CompareServiceImpl implements ICompareService { //人脸检测url //String faceSearchUrl = apiRequestPrefix + ApiUrlEnum.FACE_SEARCH.getUrl(); String faceSearchUrltest ="http://192.168.3.134:5000/message/mask"; - String faceSearchUrltest ="http://192.168.3.132:5000/message/mask"; //组装api请求数据 - ReturnVO returnVO; - returnVO = (ReturnVO) httpUtil.post(faceSearchUrltest + "?url=" + image, null, ReturnVO.class); + ReturnVO returnVO = (ReturnVO) httpUtil.post(faceSearchUrltest + "?url=" + image, null, ReturnVO.class); System.out.println(returnVO.getCode()+returnVO.getMessage()); if (returnVO.getCode() != 200) { throw new DkException(returnVO.getMessage());