diff --git 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 index 8f117c4..7df4f1b 100644 --- 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 @@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; import cn.estsh.impp.framework.base.service.ICrudService; import io.swagger.annotations.ApiOperation; +import java.util.List; + /** * @Description : 组织业务接口 * @Reference : @@ -101,4 +103,10 @@ public interface ISysOrganizeService extends ICrudService { SysOrganize getByCode(String organizeCode); + + /** + * 获取所有 + * @return + */ + List getOrganizeCodeList(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java index 9540340..037cef4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.base.IBackstageService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.license.ImppLicense; @@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; /** @@ -48,6 +50,10 @@ public class BackstageController extends CoreBaseController { @Autowired private IBackstageService backstageService; + @Autowired + private ISysOrganizeService organizeService; + + @GetMapping(value = "/redis-put-all") @ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据") public ResultBean redisPutAll(){ @@ -174,6 +180,25 @@ public class BackstageController extends CoreBaseController { } } + @GetMapping(value = "/check/license") + @ApiOperation(value = "校验授权信息", notes = "校验授权信息") + public ResultBean checkLicense(){ + try { + List organizeCodeList = organizeService.getOrganizeCodeList(); + if (!organizeCodeList.isEmpty()){ + ImppLicenseTool.checkLicenseDateTime(); + ImppLicenseTool.checkOrganize(organizeCodeList.size()); + ImppLicenseTool.checkOrganizeCode(organizeCodeList.get(0)); + } + ResultBean result = ResultBean.success("校验成功"); + return result; + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ResultBean.fail(e).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + @GetMapping(value = "/update-clean-menu-soft-type") diff --git 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 index 137f4ed..8a96945 100644 --- 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 @@ -3,15 +3,11 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; -import cn.estsh.i3plus.pojo.platform.repository.SysDepartmentRepository; -import cn.estsh.i3plus.pojo.platform.repository.SysOrganizeRepository; -import cn.estsh.i3plus.pojo.platform.repository.SysRefUserDepartmentRepository; -import cn.estsh.i3plus.pojo.platform.repository.SysRefUserInfoDepartmentRepository; -import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository; -import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; +import cn.estsh.i3plus.pojo.platform.repository.*; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.base.service.CrudService; import org.slf4j.Logger; @@ -19,7 +15,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * @Description : 组织业务接口实现 @@ -270,6 +268,14 @@ public class SysOrganizeService extends CrudService implements ISys DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean); return organizeRDao.getByProperty(packBean); } + + @Override + public List getOrganizeCodeList() { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumEqualPack(ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue(), "organizeType", packBean); + List organizeList = organizeRDao.findByHqlWhere(packBean); + return organizeList.stream().map(SysOrganize::getOrganizeCode).collect(Collectors.toList()); + } // // @Override // @ApiOperation(value = "查询当前用户所有组织数据", notes = "查询当前用户所有组织数据")