guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、边界入侵界面更新 

2、边界入侵摄像头标点不显示bug修复
liujun0703-新项目开发
liujun 2024-06-13 15:01:53 +08:00
parent a6f36e8b43
commit 82a173a6f3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/zcloud/controller/map/MapPlatFormElectronicController.java
View File

@ -2,6 +2,7 @@ package com.zcloud.controller.map;
import com.zcloud.controller.base.BaseController; import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.PageData; import com.zcloud.entity.PageData;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
import com.zcloud.service.map.util.HKPostUtil; import com.zcloud.service.map.util.HKPostUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -19,6 +20,9 @@ public class MapPlatFormElectronicController extends BaseController {
@Autowired @Autowired
private PlatformelectronicService platformelectronicService; private PlatformelectronicService platformelectronicService;
@Autowired
private PlatformvideomanagementService platformvideomanagementService;
/**总摄像头数 /**总摄像头数
* @throws Exception * @throws Exception
*/ */
@ -27,8 +31,7 @@ public class MapPlatFormElectronicController extends BaseController {
public Object listAll() throws Exception{ public Object listAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData();
Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表 Integer allForMap = platformelectronicService.countAllForMap(pd); //列出Platformelectronic列表
map.put("allForMap", allForMap); map.put("allForMap", allForMap);
map.put("result", errInfo); map.put("result", errInfo);
@ -61,8 +64,16 @@ public class MapPlatFormElectronicController extends BaseController {
public Object listAllLocation() throws Exception{ public Object listAllLocation() throws Exception{
Map<String,Object> map = new HashMap<String,Object>(); Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success"; String errInfo = "success";
PageData pd = new PageData(); PageData pd = this.getPageData();
pd = this.getPageData(); if ("bianjieruqin".equals(pd.getString("TYPE"))){
List<PageData> varList = platformvideomanagementService.listAll(pd); //列出Platformvideomanagement列表
for (PageData data : varList) {
data.put("MAP_POINT_NAME", data.getString("NAME"));
}
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
pd.put("forMap","1"); pd.put("forMap","1");
List<PageData> varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表 List<PageData> varList = platformelectronicService.listAll(pd); //列出Platformelectronic列表
for (PageData data : varList) { for (PageData data : varList) {

2
src/main/java/com/zcloud/service/dw/dto/AlarmGet.java
View File

@ -10,5 +10,7 @@ public class AlarmGet {
private String status; private String status;
private String corpId; private String corpId;
private Page page; private Page page;
// 告警来源
private String sourceNum;
} }