设置统一返回值

src/main/java/com/usky/dxtop/controller/web/SysConfigController.java

@@ -36,11 +36,11 @@ public class SysConfigController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfig config)
+    public ApiResult<TableDataInfo> list(SysConfig config)
     {
         startPage();
         List<SysConfig> list = configService.selectConfigList(config);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/SysDeptController.java

@@ -3,6 +3,7 @@ package com.usky.dxtop.controller.web;
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.constant.UserConstants;
 import com.usky.dxtop.common.core.domain.ApiResult;
+import com.usky.dxtop.common.core.domain.TreeSelect;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.SecurityUtils;
@@ -39,7 +40,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public ApiResult list(SysDept dept)
+    public ApiResult<List<SysDept>> list(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(depts);
@@ -50,7 +51,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list/exclude/{deptId}")
-    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+    public ApiResult<List<SysDept>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
@@ -71,7 +72,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public ApiResult getInfo(@PathVariable Long deptId)
+    public ApiResult<SysDept> getInfo(@PathVariable Long deptId)
     {
         return ApiResult.success(deptService.selectDeptById(deptId));
     }
@@ -80,7 +81,7 @@ public class SysDeptController extends BaseController
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public ApiResult treeselect(SysDept dept)
+    public ApiResult<List<TreeSelect>> treeselect(SysDept dept)
     {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(deptService.buildDeptTreeSelect(depts));

src/main/java/com/usky/dxtop/controller/web/SysDictDataController.java

@@ -1,17 +1,11 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
-
 import com.usky.dxtop.common.core.domain.ApiResult;
-
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
-
 import com.usky.dxtop.controller.BaseController;
 import com.usky.dxtop.model.SysDictData;
 import com.usky.dxtop.service.ISysDictDataService;
@@ -19,14 +13,10 @@ import com.usky.dxtop.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-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.ArrayList;
+import java.util.List;
 
 
 /**
@@ -46,11 +36,11 @@ public class SysDictDataController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
+    public ApiResult<TableDataInfo> list(SysDictData dictData)
     {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
     /**
      * 查询字典数据详细

src/main/java/com/usky/dxtop/controller/web/SysDictTypeController.java

@@ -32,11 +32,11 @@ public class SysDictTypeController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictType dictType)
+    public ApiResult<TableDataInfo> list(SysDictType dictType)
     {
         startPage();
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/SysNoticeController.java

@@ -1,9 +1,6 @@
 package com.usky.dxtop.controller.web;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
-
 import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
 import com.usky.dxtop.common.enums.BusinessType;
@@ -14,14 +11,9 @@ import com.usky.dxtop.service.ISysNoticeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-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;
 
 
 /**
@@ -41,11 +33,11 @@ public class SysNoticeController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysNotice notice)
+    public ApiResult<TableDataInfo> list(SysNotice notice)
     {
         startPage();
         List<SysNotice> list = noticeService.selectNoticeList(notice);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/SysPostController.java

@@ -35,11 +35,11 @@ public class SysPostController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:post:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysPost post)
+    public ApiResult<TableDataInfo> list(SysPost post)
     {
         startPage();
         List<SysPost> list = postService.selectPostList(post);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/SysRoleController.java

@@ -49,11 +49,11 @@ public class SysRoleController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
+    public ApiResult<TableDataInfo> list(SysRole role)
     {
         startPage();
         List<SysRole> list = roleService.selectRoleList(role);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/SysUserController.java

@@ -49,11 +49,11 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysUser user)
+    public ApiResult<TableDataInfo> list(SysUser user)
     {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/controller/web/monitor/SysLogininforController.java

@@ -1,7 +1,5 @@
 package com.usky.dxtop.controller.web.monitor;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
@@ -11,11 +9,9 @@ import com.usky.dxtop.model.SysLogininfor;
 import com.usky.dxtop.service.ISysLogininforService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -32,11 +28,11 @@ public class SysLogininforController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysLogininfor logininfor)
+    public ApiResult<TableDataInfo> list(SysLogininfor logininfor)
     {
         startPage();
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")

src/main/java/com/usky/dxtop/controller/web/monitor/SysOperlogController.java

@@ -1,7 +1,5 @@
 package com.usky.dxtop.controller.web.monitor;
 
-import java.util.List;
-
 import com.usky.dxtop.common.annotation.Log;
 import com.usky.dxtop.common.core.domain.ApiResult;
 import com.usky.dxtop.common.core.page.TableDataInfo;
@@ -11,11 +9,9 @@ import com.usky.dxtop.model.SysOperLog;
 import com.usky.dxtop.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -32,11 +28,11 @@ public class SysOperlogController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysOperLog operLog)
+    public ApiResult<TableDataInfo> list(SysOperLog operLog)
     {
         startPage();
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
 

src/main/java/com/usky/dxtop/quartz/controller/SysJobController.java

@@ -35,11 +35,11 @@ public class SysJobController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysJob sysJob)
+    public ApiResult<TableDataInfo> list(SysJob sysJob)
     {
         startPage();
         List<SysJob> list = jobService.selectJobList(sysJob);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     /**

src/main/java/com/usky/dxtop/quartz/controller/SysJobLogController.java

@@ -29,11 +29,11 @@ public class SysJobLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('monitor:job:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysJobLog sysJobLog)
+    public ApiResult<TableDataInfo> list(SysJobLog sysJobLog)
     {
         startPage();
         List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
-        return getDataTable(list);
+        return ApiResult.success(getDataTable(list));
     }
 
     

src/main/java/com/usky/dxtop/service/impl/CompanyServiceImpl.java

@@ -86,7 +86,9 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public boolean remove(Long id) {
         Company company = this.getById(id);
         Optional.ofNullable(company).orElseThrow(() -> new CustomException("产品不存在"));
-        sysFileService.removeByBatchNo(company.getLogo());
+        if (StringUtils.isNotBlank(company.getLogo())){
+            sysFileService.removeByBatchNo(company.getLogo());
+        }
         company.setDelFlag(true);
         return this.updateById(company);
     }