From 7cade78064ec01606c7abe5788cf5a1598e069a2 Mon Sep 17 00:00:00 2001 From: zhaoyu Date: Tue, 23 Jan 2024 18:55:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E6=91=84?= =?UTF-8?q?=E5=83=8F=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/mkmj/impl/MkmjGateVideServiceImpl.java | 1 + src/main/resources/application-dev.properties | 14 ++++++++------ src/main/resources/application.properties | 2 +- .../mybatis/datasource/mkmj/MkmjAreaGateMapper.xml | 10 +++++++++- .../datasource/mkmj/MkmjGateVideoMapper.xml | 14 ++++++++------ 5 files changed, 27 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java index 5ea257eb..16d85775 100644 --- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java +++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjGateVideServiceImpl.java @@ -33,6 +33,7 @@ public class MkmjGateVideServiceImpl implements MkmjGateVideoService { * @throws Exception */ public ReturnMap save(PageData pd)throws Exception{ + pd.put("GATE_VIDEO_ID",UuidUtil.get32UUID()); mkmjGateVideoMapper.save(pd); return ReturnMap.ok("保存成功"); } diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a4dd85c3..0c9a8fc0 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -64,18 +64,18 @@ spring.main.banner-mode=off preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/ qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/ #????? -smb.host=39.103.224.166 +smb.host=192.168.192.201 smb.port=22 smb.user=root -smb.password=Zcloud@zcloud88888 -smb.basePath=/mnt/qgfile/file/ +smb.password=SJSKAQHBGLXT@20220311 +smb.basePath=/mnt/qask/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.0.31:9876 +rocketmq.name-server=192.168.151.57:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -96,5 +96,7 @@ mq.gwj.data.topic=czks_qy_docking mq.gwj.file.topic=czks_qy_dockingPicture #港务局文件服务器前缀 baseimgpath=https://qgqy.qhdsafety.com/file/ - -cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd +http.file.url=https://qgqy.qhdsafety.com/file/ +corp.default.pic-path=https://qgqy.qhdsafety.com/ +corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ +cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25c549c5..a48eb064 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,7 +3,7 @@ server.port=8091 #?? #spring.profiles.active=local -#����31ʱʹ�� +#31ʱʹ spring.profiles.active=dev #?? #spring.profiles.active=master diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml index a387376c..f27e199e 100644 --- a/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml +++ b/src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml @@ -139,9 +139,17 @@ select - + , + r.NAME from f + LEFT JOIN `qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID where f.ISDELETE = '0' and @@ -126,7 +128,7 @@ ) - f.AREA_GATE_ID = #{pd.AREA_GATE_ID} + AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID}