整改接口

src/main/java/com/syc/slm/slmbi/controller/DeptController.java

@@ -5,6 +5,7 @@ import com.syc.slm.slmbi.service.DeptService;
 import com.syc.slm.slmbi.vo.DeptVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,9 +19,9 @@ import java.util.List;
  * @author : lin
  * @date : 2021-03-25 18:39
  **/
-@RequestMapping("/departments")
+@RequestMapping("/{appId}/departments")
 @RestController
-@Api(value = "部门信息接口")
+@Api(value = "部门信息接口", tags = "部门信息接口TAG")
 public class DeptController {
 
     @Autowired
@@ -28,8 +29,10 @@ public class DeptController {
 
     @GetMapping
     @ApiOperation("部门查询")
-    @ApiImplicitParam(name = "deptName", value = "部门名称")
-    public R<List<DeptVo>> selectDeptList(@RequestParam(value = "deptName", required = false) String deptName) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "deptName", value = "部门名称"),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<List<DeptVo>> selectDeptList(@PathVariable String appId,
+        @RequestParam(value = "deptName", required = false) String deptName) {
         return R.ok(deptService.selectDeptList(deptName));
     }
 }

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelConfigController.java

@@ -6,6 +6,7 @@ import com.syc.slm.slmbi.service.InstrumentPanelConfigService;
 import com.syc.slm.slmbi.vo.InstrumentPanelConfigVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,9 +19,9 @@ import org.springframework.web.bind.annotation.*;
  * @date : 2021-03-25 19:09
  **/
 
-@RequestMapping("/panel-configs")
+@RequestMapping("/{appId}/panel-configs")
 @RestController
