fix(core):组织，部门代码无唯一校验

5 years ago · 3c688739f0
parent 396d5b0fa3
commit 3c688739f0
7 changed files with 40 additions and 27 deletions
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java
@ -97,4 +97,7 @@ public interface ISysDepartmentService extends ICrudService<SysDepartment> {
    @ApiOperation(value = "获取部门数量")
    long getSysDepartmentCount();

+    @ApiOperation(value = "检查工厂是否存在")
+    boolean checkSysDepartmentOnly(SysDepartment sysDepartment);
+
 }
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java
@ -100,4 +100,8 @@ public interface ISysOrganizeService extends ICrudService<SysOrganize> {
 //    @ApiOperation(value = "查询当前用户所有组织数据",notes = "查询当前用户所有组织数据")
 //    List<SysOrganize> findOrganizeIdByRefUsers(List<SysRefUserDepartment> sysRefUserDepartments);

+    @ApiOperation(value = "检查组织信息是否唯一")
+    boolean checkSysOrganizeOnly(SysOrganize sysOrganize);
+
+
 }
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java
@ -4,18 +4,14 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService;
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
-import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.base.controller.CrudBaseController;
 import cn.estsh.impp.framework.base.service.ICrudService;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
@ -28,7 +24,9 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 import java.util.ArrayList;
 import java.util.List;
@ -85,6 +83,15 @@ public class SysDepartmentController extends CrudBaseController<SysDepartment> {
            bean.setOrganizeId(department.getOrganizeId());
        }

+        if (!departmentService.checkSysDepartmentOnly(bean)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("部门代码已存在")
+                    .setErrorSolution("请重新操作")
+                    .build();
+        }
+
        return bean;
    }

--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java
@ -6,39 +6,20 @@ import cn.estsh.i3plus.core.api.iservice.busi.ILicenseClickService;
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
 import cn.estsh.i3plus.icloud.wms.sdk.IWmsActionGroupCloud;
-import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.i3plus.platform.common.tool.StringTool;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
-import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
-import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.base.controller.CrudBaseController;
 import cn.estsh.impp.framework.base.service.ICrudService;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
-import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 /**
 * @Description : 组织对外接口
@ -94,6 +75,15 @@ public class SysOrganizeController extends CrudBaseController<SysOrganize> {
                bean.setParentNameRdd(organize.getName());
            }

+        if (!organizeService.checkSysOrganizeOnly(bean)) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
+                    .setErrorDetail("组织代码已存在")
+                    .setErrorSolution("请重新操作")
+                    .build();
+        }
+
        return bean;
    }

--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
@ -283,7 +283,6 @@ public class SystemInitService implements ISystemInitService {
            } while (pager.hasNext());

            for (Map.Entry<String, Map<String, String>> entry : langSoftMap.entrySet()) {
-                LOGGER.info("【加载资源】缓存 {} 资源", entry.getKey());
                redisRes.putHashMap(entry.getKey(), entry.getValue(),-1);
            }
            LOGGER.info("【加载资源】模块资源 已分类缓存完毕");
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java
@ -314,5 +314,10 @@ public class SysDepartmentService extends CrudService<SysDepartment> implements
        return Objects.isNull(findAll()) ? 0 : findAll().size();
    }

+    @Override
+    public boolean checkSysDepartmentOnly(SysDepartment sysDepartment) {
+        return !departmentRDao.isExitByHql(CoreHqlPack.packHqlCheckSysDepartmentOnly(sysDepartment));
+    }
+

 }
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java
@ -253,6 +253,11 @@ public class SysOrganizeService extends CrudService<SysOrganize> implements ISys
    public long getSysOrganizeCount() {
        return Objects.isNull(findAll()) ? 0 : findAll().size();
    }
+
+    @Override
+    public boolean checkSysOrganizeOnly(SysOrganize sysOrganize) {
+        return !organizeRDao.isExitByHql(CoreHqlPack.packHqlCheckSysOrganizeOnly(sysOrganize));
+    }
 //
 //    @Override
 //    @ApiOperation(value = "查询当前用户所有组织数据", notes = "查询当前用户所有组织数据")