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

一公司边界入侵企业端与监管端代码未同步

liujun0703-新项目开发
liujun 2024-06-28 21:56:47 +08:00
parent d358ab3508
commit 3dbcce216d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/controller/map/MapController.java
View File

@ -941,6 +941,7 @@ public class MapController extends BaseController {
alarmGet.getPage().setCurrent("1"); alarmGet.getPage().setCurrent("1");
alarmGet.getPage().setSize("5"); alarmGet.getPage().setSize("5");
alarmGet.setCorpId(pd.getString("corpId")); alarmGet.setCorpId(pd.getString("corpId"));
alarmGet.setSourceNum(pd.getString("source"));
map.put("result", "success"); map.put("result", "success");
map.put("alarmList", dwService.getAlarmList(alarmGet)); map.put("alarmList", dwService.getAlarmList(alarmGet));
TraceGet get = new TraceGet(); TraceGet get = new TraceGet();

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

@ -71,12 +71,14 @@ public class MapPlatFormElectronicController extends BaseController {
String errInfo = "success"; String errInfo = "success";
PageData pd = this.getPageData(); PageData pd = this.getPageData();
if ("bianjieruqin".equals(pd.getString("TYPE"))){ if ("bianjieruqin".equals(pd.getString("TYPE"))){
if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){ // 注意：这里不加企业id
pd.put("CORPINFO_ID",pd.get("corpId")); // if (StringUtils.isEmpty(pd.getString("CORPINFO_ID"))){
} // pd.put("CORPINFO_ID",pd.get("corpId"));
// }
pd.put("forMap","1");
//列出Platformvideomanagement列表 //列出Platformvideomanagement列表
PageData condition = new PageData(); PageData condition = new PageData();
List<PageData> varList = platformvideomanagementService.listAll(pd); List<PageData> varList = platformelectronicService.listAll(pd);
for (PageData data : varList) { for (PageData data : varList) {
data.put("MAP_POINT_NAME", data.getString("NAME")); data.put("MAP_POINT_NAME", data.getString("NAME"));
condition.clear(); condition.clear();