|
@@ -3,13 +3,14 @@ package com.usky.meeting.controller.web;
|
|
|
|
|
|
import com.usky.common.core.bean.ApiResult;
|
|
|
import com.usky.common.core.bean.CommonPage;
|
|
|
+import com.usky.common.security.utils.SecurityUtils;
|
|
|
import com.usky.meeting.domain.MeetingRoom;
|
|
|
import com.usky.meeting.repository.MeetingDeviceRepository;
|
|
|
import com.usky.meeting.service.MeetingRoomService;
|
|
|
import com.usky.meeting.service.dto.DmMeetingRoomDto;
|
|
|
import com.usky.meeting.service.vo.MeetingRoomRequestVO;
|
|
|
import com.usky.meeting.service.vo.MeetingRoomReservationVO;
|
|
|
-//import com.usky.transfer.RemoteTransferService;
|
|
|
+import com.usky.transfer.RemoteTransferService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -32,19 +33,19 @@ import java.util.Map;
|
|
|
public class MeetingRoomController {
|
|
|
@Autowired
|
|
|
private MeetingRoomService meetingRoomService;
|
|
|
-// @Autowired
|
|
|
-// private RemoteTransferService remoteTransferService;
|
|
|
-
|
|
|
-// /**
|
|
|
-// * 下发门禁开门
|
|
|
-// */
|
|
|
-// @GetMapping("/{productCode}/{deviceId}/control")
|
|
|
-// public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
|
|
|
-// @PathVariable("deviceId") String deviceId,
|
|
|
-// @RequestParam(value = "requestBody") String requestBody){
|
|
|
-// String topic = "/"+productCode+"/"+deviceId+"/control";
|
|
|
-// return ApiResult.success(remoteTransferService.deviceControl(topic,requestBody));
|
|
|
-// }
|
|
|
+ @Autowired
|
|
|
+ private RemoteTransferService remoteTransferService;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 下发门禁开门
|
|
|
+ */
|
|
|
+ @GetMapping("/{productCode}/{deviceId}/control")
|
|
|
+ public ApiResult<Map<String,Object>> control(@PathVariable("productCode") String productCode,
|
|
|
+ @PathVariable("deviceId") String deviceId,
|
|
|
+ @RequestParam(value = "requestBody") String requestBody){
|
|
|
+ String topic = "/"+productCode+"/"+deviceId+"/control";
|
|
|
+ return ApiResult.success(remoteTransferService.deviceControl(topic,requestBody));
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 首页统计
|