-@Api(value = "仪表板样式以及数据配置")
+@Api(value = "仪表板样式以及数据配置", tags = "仪表板样式以及数据配置TAG")
 public class InstrumentPanelConfigController {
 
     @Autowired
@@ -28,20 +29,23 @@ public class InstrumentPanelConfigController {
 
     @PostMapping
     @ApiOperation("保存仪表板样式以及数据配置")
-    public R<String> saveInstrumentPanelConfig(@RequestBody InstrumentPanelConfigDTO config) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> saveInstrumentPanelConfig(@PathVariable String appId, InstrumentPanelConfigDTO config) {
         return R.ok(instrumentPanelConfigService.saveConfig(config));
     }
 
     @PostMapping("/publish")
     @ApiOperation("保存发布仪表板样式以及数据配置")
-    public R<String> publish(@RequestBody InstrumentPanelConfigDTO config) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> publish(@PathVariable String appId, @RequestBody InstrumentPanelConfigDTO config) {
         return R.ok(instrumentPanelConfigService.publish(config));
     }
 
     @GetMapping("/{panelId}")
     @ApiOperation("根据仪表板id获取仪表板配置")
-    @ApiImplicitParam(name = "panelId", value = "仪表板id")
-    public R<InstrumentPanelConfigVo> getConfigByPanelId(
+    @ApiImplicitParams({@ApiImplicitParam(name = "panelId", value = "仪表板id"),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<InstrumentPanelConfigVo> getConfigByPanelId(@PathVariable String appId,
         @PathVariable("panelId") String panelId) {
         return R.ok(instrumentPanelConfigService.getConfigByPanelId(panelId));
     }

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelController.java

@@ -8,6 +8,7 @@ import com.syc.slm.slmbi.service.InstrumentPanelService;
 import com.syc.slm.slmbi.vo.InstrumentPanelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -22,8 +23,8 @@ import java.util.List;
  * @date : 2021-03-25 15:10
  **/
 @RestController
-@RequestMapping("/panels")
-@Api(value = "仪表板配置接口", description = "仪表板配置接口")
+@RequestMapping("/{appId}/panels")
+@Api(value = "仪表板配置接口", tags = "仪表板配置接口TAG")
 public class InstrumentPanelController {
 
     @Autowired
@@ -37,55 +38,64 @@ public class InstrumentPanelController {
      */
     @GetMapping
     @ApiOperation("仪表板列表")
-    public R<IPage<InstrumentPanelVo>> selectInstrumentPanelList(@RequestBody QueryInstrumentPanelDTO where) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<IPage<InstrumentPanelVo>> selectInstrumentPanelList(@PathVariable String appId,
+        QueryInstrumentPanelDTO where) {
         return R.ok(instrumentPanelService.selectInstrumentPanelList(where));
     }
 
     @PostMapping
     @ApiOperation("新增仪表板")
-    public R<String> saveInstrumentPanel(@RequestBody SaveInstrumentPanelDTO panel) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> saveInstrumentPanel(@PathVariable String appId, @RequestBody SaveInstrumentPanelDTO panel) {
         return R.ok(instrumentPanelService.savePanel(panel));
     }
 
     @PutMapping("/publish")
     @ApiOperation("批量发布")
-    @ApiImplicitParam(name = "ids", value = "仪表板id集合", required = true)
-    public R<Boolean> batchPublish(@RequestBody List<String> ids) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "ids", value = "仪表板id集合", required = true),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<Boolean> batchPublish(@PathVariable String appId, @RequestBody List<String> ids) {
         return R.ok(instrumentPanelService.batchPublish(ids));
     }
 
     @PutMapping("/{id}/offline")
     @ApiOperation("下线")
-    @ApiImplicitParam(name = "id", value = "仪表板id", required = true)
-    public R<String> offline(@PathVariable("id") String id) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "仪表板id", required = true),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<String> offline(@PathVariable String appId, @PathVariable("id") String id) {
         return R.ok(instrumentPanelService.offline(id));
     }
 
     @DeleteMapping("/{id}")
     @ApiOperation("删除仪表板")
-    @ApiImplicitParam(name = "id", value = "仪表板id", required = true)
-    public R<String> delInstrumentPanel(@PathVariable("id") String id) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "仪表板id", required = true),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<String> delInstrumentPanel(@PathVariable String appId, @PathVariable("id") String id) {
         return R.ok(instrumentPanelService.delPanel(id));
     }
 
     @PostMapping("/save-as")
     @ApiOperation("另存为")
-    public R<String> saveAs(@RequestBody SaveInstrumentPanelDTO panelDTO) {
+    @ApiImplicitParam(name = "id", value = "仪表板id", required = true)
+    public R<String> saveAs(@PathVariable String appId, @RequestBody SaveInstrumentPanelDTO panelDTO) {
         // FIXME 另存为需要保存配置、权限信息吗？
         return R.ok(instrumentPanelService.saveAsPanel(panelDTO));
     }
 
     @PostMapping("/{id}/show-recovery-btn")
     @ApiOperation("是否显示恢复按钮")
-    @ApiImplicitParam(name = "id", value = "仪表板id", required = true)
-    public R<Boolean> showRecoveryBtn(@PathVariable("id") String id) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "仪表板id", required = true),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<Boolean> showRecoveryBtn(@PathVariable String appId, @PathVariable("id") String id) {
         return R.ok(instrumentPanelService.showRecoveryBtn(id));
     }
 
     @PutMapping("/{id}/recovery")
     @ApiOperation("恢复按钮操作")
-    @ApiImplicitParam(name = "id", value = "仪表板id", required = true)
-    public R<String> recoveryInstrumentPanel(@PathVariable("id") String id) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "仪表板id", required = true),
+        @ApiImplicitParam(name = "appId", value = "租户id", required = true)})
+    public R<String> recoveryInstrumentPanel(@PathVariable String appId, @PathVariable("id") String id) {
         return R.ok(instrumentPanelService.recoveryPanel(id));
     }
 

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelGroupController.java

@@ -5,6 +5,7 @@ import com.syc.slm.slmbi.dto.CreateInstrumentPanelGroupDTO;
 import com.syc.slm.slmbi.dto.InstrumentPanelGroupDTO;
 import com.syc.slm.slmbi.service.InstrumentPanelGroupService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,8 +18,8 @@ import org.springframework.web.bind.annotation.*;
  * @date : 2021-03-25 15:07
  **/
 @RestController
-@RequestMapping("/groups")
-@Api(value = "仪表板分组")
+@RequestMapping("/{appId}/groups")
+@Api(value = "仪表板分组", tags = "仪表板分组TAG")
 public class InstrumentPanelGroupController {
 
     @Autowired
@@ -26,19 +27,22 @@ public class InstrumentPanelGroupController {
 
     @PostMapping
     @ApiOperation("保存仪表板分组")
-    public R<String> saveGroup(@RequestBody CreateInstrumentPanelGroupDTO group) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> saveGroup(@PathVariable String appId, @RequestBody CreateInstrumentPanelGroupDTO group) {
         return R.ok(instrumentPanelGroupService.saveGroup(group));
     }
 
     @PutMapping
     @ApiOperation("更新仪表板分组")
-    public R<String> updateGroup(@RequestBody InstrumentPanelGroupDTO group) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> updateGroup(@PathVariable String appId, @RequestBody InstrumentPanelGroupDTO group) {
         return R.ok(instrumentPanelGroupService.updateGroup(group));
     }
 
     @DeleteMapping("/{groupId}")
     @ApiOperation("删除仪表板分组")
-    public R<String> delGroup(@PathVariable String groupId) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> delGroup(@PathVariable String appId, @PathVariable String groupId) {
         return R.ok(instrumentPanelGroupService.delGroup(groupId));
     }
 

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelPermissionController.java

@@ -6,6 +6,7 @@ import com.syc.slm.slmbi.service.InstrumentPanelPermissionService;
 import com.syc.slm.slmbi.vo.InstrumentPanelPermissionVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -19,9 +20,9 @@ import java.util.List;
  * @author : lin
  * @date : 2021-03-25 18:54
  **/
-@Api(value = "仪表板权限控制")
+@Api(value = "仪表板权限控制", tags = "仪表板权限控制TAG")
 @RestController
-@RequestMapping("/panel-permissions")
+@RequestMapping("/{appId}/panel-permissions")
 public class InstrumentPanelPermissionController {
 
     @Autowired
@@ -29,29 +30,36 @@ public class InstrumentPanelPermissionController {
 
     @PostMapping
     @ApiOperation("保存仪表板权限（列表的属性保存）")
-    public R<String> savePermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions) {
-        return R.ok(instrumentPanelPermissionService.savePermission(permissions));
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<String> savePermission(@PathVariable String appId, @RequestBody InstrumentPanelPermissionDTO permission) {
+        return R.ok(instrumentPanelPermissionService.savePermission(permission));
     }
 
     @PostMapping("/{panelId}/to-copy")
     @ApiOperation("从其他仪表板复制配置")
-    @ApiImplicitParam(name = "panelId", value = "其他仪表板id", required = true)
-    public R<List<InstrumentPanelPermissionVo>> saveCopyOtherPermission(@PathVariable String panelId) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "panelId", value = "其他仪表板id", required = true)})
+    public R<List<InstrumentPanelPermissionVo>> saveCopyOtherPermission(@PathVariable String appId,
+        @PathVariable String panelId) {
         return R.ok(instrumentPanelPermissionService.saveCopyOtherPermission(panelId));
     }
 
     @PostMapping("/{panelId}/copy-to")
     @ApiOperation("将仪表板权限复制给其他仪表板")
-    @ApiImplicitParam(name = "panelId", value = "其他仪表板id", required = true)
-    public R<String> saveCopyToOtherPermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions,
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "panelId", value = "其他仪表板id", required = true)})
+    public R<String> saveCopyToOtherPermission(@PathVariable String appId,
+        @RequestBody InstrumentPanelPermissionDTO permission,
         @PathVariable String panelId) {
-        return R.ok(instrumentPanelPermissionService.saveCopyToOtherPermission(permissions, panelId));
+        return R.ok(instrumentPanelPermissionService.saveCopyToOtherPermission(permission, panelId));
     }
 
     @GetMapping("/{panelId}")
     @ApiOperation("根据仪表板id获取仪表板权限")
