平台视频，电子围栏，围栏报警。

src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java

@@ -29,6 +29,35 @@ public class PlatformvideomanagementController extends BaseController {
 	@Autowired
 	private PlatformvideomanagementService platformvideomanagementService;
 
+
+	@RequestMapping(value="/savePosition")
+	@ResponseBody
+	public Object savePosition() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		if(pd.get("PLATFORMVIDEOMANAGEMENT_ID") != null){
+			platformvideomanagementService.edit(pd);
+		}else{
+			pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID());	//主键
+			platformvideomanagementService.save(pd);
+		}
+
+		map.put("result", errInfo);
+		return map;
+	}
+	@RequestMapping(value="/delLocation")
+	@ResponseBody
+	public Object delLocation() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		platformvideomanagementService.delLocation(pd);
+		map.put("result", errInfo);
+		return map;
+	}
 	/**新增
 	 * @param
 	 * @throws Exception
@@ -55,7 +84,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -71,7 +100,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -87,7 +116,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.cameraSearch(pd);
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");

src/main/java/com/zcloud/controller/map/MapController.java

@@ -375,12 +375,45 @@ public class MapController extends BaseController {
         return online;
     }
     /**
-     * @Description: 标签卡状态
+     * @Description: 电子围栏报警  Electronic fence
      * @Author: dearLin
      * @Date: 2024/1/6/006 11:15
      * @Param: [] []
      * @Return: java.lang.Object
      */
