zcloud_gbs
/
zcloud_gbs_basic_info_gwj
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大华口门对接 

(cherry picked from commit 8beed9d73d)
dahua_koumen
zhangxiongfeng 2026-07-28 15:29:07 +08:00
parent 3a8035841b
commit 0117f3b1af
2 changed files with 115 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
View File

@ -100,31 +100,22 @@ public class UserAddExe {
// if (!b) { // if (!b) {
// throw new BizException("请先完善企业信息"); // throw new BizException("请先完善企业信息");
// } // }
log.info("========== 开始新增用户，请求参数 name: {}, corpinfoId: {}, phone: {}, 请求体 JSON: {}", cmd.getName(), cmd.getCorpinfoId(), cmd.getPhone(), JSONUtil.toJsonStr(cmd)); log.info("开始新增用户，name: {}, corpinfoId: {}, phone: {}", cmd.getName(), cmd.getCorpinfoId(), cmd.getPhone());
try { try {
ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); ServletRequestAttributes attrs = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attrs != null) { if (attrs != null) {
HttpServletRequest req = attrs.getRequest(); HttpServletRequest req = attrs.getRequest();
Enumeration<String> headerNames = req.getHeaderNames();
Map<String, String> headerMap = new HashMap<>();
while (headerNames.hasMoreElements()) {
String h = headerNames.nextElement();
headerMap.put(h, req.getHeader(h));
}
log.info("========== 请求头信息: {}", JSONUtil.toJsonStr(headerMap));
String orgidHeader = req.getHeader("orgid"); String orgidHeader = req.getHeader("orgid");
log.info("========== 从请求头获取 orgid: {}", orgidHeader);
if (orgidHeader != null && cmd.getCorpinfoId() == null) { if (orgidHeader != null && cmd.getCorpinfoId() == null) {
try { try {
cmd.setCorpinfoId(Long.parseLong(orgidHeader.trim())); cmd.setCorpinfoId(Long.parseLong(orgidHeader.trim()));
log.info("========== 用请求头 orgid 设置 cmd.corpinfoId: {}", cmd.getCorpinfoId());
} catch (Exception e) { } catch (Exception e) {
log.warn("========== orgid 转 Long 失败: {}", orgidHeader); log.warn("orgid 转 Long 失败: {}", orgidHeader);
} }
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.warn("========== 获取请求头异常: {}", e.getMessage()); log.warn("获取请求头异常: {}", e.getMessage());
} }
Long tenantId = null; Long tenantId = null;
SSOUser ssoUser = AuthContext.getCurrentUser(); SSOUser ssoUser = AuthContext.getCurrentUser();
@ -185,34 +176,39 @@ public class UserAddExe {
userE.setRoleId(roleId); userE.setRoleId(roleId);
} }
try { try {
log.info("========== 企业类型 type: {}", corpInfoDO.getType());
userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType())); userE.setUserType(CorpTypeEnum.getUserTypeByCode(corpInfoDO.getType()));
userE.resetPassword(corpInfoDO.getType()); userE.resetPassword(corpInfoDO.getType());
//先同步大华人脸平台，成功后再保存本地 //先同步大华人脸平台，成功后再保存本地
log.info("========== 开始调用大华同步接口");
syncDaHuaPerson(userE); syncDaHuaPerson(userE);
log.info("========== 大华同步成功，开始保存本地用户");
res = userGateway.add(userE); res = userGateway.add(userE);
log.info("========== 本地保存结果: {}", res);
if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) { if (corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())) {
corpName = corpInfoDO.getCorpName(); corpName = corpInfoDO.getCorpName();
} }
userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId()); userEmploymentLogE.initAdd(userEmploymentLogE, corpName, userE.getId());
userEmploymentLogGateway.add(userEmploymentLogE); try {
addUserChangeRecordForSave(userE, corpInfoDO); userEmploymentLogGateway.add(userEmploymentLogE);
log.info("========== 用户就业日志保存成功"); } catch (Exception e) {
log.error("用户就业日志保存失败（不影响用户主体）, userId: {}, error: {}", userE.getId(), e.getMessage(), e);
}
try {
addUserChangeRecordForSave(userE, corpInfoDO);
} catch (Exception e) {
log.error("用户变更记录保存失败（不影响用户主体）, userId: {}, error: {}", userE.getId(), e.getMessage(), e);
}
} catch (BizException e) { } catch (BizException e) {
log.error("========== 业务异常: {}", e.getMessage(), e); log.error("新增用户业务异常: {}", e.getMessage(), e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
log.error("========== 系统异常: {}", e.getMessage(), e); log.error("新增用户系统异常: {}", e.getMessage(), e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
if (!res) { if (!res) {
throw new BizException("保存失败"); throw new BizException("保存失败");
} }
log.info("========== 新增用户完成"); cmd.setId(userE.getId());
cmd.setUsername(userE.getUsername());
log.info("新增用户完成, userId: {}, username: {}", userE.getId(), userE.getUsername());
return true; return true;
} }
@ -241,67 +237,34 @@ public class UserAddExe {
personMap.put("service", "evo-thirdParty"); personMap.put("service", "evo-thirdParty");
Object faceFile = userE.getFaceFile(); Object faceFile = userE.getFaceFile();
log.info("========== 大华图片调试开始 ==========");
log.info("faceFile原始类型: {}, faceFile原始值(截取前500字符): {}",
faceFile == null ? "null" : faceFile.getClass().getName(),
faceFile == null ? "null" : (faceFile.toString().length() > 500 ? faceFile.toString().substring(0, 500) + "..." : faceFile.toString()));
log.info("userE.getUserAvatarUrl()值(截取前500字符): {}",
userE.getUserAvatarUrl() == null ? "null" : (userE.getUserAvatarUrl().length() > 500 ? userE.getUserAvatarUrl().substring(0, 500) + "..." : userE.getUserAvatarUrl()));
java.util.function.Function<Object, String> extractThumbFromSingle = (singleObj) -> { java.util.function.Function<Object, String> extractThumbFromSingle = (singleObj) -> {
if (singleObj == null) { if (singleObj == null) {
log.debug("单个图片对象为null");
return null; return null;
} }
log.info("从单个对象提取thumbUrl，对象类型: {}", singleObj.getClass().getName());
if (singleObj instanceof Map) { if (singleObj instanceof Map) {
Map<String, Object> faceFileMap = (Map<String, Object>) singleObj; Map<String, Object> faceFileMap = (Map<String, Object>) singleObj;
log.info("单个对象是Map类型，所有key: {}", faceFileMap.keySet());
for (Map.Entry<String, Object> entry : faceFileMap.entrySet()) {
Object v = entry.getValue();
String vStr = v == null ? "null" : (v.toString().length() > 200 ? v.toString().substring(0, 200) + "..." : v.toString());
log.info("单个对象 key={}, value类型={}, value={}", entry.getKey(), v == null ? "null" : v.getClass().getName(), vStr);
}
Object thumbUrlObj = faceFileMap.get("thumbUrl"); Object thumbUrlObj = faceFileMap.get("thumbUrl");
if (thumbUrlObj != null) { if (thumbUrlObj != null) {
String res = thumbUrlObj.toString(); return thumbUrlObj.toString();
log.info("从Map提取到thumbUrl，长度={}", res.length());
return res;
} }
} else if (singleObj instanceof cn.hutool.json.JSONObject) { } else if (singleObj instanceof cn.hutool.json.JSONObject) {
cn.hutool.json.JSONObject faceJson = (cn.hutool.json.JSONObject) singleObj; cn.hutool.json.JSONObject faceJson = (cn.hutool.json.JSONObject) singleObj;
log.info("单个对象是JSONObject类型，所有key: {}", faceJson.keySet());
for (String key : faceJson.keySet()) {
Object v = faceJson.get(key);
String vStr = v == null ? "null" : (v.toString().length() > 200 ? v.toString().substring(0, 200) + "..." : v.toString());
log.info("单个对象 key={}, value类型={}, value={}", key, v == null ? "null" : v.getClass().getName(), vStr);
}
Object thumbUrlObj = faceJson.get("thumbUrl"); Object thumbUrlObj = faceJson.get("thumbUrl");
if (thumbUrlObj != null) { if (thumbUrlObj != null) {
String res = thumbUrlObj.toString(); return thumbUrlObj.toString();
log.info("从JSONObject提取到thumbUrl，长度={}", res.length());
return res;
} }
} else { } else {
try { try {
cn.hutool.json.JSONObject faceJson = cn.hutool.json.JSONUtil.parseObj(singleObj); cn.hutool.json.JSONObject faceJson = cn.hutool.json.JSONUtil.parseObj(singleObj);
log.info("单个对象解析为JSONObject后，所有key: {}", faceJson.keySet());
for (String key : faceJson.keySet()) {
Object v = faceJson.get(key);
String vStr = v == null ? "null" : (v.toString().length() > 200 ? v.toString().substring(0, 200) + "..." : v.toString());
log.info("单个对象 key={}, value类型={}, value={}", key, v == null ? "null" : v.getClass().getName(), vStr);
}
Object thumbUrlObj = faceJson.get("thumbUrl"); Object thumbUrlObj = faceJson.get("thumbUrl");
if (thumbUrlObj != null) { if (thumbUrlObj != null) {
String res = thumbUrlObj.toString(); return thumbUrlObj.toString();
log.info("从解析后的JSONObject提取到thumbUrl，长度={}", res.length());
return res;
} }
} catch (Exception e) { } catch (Exception e) {
log.warn("解析单个图片对象为JSON失败: {}, 错误: {}", singleObj, e.getMessage()); log.warn("解析单个图片对象为JSON失败: {}", e.getMessage());
} }
} }
log.warn("单个对象中未找到thumbUrl字段");
return null; return null;
}; };
@ -312,56 +275,39 @@ public class UserAddExe {
if (faceFile instanceof java.util.Collection) { if (faceFile instanceof java.util.Collection) {
isArray = true; isArray = true;
java.util.Collection<?> coll = (java.util.Collection<?>) faceFile; java.util.Collection<?> coll = (java.util.Collection<?>) faceFile;
log.info("faceFile是Collection/List类型，size={}", coll.size());
if (!coll.isEmpty()) { if (!coll.isEmpty()) {
firstElement = coll.iterator().next(); firstElement = coll.iterator().next();
log.info("取Collection第一个元素，类型: {}", firstElement == null ? "null" : firstElement.getClass().getName());
} else {
log.warn("faceFile是空数组，无元素可取");
} }
} else if (faceFile.getClass().isArray()) { } else if (faceFile.getClass().isArray()) {
isArray = true; isArray = true;
Object[] arr = (Object[]) faceFile; Object[] arr = (Object[]) faceFile;
log.info("faceFile是原生数组类型，length={}", arr.length);
if (arr.length > 0) { if (arr.length > 0) {
firstElement = arr[0]; firstElement = arr[0];
log.info("取数组第0个元素，类型: {}", firstElement == null ? "null" : firstElement.getClass().getName());
} else {
log.warn("faceFile是空原生数组，无元素可取");
} }
} else if (faceFile instanceof cn.hutool.json.JSONArray) { } else if (faceFile instanceof cn.hutool.json.JSONArray) {
isArray = true; isArray = true;
cn.hutool.json.JSONArray jsonArr = (cn.hutool.json.JSONArray) faceFile; cn.hutool.json.JSONArray jsonArr = (cn.hutool.json.JSONArray) faceFile;
log.info("faceFile是JSONArray类型，size={}", jsonArr.size());
if (!jsonArr.isEmpty()) { if (!jsonArr.isEmpty()) {
firstElement = jsonArr.get(0); firstElement = jsonArr.get(0);
log.info("取JSONArray第0个元素，类型: {}", firstElement == null ? "null" : firstElement.getClass().getName());
} else {
log.warn("faceFile是空JSONArray，无元素可取");
} }
} }
if (isArray) { if (isArray) {
log.info("faceFile是数组/集合类型，从第一个元素中提取thumbUrl");
if (firstElement != null) { if (firstElement != null) {
thumbUrl = extractThumbFromSingle.apply(firstElement); thumbUrl = extractThumbFromSingle.apply(firstElement);
} else {
log.warn("数组第一个元素是null，无法提取thumbUrl");
} }
} else { } else {
log.info("faceFile是单个对象类型，直接提取thumbUrl");
thumbUrl = extractThumbFromSingle.apply(faceFile); thumbUrl = extractThumbFromSingle.apply(faceFile);
} }
} }
log.info("从faceFile提取thumbUrl结果(截取前500字符): {}",
thumbUrl == null ? "null" : (thumbUrl.length() > 500 ? thumbUrl.substring(0, 500) + "..." : thumbUrl));
if (thumbUrl != null && !thumbUrl.trim().isEmpty()) { if (thumbUrl != null && !thumbUrl.trim().isEmpty()) {
String trimmedThumb = thumbUrl.trim(); String trimmedThumb = thumbUrl.trim();
boolean startsWithDataImage = trimmedThumb.startsWith("data:image");
boolean startsWithHttp = trimmedThumb.startsWith("http://") || trimmedThumb.startsWith("https://"); boolean startsWithHttp = trimmedThumb.startsWith("http://") || trimmedThumb.startsWith("https://");
boolean containsComma = trimmedThumb.contains(","); boolean containsComma = trimmedThumb.contains(",");
boolean startsWithDataImage = trimmedThumb.startsWith("data:image");
String cleanBase64; String cleanBase64;
if (containsComma && startsWithDataImage) { if (containsComma && startsWithDataImage) {
@ -369,46 +315,25 @@ public class UserAddExe {
String bodyPart = trimmedThumb.substring(trimmedThumb.indexOf(",") + 1); String bodyPart = trimmedThumb.substring(trimmedThumb.indexOf(",") + 1);
String cleanBody = bodyPart.replaceAll("\\s+", ""); String cleanBody = bodyPart.replaceAll("\\s+", "");
cleanBase64 = prefixPart + cleanBody; cleanBase64 = prefixPart + cleanBody;
log.info("已保留data:image前缀(严格对齐大华文档示例), 前缀={}, 仅清洗主体中的空白字符", prefixPart.length() > 80 ? prefixPart.substring(0, 80) + "..." : prefixPart);
} else { } else {
String pureBody = trimmedThumb.replaceAll("\\s+", ""); String pureBody = trimmedThumb.replaceAll("\\s+", "");
cleanBase64 = "data:image/jpeg;base64," + pureBody; cleanBase64 = "data:image/jpeg;base64," + pureBody;
log.info("原始thumbUrl无标准data:image前缀，已自动补齐(data:image/jpeg;base64,)以对齐大华文档示例");
} }
int commaIdx = cleanBase64.indexOf(","); int commaIdx = cleanBase64.indexOf(",");
String base64BodyOnly = commaIdx >= 0 ? cleanBase64.substring(commaIdx + 1) : cleanBase64; String base64BodyOnly = commaIdx >= 0 ? cleanBase64.substring(commaIdx + 1) : cleanBase64;
boolean isLikelyBase64 = base64BodyOnly.matches("^[A-Za-z0-9+/=]+$"); boolean isLikelyBase64 = base64BodyOnly.matches("^[A-Za-z0-9+/=]+$");
int totalLen = cleanBase64.length();
int bodyLen = base64BodyOnly.length(); int bodyLen = base64BodyOnly.length();
boolean finalHasPrefix = cleanBase64.startsWith("data:image"); boolean finalHasPrefix = cleanBase64.startsWith("data:image");
log.info("========== 图片格式判断结果(严格对齐大华文档示例) ==========");
log.info("原始thumbUrl总长度: {}", trimmedThumb.length());
log.info("最终结果是否带data:image前缀(文档示例:true): {}", finalHasPrefix);
log.info("是否是http/https URL(文档要求:false): {}", startsWithHttp);
log.info("最终整体长度(含前缀): {}", totalLen);
log.info("base64主体长度(去掉前缀逗号后): {}", bodyLen);
log.info("base64主体是否匹配纯base64字符集(A-Za-z0-9+/=): {}", isLikelyBase64);
if (startsWithHttp) { if (startsWithHttp) {
log.error("===== 严重错误：传的是HTTP/HTTPS URL(或文件路径)！大华文档personBiosignatures要求必须传【带data:image前缀的base64图片】，不是URL ====="); log.error("同步大华人员失败：人脸图片传的是HTTP/HTTPS URL，要求必须传带data:image前缀的base64图片");
System.out.println("===== 大华图片错误：HTTP URL无效, 前200: " + (trimmedThumb.length() > 200 ? trimmedThumb.substring(0, 200) : trimmedThumb));
} else if (!finalHasPrefix) { } else if (!finalHasPrefix) {
log.error("===== 最终结果竟然没有data:image前缀(代码补齐逻辑失效) ====="); log.error("同步大华人员失败：人脸图片最终无data:image前缀，代码补齐逻辑失效");
System.out.println("===== 大华图片错误：无data:image前缀, 前100: " + (cleanBase64.length() > 100 ? cleanBase64.substring(0, 100) : cleanBase64));
} else if (!isLikelyBase64) { } else if (!isLikelyBase64) {
log.error("===== base64主体部分含非base64非法字符！前200: {}", base64BodyOnly.length() > 200 ? base64BodyOnly.substring(0, 200) : base64BodyOnly); log.error("同步大华人员失败：人脸图片base64主体含非base64非法字符");
System.out.println("===== 大华图片错误：主体非base64字符, 前200: " + (base64BodyOnly.length() > 200 ? base64BodyOnly.substring(0, 200) : base64BodyOnly));
} else if (bodyLen < 1000) { } else if (bodyLen < 1000) {
log.error("===== base64主体长度过短({})，缩略图太小/损坏！正常300KB JPEG→主体约40万字符 =====", bodyLen); log.error("同步大华人员失败：人脸图片base64主体长度过短({})，缩略图可能损坏", bodyLen);
System.out.println("===== 大华图片错误：主体过短=" + bodyLen);
} else {
log.info("===== ✅ 完全符合大华文档personBiosignatures格式：带data:image前缀 + 纯base64主体 + 长度正常 =====");
} }
log.info("【最终传给大华base64Data(严格对齐文档)】前150字符: {}", cleanBase64.length() > 150 ? cleanBase64.substring(0, 150) : cleanBase64);
log.info("【最终传给大华base64Data】后150字符: {}", cleanBase64.length() > 150 ? cleanBase64.substring(cleanBase64.length() - 150) : cleanBase64);
System.out.println("===== 最终带前缀完整base64Data 前200: " + (cleanBase64.length() > 200 ? cleanBase64.substring(0, 200) : cleanBase64));
System.out.println("===== 最终带前缀完整base64Data 后200: " + (cleanBase64.length() > 200 ? cleanBase64.substring(cleanBase64.length() - 200) : cleanBase64));
System.out.println("===== 是否按文档带data:image前缀=" + finalHasPrefix + " / 最终总长度=" + totalLen + " / 主体长度=" + bodyLen);
List<Map<String, Object>> personBiosignatures = new ArrayList<>(); List<Map<String, Object>> personBiosignatures = new ArrayList<>();
Map<String, Object> biosignature = new java.util.LinkedHashMap<>(); Map<String, Object> biosignature = new java.util.LinkedHashMap<>();
@ -417,15 +342,9 @@ public class UserAddExe {
biosignature.put("base64Data", cleanBase64); biosignature.put("base64Data", cleanBase64);
personBiosignatures.add(biosignature); personBiosignatures.add(biosignature);
personMap.put("personBiosignatures", personBiosignatures); personMap.put("personBiosignatures", personBiosignatures);
log.info("组装personBiosignatures成功(严格按文档顺序type→index→base64Data,LinkedHashMap有序)");
String biosigJson = JSONUtil.toJsonStr(personBiosignatures);
log.info("personBiosignatures JSON(截取前500字符): {}", biosigJson.length() > 500 ? biosigJson.substring(0, 500) + "..." : biosigJson);
System.out.println("===== 传给大华personBiosignatures完整JSON前500字符: " + (biosigJson.length() > 500 ? biosigJson.substring(0, 500) + "..." : biosigJson));
} else { } else {
log.warn("未获取到人脸图片thumbUrl，personBiosignatures将不传递"); log.warn("未获取到人脸图片thumbUrl，personBiosignatures将不传递");
System.out.println("===== 警告：未从faceFile中获取到有效的thumbUrl，personBiosignatures不会传给大华！");
} }
log.info("========== 大华图片调试结束 ==========");
Integer age = null; Integer age = null;
Integer sex = null; Integer sex = null;
@ -490,7 +409,6 @@ public class UserAddExe {
if (tenantId != null && !tenantId.trim().isEmpty()) { if (tenantId != null && !tenantId.trim().isEmpty()) {
extraHeaders.put("tenantId", tenantId); extraHeaders.put("tenantId", tenantId);
} }
log.info("收集到需要透传的请求头: {}", extraHeaders);
} }
} catch (Exception e) { } catch (Exception e) {
log.warn("获取当前请求头异常: {}", e.getMessage()); log.warn("获取当前请求头异常: {}", e.getMessage());
@ -501,14 +419,15 @@ public class UserAddExe {
if (skipped != null && skipped) { if (skipped != null && skipped) {
return; return;
} }
String maskedIdCard = plainIdCard;
if (plainIdCard != null && plainIdCard.length() >= 14) {
maskedIdCard = plainIdCard.substring(0, 6) + "********" + plainIdCard.substring(plainIdCard.length() - 4);
}
if (success == null || !success) { if (success == null || !success) {
String errCode = (String) syncResult.getOrDefault("errCode", ""); String errCode = (String) syncResult.getOrDefault("errCode", "");
String errMessage = (String) syncResult.getOrDefault("errMessage", "大华人员同步失败"); String errMessage = (String) syncResult.getOrDefault("errMessage", "大华人员同步失败");
log.error("同步大华人员失败, errCode={}, errMessage={}, name={}, idCard={}", errCode, errMessage, userE.getName(), plainIdCard);
throw new BizException("同步大华平台失败：" + errMessage); throw new BizException("同步大华平台失败：" + errMessage);
} }
log.info("同步大华人员成功, name={}, idCard={}", userE.getName(), plainIdCard);
System.out.println("同步大华人员成功, name=" + userE.getName() + ", idCard=" + plainIdCard);
Object data = syncResult.get("data"); Object data = syncResult.get("data");
if (data != null) { if (data != null) {
if (data instanceof Map) { if (data instanceof Map) {
@ -538,7 +457,6 @@ public class UserAddExe {
} }
} }
userE.setDahuaCode(plainIdCard); userE.setDahuaCode(plainIdCard);
log.info("设置大华dahuaCode成功, dahuaCode={}", plainIdCard);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -898,7 +816,7 @@ public class UserAddExe {
sendParams.put("code", phoneCode); sendParams.put("code", phoneCode);
messageSendCmd.setParams(sendParams); messageSendCmd.setParams(sendParams);
SingleResponse<Boolean> d = messageFacade.send(messageSendCmd); SingleResponse<Boolean> d = messageFacade.send(messageSendCmd);
System.out.println( d.toString()); log.info("短信发送结果: {}, phone: {}", d, phone);
return d == null ? false : d.getData(); return d == null ? false : d.getData();
} }

87
web-domain/src/main/java/com/zcloud/basic/info/domain/config/DaHuaConfig.java
View File

@ -11,6 +11,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -67,9 +68,7 @@ public class DaHuaConfig {
String gw = (primeportGateway == null || primeportGateway.trim().isEmpty()) ? "basicInfo" : primeportGateway.trim(); String gw = (primeportGateway == null || primeportGateway.trim().isEmpty()) ? "basicInfo" : primeportGateway.trim();
String url = baseUrl + "/" + gw + "/dahua/person/sync"; String url = baseUrl + "/" + gw + "/dahua/person/sync";
String reqJson = JSONUtil.toJsonStr(personMap); String reqJson = JSONUtil.toJsonStr(personMap);
log.info("调用大华人员同步接口, url={}, 请求参数={}", url, reqJson); log.info("调用大华人员同步接口, url={}", url);
System.out.println("调用大华人员同步接口, url=" + url);
System.out.println("请求参数: " + reqJson);
try { try {
HttpRequest request = HttpRequest.post(url) HttpRequest request = HttpRequest.post(url)
.header("Content-Type", "application/json;charset=UTF-8") .header("Content-Type", "application/json;charset=UTF-8")
@ -79,14 +78,12 @@ public class DaHuaConfig {
extraHeaders.forEach((k, v) -> { extraHeaders.forEach((k, v) -> {
if (k != null && v != null) { if (k != null && v != null) {
request.header(k, v); request.header(k, v);
System.out.println("透传请求头: " + k + "=" + v);
} }
}); });
log.info("透传请求头: {}", extraHeaders); log.info("透传请求头: {}", extraHeaders);
} }
String respBody = request.execute().body(); String respBody = request.execute().body();
log.info("大华人员同步接口返回: {}", respBody); log.info("大华人员同步接口返回: {}", respBody);
System.out.println("大华人员同步接口返回: " + respBody);
if (respBody == null || respBody.trim().isEmpty()) { if (respBody == null || respBody.trim().isEmpty()) {
resultMap.put("success", false); resultMap.put("success", false);
resultMap.put("errCode", "EMPTY_RESPONSE"); resultMap.put("errCode", "EMPTY_RESPONSE");
@ -111,4 +108,84 @@ public class DaHuaConfig {
return resultMap; return resultMap;
} }
} }
public Map<String, Object> updatePerson(Map<String, Object> personMap) {
return updatePerson(personMap, null);
}
public Map<String, Object> updatePerson(Map<String, Object> personMap, Map<String, String> extraHeaders) {
Map<String, Object> resultMap = new HashMap<>();
log.info("========== 大华人员(更新)调用开始 ==========");
log.info("dockFlag配置值={}, primeportUrl={}, primeportGateway={}", dockFlag, primeportUrl, primeportGateway);
if (dockFlag == null || dockFlag != 1) {
log.info("大华对接未开启(dockFlag={}), 跳过更新大华人员", dockFlag);
resultMap.put("success", true);
resultMap.put("skipped", true);
return resultMap;
}
String baseUrl = primeportUrl;
if (baseUrl == null || baseUrl.trim().isEmpty()) {
throw new RuntimeException("大华对接网关地址未配置(dahua.config.primeportUrl)");
}
baseUrl = baseUrl.trim();
if (baseUrl.endsWith("/")) {
baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
}
String gw = (primeportGateway == null || primeportGateway.trim().isEmpty()) ? "basicInfo" : primeportGateway.trim();
String url = baseUrl + "/" + gw + "/dahua/person/update";
log.info("【实际请求URL】method=PUT, url={}", url);
log.info("【对比-新增sync的URL】method=POST, {}/{}/dahua/person/sync", baseUrl, gw);
String reqJson = JSONUtil.toJsonStr(personMap);
log.info("【传给大华的请求体(JSON)】{}", reqJson);
log.info("【personMap关键字段】id={}, code={}, name={}, paperNumber={}, phone={}, departmentId={}, paperType={}, service={}, personBiosignatures是否有值={}",
personMap.get("id"), personMap.get("code"), personMap.get("name"),
personMap.get("paperNumber"), personMap.get("phone"),
personMap.get("departmentId"), personMap.get("paperType"),
personMap.get("service"),
personMap.get("personBiosignatures") == null ? "null" :
(personMap.get("personBiosignatures") instanceof List
? "List-size=" + ((List<?>) personMap.get("personBiosignatures")).size()
: personMap.get("personBiosignatures").getClass().getName()));
try {
HttpRequest request = HttpRequest.put(url)
.header("Content-Type", "application/json;charset=UTF-8")
.timeout(30000)
.body(reqJson);
if (extraHeaders != null && !extraHeaders.isEmpty()) {
extraHeaders.forEach((k, v) -> {
if (k != null && v != null) {
request.header(k, v);
}
});
log.info("【透传请求头】{}", extraHeaders);
}
String respBody = request.execute().body();
log.info("【大华接口原始返回】{}", respBody);
if (respBody == null || respBody.trim().isEmpty()) {
resultMap.put("success", false);
resultMap.put("errCode", "EMPTY_RESPONSE");
resultMap.put("errMessage", "大华人员更新接口返回为空");
return resultMap;
}
JSONObject respJson = JSONUtil.parseObj(respBody);
Boolean success = respJson.getBool("success", false);
String errCode = respJson.getStr("errCode", "");
String errMessage = respJson.getStr("errMessage", "");
Object data = respJson.get("data");
resultMap.put("success", success);
resultMap.put("errCode", errCode);
resultMap.put("errMessage", errMessage);
resultMap.put("data", data);
log.info("【解析后返回】success={}, errCode={}, errMessage={}, data={}", success, errCode, errMessage, data);
return resultMap;
} catch (Exception e) {
log.error("调用大华人员更新接口异常: {}", e.getMessage(), e);
resultMap.put("success", false);
resultMap.put("errCode", "HTTP_EXCEPTION");
resultMap.put("errMessage", "调用大华人员更新接口异常: " + e.getMessage());
return resultMap;
}
}
} }