增加绑定摄像头

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("保存成功");
 	}

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/

src/main/resources/application.properties

@@ -3,7 +3,7 @@ server.port=8091
 
 #??
 #spring.profiles.active=local
-#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>31ʱʹ<EFBFBD><EFBFBD>
+#部署31时使用
 spring.profiles.active=dev
 #??
 #spring.profiles.active=master

src/main/resources/mybatis/datasource/mkmj/MkmjAreaGateMapper.xml

@@ -139,9 +139,17 @@
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		ifnull(v.VIDEOCOUNT,0) VIDEOCOUNT
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN (SELECT
+				AREA_GATE_ID ,COUNT(GATE_VIDEO_ID)  VIDEOCOUNT
+				FROM
+				`mkmj_gate_video`
+				WHERE
+				ISDELETE = '0'
+				GROUP BY AREA_GATE_ID ) v on v.AREA_GATE_ID = f.AREA_GATE_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and

src/main/resources/mybatis/datasource/mkmj/MkmjGateVideoMapper.xml

@@ -16,7 +16,7 @@
 	<sql id="Field">
 		f.GATE_VIDEO_ID,
 		f.AREA_GATE_ID,
-		f.VIDEO_RESOURCES_ID,
+		f.PLATFORMVIDEOMANAGEMENT_ID,
 		f.LONGITUDE,
 		f.LATITUDE,
 		f.CORPINFO_ID,
@@ -31,7 +31,7 @@
 	<sql id="Field2">
 		GATE_VIDEO_ID,
 		AREA_GATE_ID,
-		VIDEO_RESOURCES_ID,
+		PLATFORMVIDEOMANAGEMENT_ID,
 		LONGITUDE,
 		LATITUDE,
 		CORPINFO_ID,
@@ -46,7 +46,7 @@
 	<sql id="FieldValue">
 		#{GATE_VIDEO_ID},
 		#{AREA_GATE_ID},
-		#{VIDEO_RESOURCES_ID},
+		#{PLATFORMVIDEOMANAGEMENT_ID},
 		#{LONGITUDE},
 		#{LATITUDE},
 		#{CORPINFO_ID},
@@ -85,7 +85,7 @@
 		set
 			GATE_VIDEO_ID= GATE_VIDEO_ID,
 			AREA_GATE_ID=#{AREA_GATE_ID},
-			VIDEO_RESOURCES_ID=#{VIDEO_RESOURCES_ID},
+			PLATFORMVIDEOMANAGEMENT_ID=#{PLATFORMVIDEOMANAGEMENT_ID},
 			LONGITUDE=#{LONGITUDE},
 			LATITUDE=#{LATITUDE},
 			CORPINFO_ID=#{CORPINFO_ID},
@@ -111,9 +111,11 @@
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
-		<include refid="Field"></include>
+		<include refid="Field"></include>,
+		r.NAME
 		from
 		<include refid="tableName"></include> f
+		LEFT JOIN 	`qa-gwj-regulatory`.bus_platformvideomanagement r on r.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
 		where f.ISDELETE = '0'
 		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
 			and
@@ -126,7 +128,7 @@
 				)
 		</if>
 		<if test="pd.AREA_GATE_ID != null and pd.AREA_GATE_ID != ''">
-			f.AREA_GATE_ID = #{pd.AREA_GATE_ID}
+			AND f.AREA_GATE_ID = #{pd.AREA_GATE_ID}
 		</if>
 	</select>