+    @RequestMapping(value = "/czks/getFenceAlarmList")
+    @ResponseBody
+    public Object getFenceAlarmList() {
+        PageData pageData = this.getPageData();
+        JSONObject request = new JSONObject();
+        request.put("pageNum", pageData.getString("currentPage"));
+        request.put("pageSize", pageData.getString("showCount"));
+        request.put("beginTime", pageData.getString("beginTime"));
+        request.put("endTime", pageData.getString("endTime"));
+        request.put("alarmType", pageData.getString("alarmType"));
+        request.put("alarmStatus", pageData.getString("alarmStatus"));
+        request.put("realName", pageData.getString("realName"));
+        // 标签卡
+        return HttpRequestUtil.getPeopleApi("/system/alarm/person/listPage", request.toString());
+    }
+    /**
+     * @Description: 电子围栏报警  Electronic fence
+     * @Author: dearLin
+     * @Date: 2024/1/6/006 11:15
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/czks/getElectronicFenceList")
+    @ResponseBody
+    public Object getElectronicFenceList() {
+        PageData pageData = this.getPageData();
+        JSONObject request = new JSONObject();
+        request.put("pageNum", pageData.getString("currentPage"));
+        request.put("pageSize", pageData.getString("showCount"));
+        request.put("railName", pageData.getString("railName"));
+        // 标签卡
+        return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
+    }
     @RequestMapping(value = "/czks/person/staff/listPage")
     @ResponseBody
     public Object getCzksPersonStaffListPage() {

src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java

@@ -58,5 +58,6 @@ public interface PlatformvideomanagementMapper {
 	List<PageData> listAllForMap(PageData pd);
 
 
+	void delLocation(PageData pd);
 }
 

src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java

@@ -56,5 +56,6 @@ public interface PlatformvideomanagementService {
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
 	Object listAllForMap(PageData pd);
 
+	void delLocation(PageData pd);
 }
 

src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java

@@ -93,5 +93,10 @@ public class PlatformvideomanagementServiceImpl implements Platformvideomanageme
 		return map;
 	}
 
+	@Override
+	public void delLocation(PageData pd) {
+		platformvideomanagementMapper.delLocation(pd);
+	}
+
 }
 

src/main/java/com/zcloud/util/hk/HKUtil.java

@@ -15,11 +15,11 @@ import java.util.Map;
 public class HKUtil {
     static {
         // 代理API网关nginx服务器ip端口
-        ArtemisConfig.host = "192.168.150.80:5443";
+        ArtemisConfig.host = "172.17.100.1:443";
         // 秘钥appkey
-        ArtemisConfig.appKey = "25448524";
+        ArtemisConfig.appKey = "29806794";
         // 秘钥appSecret
-        ArtemisConfig.appSecret = "DoHeB3gR2dxgaEvANqNr";
+        ArtemisConfig.appSecret = "LyM1zaj3YpjwrWQEhi0u";
     }
     /**
      * 能力开放平台的网站路径

src/main/resources/application-master.properties

@@ -1,12 +1,13 @@
-#???
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=gwjsjkzcloud888888
+datasource.no1.password=Mysql@zcloud88888
+
+
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=gwjsjkzcloud888888
+datasource.no2.password=Mysql@zcloud88888
 
 #druid???
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -31,9 +32,6 @@ spring.datasource.testOnReturn: false
 #?????????filters????????sql?????,'wall'?????
 filters: stat, wall, log4j
 
-#????????????
-baseimgpath = https://qgqy.qhdsafety.com/
-
 #????????
 spring.cache.ehcache.cofnig=ehcache.xml
 
@@ -53,38 +51,50 @@ spring.http.encoding.force=true
 spring.http.encoding.enabled=true
 # ??springboot????banner
 spring.main.banner-mode=off
-#jar????????
-#web.upload-path=h:/
-#web.front-path=h:/
-#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
-#???
-preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/
-#???
-qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
 
+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/
+
+#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
+#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
 #?????
-smb.host=192.168.192.201
+smb.host=39.101.130.96
 smb.port=22
 smb.user=root
-smb.password=SJSKAQHBGLXT@20220311
+smb.password=Zcloud@zcloud88888
-smb.basePath=/mnt/qask/file/czks
+smb.basePath=/mnt/wwag/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=39.101.130.96:9876
+rocketmq.producer.group=libmiddle
+rocketmq.producer.send-message-timeout=300000
+rocketmq.producer.compress-message-body-threshold=4096
+rocketmq.producer.max-message-size=4194304
+rocketmq.producer.retry-times-when-send-failed=3
+rocketmq.producer.retry-next-server=true
+rocketmq.producer.retry-times-when-send-async-failed=3
+## topic \u524D\u7F00
+
+mq.topic.info=info
+mq.topic.eightWork=eightWork
+mq.group.info=scheduled_tasks
+mq.group.eightWork=scheduled_tasks_eightWork
 
-# ????????
-czks-useridentity=CZKS
-czks-baseimgpath=https://qgqy.qhdsafety.com/file/
-czks-backendaddr=http://192.168.0.31:7811/qa-regulatory-czks/
-# ???????
-gwj-useridentity=GWJ
-gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
-gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
-#??????
-perLoc.url=http://192.168.210.32:8084
-perLoc.userName=qaaqadmin
-perLoc.pwd=Cfd2023@
 #????
 mq.topic.docking=docking
+mq.topic.dockingPicture=dockingPicture
 mq.group.docking=scheduled_tasks_docking
 
-base.info.USER_IDENTITY=GWJ
+perLoc.url=http://172.16.130.86/gateway-service
-base.info.baseImgPath=https://qgqy.qhdsafety.com/file/
+perLoc.userName=qaaqadmin
-base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/
+perLoc.pwd=Cfd2023@
+corp.default.pic-path=https://qgqy.qhdsafety.com/
+corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
+
+http.file.url=https://qgqy.qhdsafety.com/file/
+#????????????
+baseimgpath =https://wwag.qhdsafety.com/file/

src/main/resources/application.properties

@@ -4,9 +4,9 @@ server.port=8091
 #??
 #spring.profiles.active=local
 #<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #??
-#spring.profiles.active=master
+spring.profiles.active=master
 
 
 

src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml

@@ -194,5 +194,14 @@
                  #{item}
 		</foreach>
 	</delete>
-
+		<update id="delLocation" parameterType="pd">
+			update
+			<include refid="tableName"></include>
+			set
+			LONGITUDE = null,
+			LATITUDE = null,
+			CORPINFO_ID = null
+			where
+			PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID}
+		</update>
 </mapper>