Bläddra i källkod

meeting interface change resp type

tags/B.1.1.0.0_20230818_base^2
yk 2 år sedan
förälder
incheckning
dea3bd9db3
1 ändrade filer med 3 tillägg och 4 borttagningar
  1. +3
    -4
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingApiController.java

+ 3
- 4
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingApiController.java Visa fil

@@ -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("未找到设备信息");
}




Laddar…
Avbryt
Spara