添加请求工具类

4e502a6f · 袁伟铭 · 3d1e3602 · 4e502a6f · 4e502a6f · 4e502a6f
Commit 4e502a6f authored Aug 25, 2021 by 袁伟铭
8 changed files
--- a/resource-server/src/main/java/com/zq/resource/controller/admin/CategoryController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/CategoryController.java
@@ -51,7 +51,7 @@ public class CategoryController {
    @ApiOperation("修改目录")
    @PostMapping(value = "/modifyCategory")
    public ResultVo modifyCategory(@RequestBody DataCategory vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        categoryService.modifyCategory(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/DeptController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/DeptController.java
@@ -34,21 +34,20 @@ public class DeptController {
    @ApiOperation("获取机构信息")
    @GetMapping(value = "/getDeptInfo/{deptId}")
-    public ResultVo<OrgDeptVo> getDeptInfo(@PathVariable Long deptId) {
+    public ResultVo<OrgDeptVo> getDeptInfo(@PathVariable String deptId) {
        AssertUtils.notNull(deptId, "缺少机构ID");
        return ResultVo.success(deptService.getDeptInfo(deptId));
    }
    @ApiOperation("根据部门PID查询子机构")
    @GetMapping(value = "/getDeptByPid/{parentId}")
-    public ResultVo<List<OrgDept>> getDeptByPid(@PathVariable Long parentId) {
+    public ResultVo<List<OrgDept>> getDeptByPid(@PathVariable String parentId) {
        return ResultVo.success(deptService.getDeptByPid(parentId));
    }
    @ApiOperation("添加机构")
    @PostMapping(value = "/addDept")
    public ResultVo addDept(@RequestBody OrgDept vo) {
-        AssertUtils.notNull(vo.getParentId(), "缺少父级ID");
        AssertUtils.hasText(vo.getDeptName(), "缺少机构名称");
        AssertUtils.notNull(vo.getDeptType(), "缺少机构类型");
        AssertUtils.hasText(vo.getAreaCode(), "缺少区域码");
@@ -65,7 +64,7 @@ public class DeptController {
    @ApiOperation("修改机构")
    @PostMapping(value = "/modifyDept")
    public ResultVo modifyDept(@RequestBody OrgDept vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        deptService.modifyDept(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/DictController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/DictController.java
@@ -3,7 +3,6 @@ package com.zq.resource.controller.admin;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
-import com.zq.resource.entity.DataCategory;
 import com.zq.resource.entity.DataDict;
 import com.zq.resource.service.DictService;
 import com.zq.resource.vo.DataDictFindVo;
@@ -49,7 +48,7 @@ public class DictController {
    @ApiOperation("修改字典")
    @PostMapping(value = "/modifyDict")
    public ResultVo modifyDict(@RequestBody DataDict vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        dictService.modifyDict(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/GovAffairController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/GovAffairController.java
@@ -48,7 +48,7 @@ public class GovAffairController {
    @ApiOperation("修改政务服务事项")
    @PostMapping(value = "/modifyGovAffair")
    public ResultVo modifyGovAffair(@RequestBody GovAffairItem vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        govAffairService.modifyGovAffair(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/GovMonitorController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/GovMonitorController.java
@@ -48,7 +48,7 @@ public class GovMonitorController {
    @ApiOperation("修改政务监管事项")
    @PostMapping(value = "/modifyGovMonitor")
    public ResultVo modifyGovMonitor(@RequestBody GovMonitorItem vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        govMonitorService.modifyGovMonitor(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/MetadataController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/MetadataController.java
@@ -57,7 +57,7 @@ public class MetadataController {
    @ApiOperation("修改字典")
    @PostMapping(value = "/modifyMetadata")
    public ResultVo modifyMetadata(@RequestBody InfoMetadata vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        metadataService.modifyMetadata(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/controller/admin/SystemController.java
+++ b/resource-server/src/main/java/com/zq/resource/controller/admin/SystemController.java
@@ -36,7 +36,7 @@ public class SystemController {
    @PostMapping(value = "/addSystem")
    public ResultVo addSystem(@RequestBody InfoSystem vo) {
        AssertUtils.hasText(vo.getSystemName(), "缺少系统名称");
-        AssertUtils.notNull(vo.getBelongDeptId(), "缺少所属部门ID");
+        AssertUtils.hasText(vo.getBelongDeptId(), "缺少所属部门ID");
        AssertUtils.notNull(vo.getSystemType(), "缺少系统类型");
        AssertUtils.notNull(vo.getSystemLevelType(), "缺少系统层级");
        AssertUtils.notNull(vo.getCoverLevelType(), "缺少覆盖层级");
@@ -58,7 +58,7 @@ public class SystemController {
    @ApiOperation("修改系统")
    @PostMapping(value = "/modifySystem")
    public ResultVo modifySystem(@RequestBody InfoSystem vo) {
-        AssertUtils.notNull(vo.getId());
+        AssertUtils.hasText(vo.getId());
        systemService.modifySystem(vo);
        return ResultVo.success();

--- a/resource-server/src/main/java/com/zq/resource/service/DeptService.java
+++ b/resource-server/src/main/java/com/zq/resource/service/DeptService.java
@@ -3,7 +3,6 @@ package com.zq.resource.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
@@ -15,6 +14,7 @@ import com.zq.resource.vo.DataTreeVo;
 import com.zq.resource.vo.OrgDeptFindVo;
 import com.zq.resource.vo.OrgDeptVo;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import java.util.List;
@@ -55,7 +55,7 @@ public class DeptService {
        return PagingUtils.paging(vo, orgDeptDao, OrgDept.class, lambdaQuery);
    }
-    public List<OrgDept> getDeptByPid(Long parentId) {
+    public List<OrgDept> getDeptByPid(String parentId) {
        return orgDeptDao.selectList(Wrappers.lambdaQuery(OrgDept.builder().parentId(parentId).build()));
    }
@@ -105,13 +105,13 @@ public class DeptService {
        return TreeUtils.buildTree(collect, "0");
    }
-    public OrgDeptVo getDeptInfo(Long deptId) {
+    public OrgDeptVo getDeptInfo(String deptId) {
        OrgDept orgDept = orgDeptDao.selectById(deptId);
        AssertUtils.notNull(orgDept, "机构不存在");
        OrgDeptVo orgDeptVo = BeanUtil.copyProperties(orgDept, OrgDeptVo.class);
-        if (orgDept.getParentId() != null && orgDept.getParentId() != 0) {
+        if (StringUtils.isNotBlank(orgDept.getParentId())) {
            OrgDept parentDept = orgDeptDao.selectById(orgDept.getParentId());
            if (parentDept != null) {
                orgDeptVo.setParentName(parentDept.getDeptName());