Compare commits
No commits in common. "69af79b84290b26ce491dc8d9b658cb46b781060" and "8f80eb8a963f4c95d6ad896646d97c7673ea71fd" have entirely different histories.
69af79b842
...
8f80eb8a96
|
|
@ -2,10 +2,10 @@ package com.ruoyi.device.controller;
|
||||||
|
|
||||||
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.domain.R;
|
||||||
import com.ruoyi.common.core.web.controller.BaseController;
|
import com.ruoyi.common.core.web.controller.BaseController;
|
||||||
|
import com.ruoyi.common.security.annotation.InnerAuth;
|
||||||
import com.ruoyi.device.api.domain.DockVO;
|
import com.ruoyi.device.api.domain.DockVO;
|
||||||
import com.ruoyi.device.api.domain.GroupVO;
|
import com.ruoyi.device.api.domain.GroupVO;
|
||||||
import com.ruoyi.device.api.domain.GroupCreateRequest;
|
import com.ruoyi.device.api.domain.GroupCreateRequest;
|
||||||
import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
|
|
||||||
import com.ruoyi.device.service.api.IGroupService;
|
import com.ruoyi.device.service.api.IGroupService;
|
||||||
import com.ruoyi.device.service.dto.GroupDTO;
|
import com.ruoyi.device.service.dto.GroupDTO;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
@ -57,13 +57,15 @@ public class GroupController extends BaseController
|
||||||
/**
|
/**
|
||||||
* 切换机场所在的分组
|
* 切换机场所在的分组
|
||||||
*
|
*
|
||||||
* @param request 切换分组请求
|
* @param dockId 机场ID
|
||||||
|
* @param groupId 分组ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@PostMapping("/switch")
|
//@InnerAuth
|
||||||
public R<Void> switchDockGroup(@RequestBody SwitchDockGroupRequest request)
|
@PutMapping("/switch/{dockId}/{groupId}")
|
||||||
|
public R<Void> switchDockGroup(@PathVariable("dockId") Long dockId, @PathVariable("groupId") Long groupId)
|
||||||
{
|
{
|
||||||
groupService.switchDockGroup(request.getDockId(), request.getGroupId());
|
groupService.switchDockGroup(dockId, groupId);
|
||||||
return R.ok();
|
return R.ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue