返回参数修改

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

@@ -2,12 +2,15 @@ package com.syc.slm.slmbi.controller;
 
 import com.syc.slm.common.core.util.R;
 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.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 部门
@@ -28,7 +31,7 @@ public class DeptController {
     @GetMapping("/select_dept_list")
     @ApiOperation("部门查询")
     @ApiImplicitParam(name="deptName",value="部门名称")
-   public R selectDeptList(@RequestParam(value = "deptName",required = false) String deptName){
+   public R<List<DeptVo>> selectDeptList(@RequestParam(value = "deptName",required = false) String deptName){
        return R.ok(deptService.selectDeptList(deptName));
    }
 }

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

@@ -3,6 +3,7 @@ package com.syc.slm.slmbi.controller;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.slmbi.dto.InstrumentPanelConfigDTO;
 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.ApiOperation;
@@ -28,13 +29,13 @@ public class InstrumentPanelConfigController {
     @PostMapping("save_instrument_panel_config")
     @ApiOperation("保存，或者发布仪表板样式以及数据配置")
     @ApiImplicitParam(name ="optType", value ="1 保存 2 保存发布" )
-    public R saveInstrumentPanelConfig(@RequestBody InstrumentPanelConfigDTO config,@RequestParam Integer optType){//1 保存 2 保存发布
+    public R<Boolean> saveInstrumentPanelConfig(@RequestBody InstrumentPanelConfigDTO config,@RequestParam Integer optType){//1 保存 2 保存发布
         return R.ok(instrumentPanelConfigService.saveInstrumentPanelConfig(config,optType));
     }
     @GetMapping("get_instrument_panel_config_by_instrument_panel_id")
     @ApiOperation("根据仪表板id获取仪表板配置")
     @ApiImplicitParam(name ="instrumentPanelId", value ="仪表板id" )
-    public R getInstrumentPanelConfigByInstrumentPanelId(@RequestParam String instrumentPanelId){
+    public R<InstrumentPanelConfigVo> getInstrumentPanelConfigByInstrumentPanelId(@RequestParam String instrumentPanelId){
         return R.ok(instrumentPanelConfigService.getInstrumentPanelConfigByInstrumentPanelId(instrumentPanelId));
     }
 

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

 package com.syc.slm.slmbi.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.slmbi.dto.InstrumentPanelDTO;
 import com.syc.slm.slmbi.dto.InstrumentPanelGroupDTO;
 import com.syc.slm.slmbi.entity.InstrumentPanel;
 import com.syc.slm.slmbi.entity.InstrumentPanelGroup;
 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;
@@ -34,12 +36,12 @@ public class InstrumentPanelController {
 
     @GetMapping("/instrument_panels")
     @ApiOperation("仪表板列表")
-    public R  selectInstrumentPanelList(@RequestBody InstrumentPanelDTO where){  //where :{name:'',creator:'',updater:'',startDate:'' ,endDate:'',recordStatus:''}
+    public R<IPage<InstrumentPanelVo>>  selectInstrumentPanelList(@RequestBody InstrumentPanelDTO where){  //where :{name:'',creator:'',updater:'',startDate:'' ,endDate:'',recordStatus:''}
         return R.ok(instrumentPanelService.selectInstrumentPanelList(where));
     }
     @PostMapping("/save_instrument_panel")
     @ApiOperation("新增仪表板")
-    public R  saveInstrumentPanel(@RequestBody InstrumentPanel panel){
+    public R<Boolean>  saveInstrumentPanel(@RequestBody InstrumentPanel panel){
         return R.ok(instrumentPanelService.saveInstrumentPanel(panel));
     }
 
@@ -50,7 +52,7 @@ public class InstrumentPanelController {
             @ApiImplicitParam(name="ids",value="仪表板id集合",required=true),
             @ApiImplicitParam(name="optType",value="操作类型，1 发布，2 下线",required=true,dataType="Integer")
     })
-    public R  batchPushInstrumentPanel(@RequestBody List<String> ids,@RequestParam Integer optType){
+    public R<Boolean>  batchPushInstrumentPanel(@RequestBody List<String> ids,@RequestParam Integer optType){
         return R.ok(instrumentPanelService.batchPushInstrumentPanel(ids,optType));
     }
 
@@ -58,14 +60,14 @@ public class InstrumentPanelController {
     @PostMapping("/del_push_instrument_panel")
     @ApiOperation("删除仪表板")
     @ApiImplicitParam(name="id",value="仪表板id",required=true)
-    public R delPushInstrumentPanel(@RequestParam String id){
+    public R<Boolean> delPushInstrumentPanel(@RequestParam String id){
         return R.ok(instrumentPanelService.delPushInstrumentPanel(id));
     }
 
 
     @PostMapping("/save_as_instrument_panel")
     @ApiOperation("另存为")
-    public R saveAsInstrumentPanel(@RequestBody InstrumentPanelDTO instrumentPanelDTO) {
+    public R<Boolean> saveAsInstrumentPanel(@RequestBody InstrumentPanelDTO instrumentPanelDTO) {
         return R.ok(instrumentPanelService.saveAsInstrumentPanel(instrumentPanelDTO));
     }
 
@@ -73,14 +75,14 @@ public class InstrumentPanelController {
     @PostMapping("/show_recovery_btn")
     @ApiOperation("是否显示恢复按钮")
     @ApiImplicitParam(name="id",value="仪表板id",required=true)
-    public R showRecoveryBtn(@RequestParam String id) {
+    public R<Boolean> showRecoveryBtn(@RequestParam String id) {
         return R.ok(instrumentPanelService.showRecoveryBtn(id));
     }
 
     @PostMapping("/recovery_instrument_panel")
     @ApiOperation("恢复按钮操作")
     @ApiImplicitParam(name="id",value="仪表板id",required=true)
-    public R recoveryInstrumentPanel(@RequestParam String id) {
+    public R<Boolean> recoveryInstrumentPanel(@RequestParam String id) {
         return R.ok(instrumentPanelService.recoveryInstrumentPanel(id));
     }
 

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

@@ -4,11 +4,14 @@ import com.syc.slm.common.core.util.R;
 import com.syc.slm.slmbi.dto.InstrumentPanelGroupDTO;
 import com.syc.slm.slmbi.entity.InstrumentPanelGroup;
 import com.syc.slm.slmbi.service.InstrumentPanelGroupService;
+import com.syc.slm.slmbi.vo.InstrumentPanelGroupVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 仪表板分组
@@ -27,33 +30,33 @@ public class InstrumentPanelGroupController {
 
     @GetMapping("/selectInstrumentPanelGroupList")
     @ApiOperation("获取所有的仪表板分组")
-    public R selectInstrumentPanelGroupList(){
+    public R<List<InstrumentPanelGroupVo>> selectInstrumentPanelGroupList(){
         return R.ok(instrumentPanelGroupService.selectInstrumentPanelGroupList());
     }
 
     @GetMapping("/selectInstrumentPanelGroups")
     @ApiOperation("获取所有的仪表板分组以及分组下的仪表板以及仪表板下的组件")
-    public R selectInstrumentPanelGroups(){
+    public R<List<InstrumentPanelGroupVo>> selectInstrumentPanelGroups(){
         return R.ok(instrumentPanelGroupService.selectInstrumentPanelGroupList());
     }
 
     @PostMapping("/saveInstrumentPanelGroup")
     @ApiOperation("保存仪表板分组")
-    public R saveInstrumentPanelGroup(@RequestBody InstrumentPanelGroupDTO group){
+    public R<Boolean>  saveInstrumentPanelGroup(@RequestBody InstrumentPanelGroupDTO group){
        return  R.ok(instrumentPanelGroupService.saveInstrumentPanelGroup(group));
     }
 
 
     @PostMapping("/updateInstrumentPanelGroup")
     @ApiOperation("更新仪表板分组")
-    public R updateInstrumentPanelGroup(@RequestBody InstrumentPanelGroupDTO group){
+    public R<Boolean> updateInstrumentPanelGroup(@RequestBody InstrumentPanelGroupDTO group){
         return R.ok(instrumentPanelGroupService.updateInstrumentPanelGroup(group));
     }
 
 
     @PostMapping("/delInstrumentPanelGroup")
     @ApiOperation("删除仪表板分组")
-    public R delInstrumentPanelGroup(@RequestParam String groupId){
+    public R<Boolean> delInstrumentPanelGroup(@RequestParam String groupId){
         return R.ok(instrumentPanelGroupService.delInstrumentPanelGroup(groupId));
     }
 

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

@@ -3,6 +3,7 @@ package com.syc.slm.slmbi.controller;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.slmbi.dto.InstrumentPanelPermissionDTO;
 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.ApiOperation;
@@ -28,28 +29,28 @@ public class InstrumentPanelPermissionController {
 
     @PostMapping("save_instrument_panel_permission")
     @ApiOperation("保存仪表板权限")
-    public R saveInstrumentPanelPermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions){
+    public R<Boolean> saveInstrumentPanelPermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions){
         return  R.ok(instrumentPanelPermissionService.saveInstrumentPanelPermission(permissions));
     }
 
     @PostMapping("save_copy_other_instrument_panel_permission")
     @ApiOperation("从其他仪表板复制配置")
     @ApiImplicitParam(name="otherInstrumentPanelId",value="其他仪表板id",required=true)
-    public R saveCopyOtherInstrumentPanelPermission(@RequestParam String  otherInstrumentPanelId){
+    public R<List<InstrumentPanelPermissionVo>> saveCopyOtherInstrumentPanelPermission(@RequestParam String  otherInstrumentPanelId){
         return  R.ok(instrumentPanelPermissionService.saveCopyOtherInstrumentPanelPermission(otherInstrumentPanelId));
     }
 
     @PostMapping("save_copy_to_other_instrument_panel_permission")
     @ApiOperation("将仪表板权限复制给其他仪表板")
     @ApiImplicitParam(name="otherInstrumentPanelId",value="其他仪表板id",required=true)
-    public R saveCopyToOtherInstrumentPanelPermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions,@RequestParam String  otherInstrumentPanelId ){
+    public R<Boolean> saveCopyToOtherInstrumentPanelPermission(@RequestBody List<InstrumentPanelPermissionDTO> permissions,@RequestParam String  otherInstrumentPanelId ){
         return  R.ok(instrumentPanelPermissionService.saveCopyToOtherInstrumentPanelPermission(permissions,otherInstrumentPanelId));
     }
 
     @GetMapping("select_instrument_panel_permission_by_id")
     @ApiOperation("根据仪表板id获取仪表板权限")
     @ApiImplicitParam(name="instrumentPanelId",value="仪表板id",required=true)
-    public R selectnstrumentPanelPermissionById(@RequestParam String instrumentPanelId ){
+    public R<List<InstrumentPanelPermissionVo>> selectnstrumentPanelPermissionById(@RequestParam String instrumentPanelId ){
         return  R.ok(instrumentPanelPermissionService.selectInstrumentPanelPermissionById(instrumentPanelId));
     }
 }

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

@@ -2,12 +2,15 @@ package com.syc.slm.slmbi.controller;
 
 import com.syc.slm.common.core.util.R;
 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.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 职位查询控制器
@@ -26,7 +29,7 @@ public class PositionController {
     @GetMapping("/positions")
     @ApiOperation("职位查询列表")
     @ApiImplicitParam(name="positionName",value="职位名称")
-    public R selectPositionList(@RequestParam(value = "positionName",required = false) String positionName){
+    public R<List<PositionVo>> selectPositionList(@RequestParam(value = "positionName",required = false) String positionName){
         return R.ok(positionWorkService.selectPositionList(positionName));
     }
 }

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

@@ -2,12 +2,15 @@ package com.syc.slm.slmbi.controller;
 
 import com.syc.slm.common.core.util.R;
 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.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * slm-bi
  * 用户信息
@@ -26,7 +29,7 @@ public class UserController {
     @GetMapping("select_user_list")
     @ApiOperation("用户查询")
     @ApiImplicitParam(name="userName",value="用户名称")
-   public R selectUserList(@RequestParam(value = "userName" ,required = false) String userName){
+   public R<List<UserVo>> selectUserList(@RequestParam(value = "userName" ,required = false) String userName){
        return  R.ok(userService.selectUserList(userName));
    }
 

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

 package com.syc.slm.slmbi.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.syc.slm.common.core.util.R;
 import com.syc.slm.slmbi.dto.VariableDTO;
 import com.syc.slm.slmbi.service.VariableService;
+import com.syc.slm.slmbi.vo.VariableDeviceVo;
+import com.syc.slm.slmbi.vo.VariableSourceVo;
+import com.syc.slm.slmbi.vo.VariableVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -11,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -29,19 +34,19 @@ public class VariableController {
 
     @GetMapping("get_variable_list")
     @ApiOperation("获取变量列表")
-    public R getVariableList(@RequestBody VariableDTO variableDTO){
+    public R<IPage<VariableVo>> getVariableList(@RequestBody VariableDTO variableDTO){
         return R.ok(variableService.getVariableList(variableDTO));
     }
 
     @GetMapping("get_variable_source_list")
     @ApiOperation("获取变量来源列表")
-    public R getVariableSourceList(){
+    public R<List<VariableSourceVo>> getVariableSourceList(){
         return R.ok(variableService.getVariableSourceList());
     }
 
     @GetMapping("get_variable_device_list")
     @ApiOperation("获取变量所属设备列表")
-    public R getVariableDeviceList(){
+    public R<List<VariableDeviceVo>> getVariableDeviceList(){
         return R.ok(variableService.getVariableDeviceList());
     }