333333
This commit is contained in:
parent
03316551b3
commit
7591340195
|
@ -52,47 +52,47 @@ public class FaceInfoManagerController extends ManageBaseController {
|
|||
|
||||
|
||||
|
||||
@Operation(summary = "修改人脸融合基础")
|
||||
/* @Operation(summary = "修改人脸融合基础")
|
||||
@PutMapping("/updateFaceInfo")
|
||||
public ApiResult<Integer> updateFaceInfo(@Valid @RequestBody FaceInfoModRequestVO modRequestVO) throws Exception {
|
||||
FaceInfo faceInfo = faceInfoService.updateFaceInfo(modRequestVO);
|
||||
return ApiResultBuilder.getCommonBuilder(Integer.class).success(faceInfo != null
|
||||
? BigInteger.ONE.intValue() : BigInteger.ZERO.intValue()).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
@Operation(summary = "修改人模版脸图片")
|
||||
/* @Operation(summary = "修改人模版脸图片")
|
||||
@PostMapping("/updateImgFaceInfo")
|
||||
public ApiResult<Integer> updateImgFaceInfo(@RequestParam("file") MultipartFile file,
|
||||
@RequestParam(required = true, value = "faceId") String faceId) throws Exception {
|
||||
FaceInfo faceInfo = faceInfoService.updateImgFaceInfo(file,faceId);
|
||||
return ApiResultBuilder.getCommonBuilder(Integer.class).success(faceInfo != null
|
||||
? BigInteger.ONE.intValue() : BigInteger.ZERO.intValue()).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
|
||||
|
||||
@Operation(summary = "获取人脸融合基础详情")
|
||||
/* @Operation(summary = "获取人脸融合基础详情")
|
||||
@GetMapping("/getFaceInfo")
|
||||
public ApiResult<FaceInfoDetailResponseVO> getFaceInfo(@RequestParam(value = "id") String id) throws Exception {
|
||||
FaceInfoDetailResponseVO responseVO = faceInfoService.getFaceInfo(id);
|
||||
return ApiResultBuilder.getCommonBuilder(FaceInfoDetailResponseVO.class).success(responseVO).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
@Operation(summary = "分页查询人脸融合基础,包含总数")
|
||||
/* @Operation(summary = "分页查询人脸融合基础,包含总数")
|
||||
@PostMapping("/pageAllFaceInfo")
|
||||
public ApiResult<PageResponseVO<FaceInfoPageResponseVO>> pageAll(@Valid @RequestBody FaceInfoPageRequestVO pageRequestVO) throws Exception {
|
||||
PageResponseVO<FaceInfoPageResponseVO> pageResponseVO = this.faceInfoService.pageAll(pageRequestVO);
|
||||
return ApiResultBuilder.getPageCommonBuilder(FaceInfoPageResponseVO.class).success(pageResponseVO).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
|
||||
@Operation(summary = "根据腾讯活动ID和名称获取数据存入数据库")
|
||||
/* @Operation(summary = "根据腾讯活动ID和名称获取数据存入数据库")
|
||||
@PostMapping("/addAllFaceInfoByTx")
|
||||
public ApiResult<List<FaceInfo>> addAllFaceInfoByTx(@Valid @RequestBody FaceInfoTxRequestVO requestVO) throws Exception {
|
||||
return ApiResultBuilder.getListBuilder(FaceInfo.class).success(faceInfoService.addAllFaceInfoByTx(requestVO)).build();
|
||||
}
|
||||
}*/
|
||||
|
||||
@Operation(summary = "获取所有活动")
|
||||
@GetMapping("/queryAllActivity")
|
||||
|
@ -114,6 +114,7 @@ public class FaceInfoManagerController extends ManageBaseController {
|
|||
@RequestParam(required = true, value = "materialId") String materialId,
|
||||
@RequestParam(required = true, value = "faceId") String faceId
|
||||
) throws Exception {
|
||||
|
||||
String imgUrl="";
|
||||
FuseFaceResponse resp=null;
|
||||
|
||||
|
@ -178,11 +179,15 @@ public class FaceInfoManagerController extends ManageBaseController {
|
|||
//素材人脸和对应FaceID
|
||||
mergeInfo.setTemplateFaceID(faceId);
|
||||
|
||||
|
||||
MergeInfo [] mergeInfos =new MergeInfo[1];
|
||||
mergeInfos[0]=mergeInfo;
|
||||
|
||||
req.setMergeInfos(mergeInfos);
|
||||
|
||||
req.setLogoAdd(0L);
|
||||
|
||||
|
||||
// 返回的resp是一个FuseFaceResponse的实例,与请求对象对应
|
||||
resp = client.FuseFace(req);
|
||||
// 输出json格式的字符串回包
|
||||
|
@ -194,7 +199,6 @@ public class FaceInfoManagerController extends ManageBaseController {
|
|||
e.printStackTrace();
|
||||
}
|
||||
|
||||
AttachmentVO vo = new AttachmentVO();
|
||||
return ApiResultBuilder.getCommonBuilder(FuseFaceResponse.class).success(resp).build();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration>
|
||||
<Properties>
|
||||
<Property name="log_base_dir">logs/edu-train</Property>
|
||||
<Property name="log_base_dir">logs/materialFace</Property>
|
||||
<Property name="log_pattern">[%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5p][%t][%c.%M:%L] [%X{x-request-trace-id}] %msg%xEx%n</Property>
|
||||
<Property name="max_single_file_size">10MB</Property>
|
||||
</Properties>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration>
|
||||
<Properties>
|
||||
<Property name="log_base_dir">logs/edu-train</Property>
|
||||
<Property name="log_base_dir">logs/materialFace</Property>
|
||||
<Property name="log_pattern">[%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5p][%t][%c.%M:%L] %X{EagleEye-TraceID} [%X{x-request-trace-id}]
|
||||
%msg%xEx%n
|
||||
</Property>
|
||||
|
|
Loading…
Reference in New Issue