未包装返回数据部分接口修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabHardwareController.java

@@ -204,10 +204,10 @@ public class LabHardwareController extends BaseController {
      * 查询硬件功能列表
      */
     @PostMapping("/getFunList")
-    public List<HardwareCVO> getFunList() {
+    public ResultData getFunList() {
         Map <HardwareTypeEnum, List <FunctionStatus>> list = labHardwareService.getFunList();
 
-        return Optional.ofNullable(list)
+        return ResultData.success( Optional.ofNullable(list)
                 .filter(a -> a.size() > 0)
                 .orElseGet(Collections::emptyMap)
                 .entrySet()
@@ -218,7 +218,7 @@ public class LabHardwareController extends BaseController {
                     hardwareCVO.setHardwareTypeEnum(a.getKey());
                     hardwareCVO.setFunctionStatusList(a.getValue());
                     return hardwareCVO;
-                }).collect(Collectors.toList());
+                }).collect(Collectors.toList()));
 
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabMoldController.java

@@ -47,9 +47,9 @@ public class LabMoldController extends BaseController {
      */
     @PostMapping("/queryOption")
     @ApiOperation(value = "查询实验室类型下拉列表")
-    public List<LabMold> queryOption(@RequestBody LabMold labMold) {
+    public ResultData queryOption(@RequestBody LabMold labMold) {
         List<LabMold> list = labMoldService.selectLabMoldList(labMold);
-        return list;
+        return ResultData.success(list);
     }
 
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSubjectController.java

@@ -93,11 +93,11 @@ public class LabSubjectController extends BaseController {
      */
     @Deprecated
     @GetMapping("/list/nopage")
-    public List<LabSubject> listNoPage(LabSubject labSubject) {
+    public ResultData listNoPage(LabSubject labSubject) {
 //        startPage();
 //        labSubject.setAdminId(-1L);
         List<LabSubject> list = labSubjectService.selectLabSubjectList(labSubject);
-        return list;
+        return ResultData.success(list);
     }
 
     /**
@@ -105,19 +105,19 @@ public class LabSubjectController extends BaseController {
      */
     @Deprecated
     @GetMapping("/list/security")
-    public List<LabSubject> listSecurity(LabSubject labSubject) {
+    public ResultData listSecurity(LabSubject labSubject) {
         List<LabSubject> list = labSubjectService.selectLabSubjectListSecurity(labSubject);
-        return list;
+        return ResultData.success(list);
     }
 
     @GetMapping("/list/listAdmin")
-    public List<LabSubject> listAdmin(LabSubject labSubject) {
+    public ResultData listAdmin(LabSubject labSubject) {
         //获取当前登录用户所属学校和学院的deptid
         R<List<Long>> listdeptids = remoteUserService.getLogingUserDeptids();
         List<Long> deptIds= listdeptids.getData();
         labSubject.setDeptIds(deptIds);
         List<LabSubject> list = labSubjectService.selectLabSubjectListByadminidNotnull(labSubject);
-        return list;
+        return ResultData.success(list);
     }
 
     /**
@@ -387,8 +387,8 @@ public class LabSubjectController extends BaseController {
      * 查询多个院系下的实验室
      */
     @GetMapping("/multipleDetp/subList/{ids}")
-    public List<LabSubject> multipleDeptBySubList(@PathVariable("ids") Long[] ids) {
-        return labSubjectService.multipleDetpBysubList(ids);
+    public ResultData multipleDeptBySubList(@PathVariable("ids") Long[] ids) {
+        return ResultData.success(labSubjectService.multipleDetpBysubList(ids));
     }
 
     /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDeptSignController.java

@@ -3,6 +3,7 @@ package com.zd.system.controller;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.utils.SecurityUtils;
 import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysDept;
@@ -31,16 +32,16 @@ public class SysDeptSignController {
     @ApiOperation(value = "查询列表", notes = "权限字符" + PerPrefix.SYSTEM_DEPT_SIGN+ PerFun.LIST)
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_DEPT_SIGN+ PerFun.LIST)
     @GetMapping("/list")
-    public List<SysDept> list(SysDept dept) {
+    public ResultData list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
-        return depts;
+        return ResultData.success(depts);
     }
 
     @ApiOperation(value = "修改签章", notes = "权限字符" + PerPrefix.SYSTEM_DEPT_SIGN + PerFun.EDIT)
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_DEPT_SIGN + PerFun.EDIT)
     @PutMapping
-    public SysDept edit(@RequestBody SysDept dept) {
-        return deptService.updateDeptSign(dept);
+    public ResultData edit(@RequestBody SysDept dept) {
+        return ResultData.success(deptService.updateDeptSign(dept));
     }
 
     @ApiOperation(value = "用户查询是否有电子签章")

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysPermitController.java

@@ -51,9 +51,9 @@ public class SysPermitController extends BaseController {
      */
     @GetMapping("/option")
     @ApiOperation(value = "查询下拉选项")
-    public List<SysPermit> queryOption(SysPermit sysPermit) {
+    public ResultData queryOption(SysPermit sysPermit) {
         List<SysPermit> list = sysPermitService.selectSysPermitList(sysPermit);
-        return list;
+        return ResultData.success(list);
     }
 
     /**
@@ -62,8 +62,8 @@ public class SysPermitController extends BaseController {
 //    @ApiOperation(value = "获取模板详细信息", notes = "权限字符： " + PerPrefix.SYSTEM_PERMIT + PerFun.QUERY)
 //    @PreAuthorize(hasPermi = PerPrefix.SYSTEM_PERMIT + PerFun.QUERY)
     @GetMapping(value = "/{id}")
-    public SysPermit getInfo(@PathVariable("id") Long id) {
-        return sysPermitService.selectSysPermitById(id);
+    public ResultData getInfo(@PathVariable("id") Long id) {
+        return ResultData.success(sysPermitService.selectSysPermitById(id));
     }
 
     /**
@@ -71,8 +71,8 @@ public class SysPermitController extends BaseController {
      */
     @ApiOperation(value = "获取用户权限详细信息")
     @GetMapping(value = "/userPermit/{userId}")
-    public List<SysPermitMenu> getUserPermitInfo(@PathVariable("userId") Long userId) {
-        return sysPermitService.selectSysPermitByUserId(userId);
+    public ResultData getUserPermitInfo(@PathVariable("userId") Long userId) {
+        return ResultData.success(sysPermitService.selectSysPermitByUserId(userId)) ;
     }
 
     /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -2,6 +2,7 @@ package com.zd.system.controller;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
+import com.zd.model.domain.ResultData;
 import com.zd.model.entity.SysFile;
 import com.zd.base.api.feign.RemoteFileService;
 import com.zd.chemical.api.fegin.RemoteStockService;
@@ -137,8 +138,8 @@ public class SysUserController extends BaseController {
      */
 //    @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER+ PerFun.LIST)
     @GetMapping("/selectlist")
-    public List<SelectUserVO> selectlist(String nickName) {
-        if (StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
+    public ResultData selectlist(String nickName) {
+        if (StrUtil.isBlank(nickName)) return ResultData.success(new ArrayList<>());
         SysUser user = new SysUser();
         user.setNickName(nickName);
         List<SysUser> list = userService.selectUserList(user);
@@ -159,7 +160,7 @@ public class SysUserController extends BaseController {
                     return selectUserVO;
 
                 }).collect(Collectors.toList());
-        return collect;
+        return ResultData.success(collect);
     }
 
     /**
@@ -167,8 +168,8 @@ public class SysUserController extends BaseController {
      */
 //    @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER+ PerFun.LIST)
     @GetMapping("/selectTeacherList")
-    public List<SelectUserVO> selectTeacherList(String nickName) {
-        if (StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
+    public ResultData selectTeacherList(String nickName) {
+        if (StrUtil.isBlank(nickName)) return ResultData.success(new ArrayList<>());
         SysUser user = new SysUser();
         user.setNickName(nickName);
         user.setUserType("11");
@@ -190,7 +191,7 @@ public class SysUserController extends BaseController {
                     return selectUserVO;
 
                 }).collect(Collectors.toList());
-        return collect;
+        return ResultData.success(collect);
     }
 
     //"system:user:export"
@@ -558,14 +559,14 @@ public class SysUserController extends BaseController {
      * @return
      */
     @GetMapping("/selectUserListByName")
-    public List<SysUser> selectUserListByName(String nickName, String userType) {
-        if (StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
+    public ResultData selectUserListByName(String nickName, String userType) {
+        if (StrUtil.isBlank(nickName)) return ResultData.success(new ArrayList<>());
         SysUser user = new SysUser();
         user.setUserType(StrUtil.isBlank(userType) ? "11" : userType);//用户身份 11教职工 22学生
         user.setNickName(nickName);
         startPage();
         List<SysUser> list = userService.selectUserListByName(user);
-        return list;
+        return ResultData.success(list);
     }
 
 
@@ -576,8 +577,8 @@ public class SysUserController extends BaseController {
      * @return
      */
     @GetMapping("/selectUserListByNotWhite")
-    public List<SysUser> selectUserListByNotWhite(String nickName) {
-        if (StrUtil.isBlank(nickName)) return Collections.EMPTY_LIST;
+    public ResultData selectUserListByNotWhite(String nickName) {
+        if (StrUtil.isBlank(nickName)) return ResultData.success(new ArrayList<>());
         SysUser user = new SysUser();
         //当前登录用户所属院校部门集合
         List<Long> deptIds = userService.getLogingUserDeptids();
@@ -585,7 +586,7 @@ public class SysUserController extends BaseController {
         user.setUserType("11");//用户身份 11教职工 22学生
         user.setNickName(nickName);
         List<SysUser> list = userService.selectUserListByNotWhite(user);
-        return list;
+        return ResultData.success(list);
     }
 
     /**