-    @ApiImplicitParam(name = "panelId", value = "仪表板id", required = true)
-    public R<List<InstrumentPanelPermissionVo>> selectPermissionByPanelId(@PathVariable String panelId) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "panelId", value = "其他仪表板id", required = true)})
+    public R<List<InstrumentPanelPermissionVo>> selectPermissionByPanelId(@PathVariable String appId,
+        @PathVariable String panelId) {
         return R.ok(instrumentPanelPermissionService.selectPermissionByPanelId(panelId));
     }
 }

src/main/java/com/syc/slm/slmbi/controller/InstrumentPanelTreeController.java

 package com.syc.slm.slmbi.controller;
 
 import com.syc.slm.common.core.util.R;
+import com.syc.slm.slmbi.service.InstrumentPanelGroupService;
 import com.syc.slm.slmbi.vo.InstrumentPanelGroupVo;
 import com.syc.slm.slmbi.vo.PanelTreeNodeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -19,29 +18,36 @@ import java.util.List;
  * @date 2021/3/31
  */
 @RestController
-@RequestMapping("/panel-tree")
-@Api(value = "仪表板树接口")
+@RequestMapping("/{appId}/panel-tree")
+@Api(value = "仪表板树接口", tags = "仪表板树接口TAG")
 public class InstrumentPanelTreeController {
+    @Autowired
+    private InstrumentPanelGroupService instrumentPanelGroupService;
 
     @GetMapping
     @ApiOperation("第一次进入页面,或者点击查询，获取全部分组下的仪表板数据，以及分组数据")
-    @ApiImplicitParam(name = "name", value = "分组名称或者仪表板名称")
-    public R<List<PanelTreeNodeVo>> loadTrees(@RequestParam(value = "name", required = false) String name) {
-        return R.ok();
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "name", value = "分组名称或者仪表板名称")})
+    public R<List<PanelTreeNodeVo>> loadTrees(@PathVariable String appId,
+        @RequestParam(value = "name", required = false) String name) {
+        return R.ok(instrumentPanelGroupService.loadTrees(name));
     }
 
     @GetMapping("/children")
     @ApiOperation("点击节点获取，该分组下的仪表板信息，以及分组数据")
