From e255264a01e7da8d1a457d297272cbddd59e1b47 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 20 Jun 2024 18:45:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=86=85=E7=BD=91=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 12 +++++++++++- src/main/resources/application-xingzong.properties | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) 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/resources/application-xingzong.properties b/src/main/resources/application-xingzong.properties index a829fff91..946477b66 100644 --- a/src/main/resources/application-xingzong.properties +++ b/src/main/resources/application-xingzong.properties @@ -73,3 +73,4 @@ spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/wflow_pro?useUnicode= spring.datasource.db2.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db2.username=root spring.datasource.db2.password=JXJ@admin +xingzongIscIpPort=https://10.168.1.100:6113/ From 9655e9f8c21a2f70f3855c8240e03de137658b3b Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Thu, 20 Jun 2024 18:57:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@