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

同步时未异步bug修复

liujun-2024-05-23-接口漏洞修复
liujun 2024-04-24 14:02:37 +08:00
parent 1054f21702
commit 776f133f63
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,7 +405,7 @@ public class MapController extends BaseController {
*/ */
@RequestMapping("/getPersonPositioningCount") @RequestMapping("/getPersonPositioningCount")
@ResponseBody @ResponseBody
public Object getPersonPositioningCount() { public Object getPersonPositioningCount() throws Exception{
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = this.getPageData(); PageData pageData = this.getPageData();
if ("00004".equals(pageData.getString("GANGKOU"))) { if ("00004".equals(pageData.getString("GANGKOU"))) {
@ -427,8 +427,6 @@ public class MapController extends BaseController {
return result; return result;
} }
// bus_riskunit
// bus_identificationparts
PageData data = biMapService.getPersonPositioningCount(pageData); PageData data = biMapService.getPersonPositioningCount(pageData);
map.put("result", "success"); map.put("result", "success");
map.put("personPositioningCount", data); map.put("personPositioningCount", data);
@ -841,10 +839,15 @@ public class MapController extends BaseController {
*/ */
@RequestMapping(value = "/getCurrentLocationOnline") @RequestMapping(value = "/getCurrentLocationOnline")
@ResponseBody @ResponseBody
public Object getCurrentLocationOnline() { public Object getCurrentLocationOnline() 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 = this.getPageData(); PageData pd = this.getPageData();
// created by liu jun 一公司人员定位新增摄像头功能
if ("platcamera".equals(pd.getString("TYPE")) && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("CORPINFO_ID"))){
GetCameraListDto dto = new GetCameraListDto();
return dwService.getCameraList(dto);
}
if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) { if ("00004".equals(pd.getString("GANGKOU")) && pd.getString("TYPE").equals("peoplePosition")) {
MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>(); MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();
Map<String, Object> result = Map<String, Object> result =
@ -964,6 +967,39 @@ public class MapController extends BaseController {
} }
} }
@RequestMapping(value = "/getCameraList")
@ResponseBody
public Object getCameraList() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
// TODO 判断是否是公司人员定位
if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
GetCameraListDto dto = new GetCameraListDto();
return dwService.getCameraList(dto);
}else {
// TODO 其他系统有待开发
return null;
}
}
@RequestMapping(value = "/getCameraInfo")
@ResponseBody
public Object getCameraInfo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
// TODO 判断是否是公司人员定位
if (pd.get("corpId") != null && "035958e685cf4850bc40151c5e0617a6".equals(pd.getString("corpId"))) {
GetCameraInfoDto dto = new GetCameraInfoDto();
dto.setId(pd.getString("id"));
return dwService.getCameraInfo(dto);
}else {
// TODO 其他系统有待开发
return null;
}
}