bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

face improvement

This commit is contained in:
sxu 2025-03-31 14:47:37 +08:00
parent e8f98246f0
commit 1c6c34ea5f
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/dto/UnifiedFaceRegisterParamDTO.java
View File

@ -1,5 +1,6 @@
package com.bonus.canteen.core.customer.dto; package com.bonus.canteen.core.customer.dto;
import com.bonus.canteen.core.common.utils.SysUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
public class UnifiedFaceRegisterParamDTO { public class UnifiedFaceRegisterParamDTO {
@ -34,7 +35,7 @@ public class UnifiedFaceRegisterParamDTO {
} }
public String getMinioPicPath() { public String getMinioPicPath() {
return this.minioPicPath; return SysUtil.getCutPath(this.minioPicPath);
} }
public void setImageBase64(final String imageBase64) { public void setImageBase64(final String imageBase64) {
@ -50,7 +51,7 @@ public class UnifiedFaceRegisterParamDTO {
} }
public void setMinioPicPath(final String minioPicPath) { public void setMinioPicPath(final String minioPicPath) {
this.minioPicPath = minioPicPath; this.minioPicPath = SysUtil.getCutPath(this.minioPicPath);
} }

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/service/impl/FaceRegisterServiceImpl.java
View File

@ -235,10 +235,7 @@ public class FaceRegisterServiceImpl implements FaceRegisterService {
if ("1".equals(faceMetadataModel.getIfRainbowSoftFaceUrl())){ if ("1".equals(faceMetadataModel.getIfRainbowSoftFaceUrl())){
System.out.println("开始采集虹软人脸"); System.out.println("开始采集虹软人脸");
ArcFaceHelper arcFaceHelper = new ArcFaceHelper(); ArcFaceHelper arcFaceHelper = new ArcFaceHelper();
System.out.println("开始采集" + registerParamDTO.getMinioPicPath()); FaceResult faceResult = arcFaceHelper.getFaceFeatures(registerParamDTO.getMinioPicPath());
String finalUrl = String.format("%s%s", "http://192.168.0.14:9090", registerParamDTO.getMinioPicPath().trim());
System.out.println("finalUrl:" + finalUrl);
FaceResult faceResult = arcFaceHelper.getFaceFeatures(finalUrl);
System.err.println("采集结束"); System.err.println("采集结束");
if (faceResult != null){ if (faceResult != null){
MultiModelFaceVO faceVO = new MultiModelFaceVO(); MultiModelFaceVO faceVO = new MultiModelFaceVO();

20
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/customer/utils/ArcFaceHelper.java
View File

@ -6,6 +6,7 @@ import com.arcsoft.face.enums.DetectOrient;
import com.arcsoft.face.enums.ErrorInfo; import com.arcsoft.face.enums.ErrorInfo;
import com.arcsoft.face.enums.ImageFormat; import com.arcsoft.face.enums.ImageFormat;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
@ -25,17 +26,22 @@ import java.util.List;
@Configuration @Configuration
public class ArcFaceHelper { public class ArcFaceHelper {
private static final String APP_ID = "52XE2dQBtdmMsfDMvyKmPCD8wfSfJyBsQBsVa2HXS6pg"; @Value("${face.arc-face.app-id}")
private static String APP_ID;
/**
* linux_64
*/
@Value("${face.arc-face.linux64-sdk-key}")
private static String LINUX64_SDK_KEY;
/** /**
* x64 * x64
*/ */
private static final String WIN64_SDK_KEY = "3TMzo8nmWDka6NJDrbX7e2y1ew4QgSia4iGBniyWU4qq"; private static final String WIN64_SDK_KEY = "3TMzo8nmWDka6NJDrbX7e2y1ew4QgSia4iGBniyWU4qq";
/** @Value("${face.arc-face.face-engine-path}")
* linux_64 private static String faceEnginePath;
*/
private static final String LINUX64_SDK_KEY = "3TMzo8nmWDka6NJDrbX7e2y1WpVESExKSnShHKmNAiML";
private static FaceEngine faceEngine = null; private static FaceEngine faceEngine = null;
@ -50,7 +56,7 @@ public class ArcFaceHelper {
//激活引擎 //激活引擎
faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY); faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY);
} else { } else {
faceEngine = new FaceEngine("/data/arcsoft_lib_64"); faceEngine = new FaceEngine(faceEnginePath);
//激活引擎 //激活引擎
errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY); errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY);
} }
@ -94,7 +100,7 @@ public class ArcFaceHelper {
//激活引擎 //激活引擎
faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY); faceEngine.activeOnline(APP_ID, WIN64_SDK_KEY);
} else { } else {
faceEngine = new FaceEngine("/data/lzhdata/arcsoft_lib_64"); faceEngine = new FaceEngine(faceEnginePath);
//激活引擎 //激活引擎
errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY); errorCode = faceEngine.activeOnline(APP_ID, LINUX64_SDK_KEY);
} }

6
bonus-modules/bonus-smart-canteen/src/main/resources/bootstrap.yml
View File

@ -23,6 +23,12 @@ spring:
"[device-buffet-alarm-report-v4/#]": device-mqtt #设备计量主机异常上报入参 "[device-buffet-alarm-report-v4/#]": device-mqtt #设备计量主机异常上报入参
"[device-log-info-update-v4/#]": device-mqtt #设备日志上传消息 "[device-log-info-update-v4/#]": device-mqtt #设备日志上传消息
face:
arc-face:
app-id: 52XE2dQBtdmMsfDMvyKmPCD8wfSfJyBsQBsVa2HXS6pg
linux64-sdk-key: 3TMzo8nmWDka6NJDrbX7e2y1WpVESExKSnShHKmNAiML
face-engine-path: /data/arcsoft_lib_64
system: system:
mqtt-tcp-address: ${MQTT_TCP_ADDRESS:${RABBITMQ_CLIENT_ADDRESS:192.168.0.244:1883}} mqtt-tcp-address: ${MQTT_TCP_ADDRESS:${RABBITMQ_CLIENT_ADDRESS:192.168.0.244:1883}}
mqtt-websocket-address: ${MQTT_WEBSOCKET_ADDRESS:${RABBITMQ_WEB_CLIENT_ADDRESS:}} mqtt-websocket-address: ${MQTT_WEBSOCKET_ADDRESS:${RABBITMQ_WEB_CLIENT_ADDRESS:}}