CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整部门,员工,字典

Browse Source
This commit is contained in:
DB 2024-04-26 17:00:13 +08:00
parent 5a78ad69c8
commit dec1629100
18 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java
View File

@ -8,7 +8,7 @@ import com.cpop.oam.business.service.DeptService;
import com.cpop.oam.business.service.RoleService;
import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.*;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.oam.framework.enums.InitRoleEnum;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java
View File

@ -4,7 +4,7 @@ import com.cpop.core.base.entity.R;
import com.cpop.core.utils.file.FileUploadUtils;
import com.cpop.core.utils.file.FileUtils;
import com.cpop.system.business.vo.SysFileVo;
import com.cpop.system.framework.handler.TencentCosHandler;
import com.cpop.oam.framework.handler.tencentCos.TencentCosHandler;
import com.qcloud.cos.model.UploadResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

2
Cpop-System/src/main/java/com/cpop/system/business/dto/BizLicenseOcrDto.java → Cpop-Oam/src/main/java/com/cpop/oam/business/dto/BizLicenseOcrDto.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.business.dto;
package com.cpop.oam.business.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import io.swagger.v3.oas.annotations.media.Schema;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DataImportServiceImpl.java
View File

@ -25,7 +25,7 @@ import com.cpop.oam.business.service.DataImportService;
import com.cpop.oam.business.vo.DataImportPageVo;
import com.cpop.oam.framework.constant.OamRedisConstant;
import com.cpop.system.business.vo.SysFileVo;
import com.cpop.system.framework.handler.TencentCosHandler;
import com.cpop.oam.framework.handler.tencentCos.TencentCosHandler;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.cpop.oam.business.bo.DictDataBo;
import com.cpop.oam.business.bo.DictDataPageBo;
import com.cpop.oam.business.vo.DictDataPageVo;
import com.cpop.oam.business.vo.DictDataVo;
import com.cpop.system.framework.utils.DictUtils;
import com.cpop.oam.framework.utils.DictUtils;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.cpop.oam.business.bo.DictTypeBo;
import com.cpop.oam.business.entity.DictData;
import com.cpop.oam.business.service.DictDataService;
import com.cpop.oam.business.vo.DictTypePageVo;
import com.cpop.system.framework.utils.DictUtils;
import com.cpop.oam.framework.utils.DictUtils;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java
View File

@ -14,7 +14,7 @@ import com.cpop.oam.business.mapper.MenuMapper;
import com.cpop.oam.business.service.MenuService;
import com.cpop.system.business.vo.MenuRouteVo;
import com.cpop.system.business.vo.MenuVo;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.oam.framework.enums.InitRoleEnum;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/OamWxCpServiceImpl.java
View File

@ -18,7 +18,7 @@ import com.cpop.oam.business.service.StaffMidDeptService;
import com.cpop.oam.business.service.StaffService;
import com.cpop.oam.business.vo.WxCpLoginVo;
import com.cpop.oam.framework.config.wxCp.WxCpConfiguration;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.oam.framework.enums.InitRoleEnum;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db;
import com.mybatisflex.core.row.Row;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.cpop.core.base.entity.PageDomain;
import com.cpop.core.base.enums.UserType;
import com.cpop.core.utils.StringUtils;
import com.cpop.core.utils.bean.BeanUtils;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.oam.framework.enums.InitRoleEnum;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.SqlUtils;
import com.cpop.system.business.bo.RoleBo;

2
Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/TaskServiceImpl.java
View File

@ -26,7 +26,7 @@ import com.cpop.oam.framework.constant.OamConfigKey;
import com.cpop.oam.framework.constant.OamRedisConstant;
import com.cpop.oam.framework.constant.WebHookKeyConstant;
import com.cpop.oam.framework.enums.OamConfigEnum;
import com.cpop.system.framework.utils.DictUtils;
import com.cpop.oam.framework.utils.DictUtils;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.core.row.Db;

2
Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java
View File

@ -3,7 +3,7 @@ package com.cpop.oam.framework.config;
import com.cpop.core.utils.SpringUtils;
import com.cpop.oam.business.entity.Role;
import com.cpop.oam.business.service.RoleService;
import com.cpop.system.framework.enums.InitRoleEnum;
import com.cpop.oam.framework.enums.InitRoleEnum;
import jakarta.annotation.PostConstruct;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

2
Cpop-System/src/main/java/com/cpop/system/framework/config/SaTokenConfigure.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/config/SaTokenConfigure.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.framework.config;
package com.cpop.oam.framework.config;
import cn.dev33.satoken.interceptor.SaInterceptor;
import cn.dev33.satoken.jwt.StpLogicJwtForSimple;

2
Cpop-System/src/main/java/com/cpop/system/framework/config/tencentCos/TencentCosProperties.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/config/tencentCos/TencentCosProperties.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.framework.config.tencentCos;
package com.cpop.oam.framework.config.tencentCos;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
Cpop-System/src/main/java/com/cpop/system/framework/enums/InitRoleEnum.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/InitRoleEnum.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.framework.enums;
package com.cpop.oam.framework.enums;
import com.cpop.core.base.enums.UserType;
import lombok.Getter;

2
Cpop-System/src/main/java/com/cpop/system/framework/enums/OrderSource.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/enums/OrderSource.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.framework.enums;
package com.cpop.oam.framework.enums;
import lombok.Getter;

6
Cpop-System/src/main/java/com/cpop/system/framework/handler/TencentCosHandler.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/handler/tencentCos/TencentCosHandler.java
View File

@ -1,11 +1,11 @@
package com.cpop.system.framework.handler;
package com.cpop.oam.framework.handler.tencentCos;
import com.alibaba.fastjson2.JSONObject;
import com.cpop.core.base.exception.UtilException;
import com.cpop.core.utils.file.FileTypeUtils;
import com.cpop.core.utils.uuid.IdUtils;
import com.cpop.system.business.dto.BizLicenseOcrDto;
import com.cpop.system.framework.config.tencentCos.TencentCosProperties;
import com.cpop.oam.business.dto.BizLicenseOcrDto;
import com.cpop.oam.framework.config.tencentCos.TencentCosProperties;
import com.qcloud.cos.COSClient;
import com.qcloud.cos.ClientConfig;
import com.qcloud.cos.auth.BasicCOSCredentials;

4
Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java → Cpop-Oam/src/main/java/com/cpop/oam/framework/utils/DictUtils.java
View File

@ -1,4 +1,4 @@
package com.cpop.system.framework.utils;
package com.cpop.oam.framework.utils;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.fastjson.JSONArray;
@ -7,7 +7,7 @@ import com.cpop.core.constant.Constants;
import com.cpop.core.service.RedisService;
import com.cpop.core.utils.SpringUtils;
import com.cpop.core.utils.StringUtils;
import com.cpop.system.business.entity.DictData;
import com.cpop.oam.business.entity.DictData;
import java.util.Collection;
import java.util.Comparator;

14
Cpop-System/src/main/java/com/cpop/system/framework/constant/SystemRedisKey.java
View File

@ -1,14 +0,0 @@
package com.cpop.system.framework.constant;
/**
* @author DB
* @version 1.0.0
* @since 2024-01-11 15:33
*/
public interface SystemRedisKey {
/**
* 校区到期日期
*/
String STORE_SIGN_EXPIRE_DATE = "oam:storeSign:expireDate:";
}