diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 42f83d411..5e3c93664 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -206,6 +206,12 @@ public class HikvisionCall { @Lazy @Autowired private ISystemUserService systemUserService; + private static String xingzongIscIpPort; + + @Value("${xingzongIscIpPort:}") + public void setXingzongIscIpPort(String xingzongIscIpPort) { + HikvisionCall.xingzongIscIpPort = xingzongIscIpPort; + } /** * 获取图片 @@ -229,7 +235,11 @@ public class HikvisionCall { JSONObject rsJo = JSONObject.parseObject(rs); String code = rsJo.getString("code"); if (Objects.equals(code, "0")) { - return rsJo.getJSONObject("data").getString("picUrl"); + String picUrl = rsJo.getJSONObject("data").getString("picUrl"); + if (EnvironmentUtil.isXingZong()) { + picUrl = picUrl.replaceAll("^https:\\/\\/[^/]+\\/", xingzongIscIpPort); + } + return picUrl; } return null; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml index 22bd09ce7..8685040c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml @@ -55,7 +55,7 @@