-    @ApiImplicitParams({@ApiImplicitParam(name = "groupId", value = "分组id", required = true),
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "groupId", value = "分组id", required = true),
+
         @ApiImplicitParam(name = "name", value = "分组名称或者仪表板名称")})
-    public R<List<PanelTreeNodeVo>> children(@RequestParam("groupId") String groupId,
+    public R<List<PanelTreeNodeVo>> children(@PathVariable String appId,
+        @RequestParam("groupId") String groupId,
         @RequestParam(value = "name", required = false) String name) {
-        return R.ok();
+        return R.ok(instrumentPanelGroupService.children(groupId, name));
     }
 
     // FIXME 使用场景？
     @GetMapping("/selectInstrumentPanelGroups")
-    @ApiOperation("获取所有的仪表板分组以及分组下的仪表板以及仪表板下的组件")
+    //@ApiOperation("获取所有的仪表板分组以及分组下的仪表板以及仪表板下的组件")
     public R<List<InstrumentPanelGroupVo>> selectInstrumentPanelGroups() {
         return R.ok();
     }

src/main/java/com/syc/slm/slmbi/controller/PositionController.java

@@ -5,6 +5,7 @@ import com.syc.slm.slmbi.service.PositionService;
 import com.syc.slm.slmbi.vo.PositionVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,9 +19,9 @@ import java.util.List;
  * @author : lin
  * @date : 2021-03-25 17:26
  **/
-@Api(value = "职位查询列表")
+@Api(value = "职位查询列表", tags = "职位查询列表TAG")
 @RestController
-@RequestMapping("/positions")
+@RequestMapping("/{appId}/positions")
 public class PositionController {
 
     @Autowired
@@ -28,8 +29,9 @@ public class PositionController {
 
     @GetMapping
     @ApiOperation("职位查询列表")
-    @ApiImplicitParam(name = "positionName", value = "职位名称")
-    public R<List<PositionVo>> selectPositionList(
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "positionName", value = "职位名称")})
+    public R<List<PositionVo>> selectPositionList(@PathVariable String appId,
         @RequestParam(value = "positionName", required = false) String positionName) {
         return R.ok(positionWorkService.selectPositionList(positionName));
     }

src/main/java/com/syc/slm/slmbi/controller/UserController.java

@@ -5,6 +5,7 @@ import com.syc.slm.slmbi.service.UserService;
 import com.syc.slm.slmbi.vo.UserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -18,9 +19,9 @@ import java.util.List;
  * @author : lin
  * @date : 2021-03-25 18:45
  **/
-@Api(value = "用户信息", description = "用户信息接口")
+@Api(value = "用户信息", tags = "用户信息接口TAG")
 @RestController
-@RequestMapping("/users")
+@RequestMapping("/{appId}/users")
 public class UserController {
 
     @Autowired
@@ -28,8 +29,10 @@ public class UserController {
 
     @GetMapping
     @ApiOperation("用户查询")
-    @ApiImplicitParam(name = "userName", value = "用户名称")
-    public R<List<UserVo>> selectUserList(@RequestParam(value = "userName", required = false) String userName) {
+    @ApiImplicitParams({@ApiImplicitParam(name = "appId", value = "租户id", required = true),
+        @ApiImplicitParam(name = "userName", value = "用户名称")})
+    public R<List<UserVo>> selectUserList(@PathVariable String appId,
+        @RequestParam(value = "userName", required = false) String userName) {
         return R.ok(userService.selectUserList(userName));
     }
 

src/main/java/com/syc/slm/slmbi/controller/VariableController.java

@@ -8,12 +8,10 @@ import com.syc.slm.slmbi.dto.VariableDTO;
 import com.syc.slm.slmbi.service.VariableService;
 import com.syc.slm.slmbi.vo.*;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -26,40 +24,46 @@ import java.util.Map;
  * @date : 2021-03-25 18:45
  **/
 @RestController
-@RequestMapping("/variables")
-@Api(description = "变量控件")
+@RequestMapping("/{appId}/variables")
+@Api(description = "变量控件", tags = "变量控件TAG")
 public class VariableController {
     @Autowired
     private VariableService variableService;
 
     @GetMapping
     @ApiOperation("获取变量列表")
-    public R<IPage<VariableVo>> getVariableList(@RequestBody VariableDTO variableDTO) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<IPage<VariableVo>> getVariableList(@PathVariable String appId, VariableDTO variableDTO) {
         return R.ok(variableService.getVariableList(variableDTO));
     }
 
     @GetMapping("/real-time")
     @ApiOperation("获取变量实时数据")
-    public R<Map<String, List<Map<String, RealTimeVariableVo>>>> getVariableRealTimeDataList(
-        @RequestBody RealTimeVariableDTO variableDTO) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<Map<String, List<Map<String, RealTimeVariableVo>>>> getVariableRealTimeDataList(@PathVariable String appId,
+        RealTimeVariableDTO variableDTO) {
         return R.ok(variableService.getVariableRealTimeDataList(variableDTO));
     }
 
     @GetMapping("/source")
     @ApiOperation("获取变量来源列表")
-    public R<List<VariableSourceVo>> getVariableSourceList() {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<List<VariableSourceVo>> getVariableSourceList(@PathVariable String appId) {
         return R.ok(variableService.getVariableSourceList());
     }
 
     @GetMapping("/device")
     @ApiOperation("获取变量所属设备列表")
-    public R<List<VariableDeviceVo>> getVariableDeviceList() {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<List<VariableDeviceVo>> getVariableDeviceList(@PathVariable String appId) {
         return R.ok(variableService.getVariableDeviceList());
     }
 
     @GetMapping("/history")
     @ApiOperation("获取变量历史数据")
-    public R<Map<String, List<Map<String, HistoryVariableVo>>>> getVariableHistoryDataList(@RequestBody HistoryVariableDTO variableDTO) {
+    @ApiImplicitParam(name = "appId", value = "租户id", required = true)
+    public R<Map<String, List<Map<String, HistoryVariableVo>>>> getVariableHistoryDataList(@PathVariable String appId,
+        HistoryVariableDTO variableDTO) {
         return R.ok(variableService.getVariableHistoryDataList(variableDTO));
     }
 }

src/main/java/com/syc/slm/slmbi/dto/SaveInstrumentPanelDTO.java

@@ -20,4 +20,10 @@ public class SaveInstrumentPanelDTO {
     private String name;
     @ApiModelProperty(value = "仪表板归属分组", required = true)
     private String groupId;
+
+    @ApiModelProperty(value = "仪表板配置详情，包含了样式，数据配置", required = true)
+    private String configDetails;
+
+    @ApiModelProperty(value = "访问权限", required = true)
+    private InstrumentPanelPermissionDTO permission;
 }

src/main/java/com/syc/slm/slmbi/service/InstrumentPanelPermissionService.java

@@ -5,7 +5,13 @@ import com.syc.slm.slmbi.vo.InstrumentPanelPermissionVo;
 import lombok.NonNull;
 
 import java.util.List;
-
+/**
+ * slm-bi
+ * 仪表板权限控制
+ *
+ * @author : lin
+ * @date : 2021-03-25 18:54
+ **/
 public interface InstrumentPanelPermissionService {
     /**
      * 保存仪表板权限
@@ -13,7 +19,7 @@ public interface InstrumentPanelPermissionService {
      * @param permissions
      * @return
      */
-    String savePermission(List<InstrumentPanelPermissionDTO> permissions);
+    String savePermission(InstrumentPanelPermissionDTO permissions);
 
     /**
      * 从其他仪表板复制配置
@@ -30,7 +36,7 @@ public interface InstrumentPanelPermissionService {
      * @param otherInstrumentPanelId
      * @return
      */
-    String saveCopyToOtherPermission(List<InstrumentPanelPermissionDTO> permissions, String otherInstrumentPanelId);
+    String saveCopyToOtherPermission(InstrumentPanelPermissionDTO permissions, String otherInstrumentPanelId);
 
     /**
      * 根据仪表板id获取仪表板权限

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelPermissionImpl.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Service
 public class InstrumentPanelPermissionImpl implements InstrumentPanelPermissionService {
     @Override
-    public String savePermission(List<InstrumentPanelPermissionDTO> permissions){
+    public String savePermission(InstrumentPanelPermissionDTO permissions){
         //判断仪表板的名称是否重复
         //删除原本的权限
         //插入现有的权限
@@ -32,7 +32,7 @@ public class InstrumentPanelPermissionImpl implements InstrumentPanelPermissionS
     }
 
     @Override
-    public String saveCopyToOtherPermission(List<InstrumentPanelPermissionDTO> permissions, String otherInstrumentPanelId) {
+    public String saveCopyToOtherPermission(InstrumentPanelPermissionDTO permissions, String otherInstrumentPanelId) {
         return null;
     }