|
|
|
@@ -145,7 +145,7 @@ public class DmMeetingApiController extends BaseApiController { |
|
|
|
|
|
|
|
@GetMapping(value = "/recent/{devId}/{dateStr}") |
|
|
|
@ResponseBody |
|
|
|
public List<JSONObject> roomList(@PathVariable(value = "devId") String devId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId){ |
|
|
|
public R<List<JSONObject>> roomList(@PathVariable(value = "devId") String devId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId){ |
|
|
|
DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId); |
|
|
|
|
|
|
|
R<DmDigitalmanExtPo> extR = digitalmanService.selectExtByDeviceId(devId,vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER); |
|
|
|
@@ -155,10 +155,9 @@ public class DmMeetingApiController extends BaseApiController { |
|
|
|
} |
|
|
|
if (extPo != null) { |
|
|
|
List<JSONObject> result = remoteMeetingService.recent(extPo.getDeptId(),dateStr, roomId, vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER); |
|
|
|
return result; |
|
|
|
return R.ok(result); |
|
|
|
} else { |
|
|
|
return new ArrayList<JSONObject>(); |
|
|
|
|
|
|
|
return R.fail("未找到设备信息"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|