diff --git a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OperationLogEnum.java b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OperationLogEnum.java index de9f053..58af724 100644 --- a/Cpop-Core/src/main/java/com/cpop/core/base/enums/OperationLogEnum.java +++ b/Cpop-Core/src/main/java/com/cpop/core/base/enums/OperationLogEnum.java @@ -17,66 +17,7 @@ public enum OperationLogEnum { * 系统用户退出登录 */ SYSTEM_LOGOUT(1, "i18n_operationLog_systemLogout", "SystemLoginModel", 6, 4), - /** - * 更新系统配置 - */ - UPDATE_OAM_CONFIG(2, "i18n_operationLog_systemLogout", "SystemLoginModel", 5, 3), - //10-15 OAM菜单管理 - /** - * 新增OAM菜单 - */ - INSERT_OAM_MENU(10, "i18n_operationLog_insertOamMenu", "OamMenuModel", 5, 3), - /** - * 修改OAM菜单 - */ - UPDATE_OAM_MENU(11, "i18n_operationLog_updateOamMenu", "OamMenuModel", 4, 3), - /** - * 删除OAM菜单 - */ - REMOVE_OAM_MENU(12, "i18n_operationLog_removeOamMenu", "OamMenuModel", 4, 2), - //16-20 角色管理 - /** - * 新增系统角色 - */ - INSERT_OAM_ROLE(16, "i18n_operationLog_insertOamRole", "OamRoleModel", 5, 3), - /** - * 修改系统角色 - */ - UPDATE_OAM_ROLE(17, "i18n_operationLog_updateOamRole", "OamRoleModel", 4, 3), - /** - * 删除系统角色 - */ - REMOVE_OAM_ROLE(18, "i18n_operationLog_removeOamRole", "OamRoleModel", 4, 2), - //21-25 部门管理 - /** - * 新增系统部门 - */ - INSERT_OAM_DEPT(21, "i18n_operationLog_insertOamDept", "OamDeptModel", 5, 3), - /** - * 修改系统部门 - */ - UPDATE_OAM_DEPT(22, "i18n_operationLog_updateOamDept", "OamDeptModel", 4, 3), - /** - * 删除系统部门 - */ - REMOVE_OAM_DEPT(23, "i18n_operationLog_removeOamDept", "OamDeptModel", 4, 2), - //26-30 系统员工管理 - /** - * 新增员工 - */ - INSERT_OAM_STAFF(26, "i18n_operationLog_insertOamStaff", "OamStaffModel", 6, 4), - /** - * 修改系统用户 - */ - UPDATE_OAM_STAFF(27, "i18n_operationLog_updateOamStaff", "OamStaffModel", 6, 4), - /** - * 删除系统用户 - */ - REMOVE_OAM_STAFF(28, "i18n_operationLog_removeOamStaff", "OamStaffModel", 5, 3), - /** - * 修改系统用户密码 - */ - MODIFY_OAM_STAFF_PASSWORD(29, "i18n_operationLog_updateOamStaffPassword", "OamStaffModel", 6, 4), + ; /** diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataBo.java similarity index 98% rename from Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataBo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataBo.java index 3e50640..de6e5b0 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataBo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.bo; +package com.cpop.oam.business.bo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataPageBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataPageBo.java similarity index 94% rename from Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataPageBo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataPageBo.java index 85b11fd..a029e59 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictDataPageBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictDataPageBo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.bo; +package com.cpop.oam.business.bo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictTypeBo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictTypeBo.java similarity index 97% rename from Cpop-System/src/main/java/com/cpop/system/business/bo/DictTypeBo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictTypeBo.java index 603b414..77c990a 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/bo/DictTypeBo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/bo/DictTypeBo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.bo; +package com.cpop.oam.business.bo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageClueController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageClueController.java index 6b4ca90..0fde2be 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageClueController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageClueController.java @@ -9,8 +9,8 @@ import com.cpop.oam.business.service.ClueRecordService; import com.cpop.oam.business.service.ClueService; import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.vo.*; -import com.cpop.system.business.entity.DictData; -import com.cpop.system.business.service.DictDataService; +import com.cpop.oam.business.entity.DictData; +import com.cpop.oam.business.service.DictDataService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictDataController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictDataController.java similarity index 90% rename from Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictDataController.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictDataController.java index d04267e..38c66ad 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictDataController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictDataController.java @@ -1,12 +1,12 @@ -package com.cpop.system.business.controller.backstage; +package com.cpop.oam.business.controller.backstage; import com.cpop.core.base.entity.R; import com.cpop.core.utils.bean.BeanUtils; -import com.cpop.system.business.bo.DictDataBo; -import com.cpop.system.business.bo.DictDataPageBo; -import com.cpop.system.business.vo.DictDataListVo; -import com.cpop.system.business.vo.DictDataPageVo; -import com.cpop.system.business.vo.DictDataVo; +import com.cpop.oam.business.bo.DictDataBo; +import com.cpop.oam.business.bo.DictDataPageBo; +import com.cpop.oam.business.vo.DictDataListVo; +import com.cpop.oam.business.vo.DictDataPageVo; +import com.cpop.oam.business.vo.DictDataVo; import com.mybatisflex.core.paginate.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; -import com.cpop.system.business.entity.DictData; -import com.cpop.system.business.service.DictDataService; +import com.cpop.oam.business.entity.DictData; +import com.cpop.oam.business.service.DictDataService; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictTypeController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java similarity index 94% rename from Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictTypeController.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java index 834eb62..6842f3e 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageDictTypeController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageDictTypeController.java @@ -1,13 +1,13 @@ -package com.cpop.system.business.controller.backstage; +package com.cpop.oam.business.controller.backstage; import cn.dev33.satoken.stp.StpUtil; import com.cpop.core.base.entity.R; import com.cpop.core.base.enums.UserType; import com.cpop.core.base.exception.ServiceException; import com.cpop.core.utils.bean.BeanUtils; -import com.cpop.system.business.bo.DictTypeBo; -import com.cpop.system.business.vo.DictTypePageVo; -import com.cpop.system.business.vo.DictTypeVo; +import com.cpop.oam.business.bo.DictTypeBo; +import com.cpop.oam.business.vo.DictTypePageVo; +import com.cpop.oam.business.vo.DictTypeVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import io.swagger.v3.oas.annotations.Operation; @@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.beans.factory.annotation.Autowired; -import com.cpop.system.business.entity.DictType; -import com.cpop.system.business.service.DictTypeService; +import com.cpop.oam.business.entity.DictType; +import com.cpop.oam.business.service.DictTypeService; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageMenuController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageMenuController.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageMenuController.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageMenuController.java index bb37b8d..2298c4a 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageMenuController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageMenuController.java @@ -1,9 +1,9 @@ -package com.cpop.system.business.controller.backstage; +package com.cpop.oam.business.controller.backstage; import com.cpop.core.base.entity.R; import com.cpop.system.business.bo.MenuBo; import com.cpop.system.business.bo.MenuListBo; -import com.cpop.system.business.service.MenuService; +import com.cpop.oam.business.service.MenuService; import com.cpop.system.business.vo.MenuVo; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageRoleController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageRoleController.java similarity index 95% rename from Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageRoleController.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageRoleController.java index 819a1c8..7d0aa37 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageRoleController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageRoleController.java @@ -1,12 +1,12 @@ -package com.cpop.system.business.controller.backstage; +package com.cpop.oam.business.controller.backstage; import com.cpop.core.base.entity.R; import com.cpop.system.business.bo.MenuListBo; import com.cpop.system.business.bo.RoleBo; import com.cpop.system.business.bo.RolePageBo; import com.cpop.system.business.bo.RoleStatusBo; -import com.cpop.system.business.service.MenuService; -import com.cpop.system.business.service.RoleService; +import com.cpop.oam.business.service.MenuService; +import com.cpop.oam.business.service.RoleService; import com.cpop.system.business.vo.MenuVo; import com.cpop.system.business.vo.RolePageVo; import com.mybatisflex.core.paginate.Page; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java index fb89844..dff87cc 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageStaffController.java @@ -1,15 +1,13 @@ package com.cpop.oam.business.controller.backstage; import cn.dev33.satoken.stp.StpUtil; -import com.cpop.core.anno.OperationLog; import com.cpop.core.base.entity.R; -import com.cpop.core.base.enums.OperationLogEnum; import com.cpop.core.utils.SpringUtils; import com.cpop.oam.business.bo.*; 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.business.service.RoleService; import com.cpop.system.framework.enums.InitRoleEnum; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; @@ -21,7 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; +import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE; /** @@ -62,7 +60,6 @@ public class BackstageStaffController { * @param bo 请求参数 * @return com.jambox.core.base.R */ - @OperationLog(operationLogEnumType= OperationLogEnum.INSERT_OAM_STAFF) @Operation(summary = "新增员工") @PostMapping("/insertStaff") public R insertStaff(@RequestBody @Validated StaffBo bo) { @@ -77,7 +74,6 @@ public class BackstageStaffController { * @param bo 请求参数 * @return com.jambox.core.base.R */ - @OperationLog(operationLogEnumType= OperationLogEnum.UPDATE_OAM_STAFF) @Operation(summary = "修改员工") @PutMapping("/updateStaff") public R updateStaff(@RequestBody @Validated StaffBo bo) { @@ -92,7 +88,6 @@ public class BackstageStaffController { * @param id 主键 * @return com.jambox.core.base.R */ - @OperationLog(operationLogEnumType= OperationLogEnum.REMOVE_OAM_STAFF) @Operation(summary = "删除员工") @DeleteMapping("/removeStaffById/{id}") public R removeStaffById(@PathVariable String id) { @@ -178,7 +173,6 @@ public class BackstageStaffController { * @author DB * @since 2023/5/12 16:00 **/ - @OperationLog(operationLogEnumType= OperationLogEnum.MODIFY_OAM_STAFF_PASSWORD) @Operation(summary = "修改系统用户密码") @PutMapping("/modifyUserPassword") public R modifyUserPassword(@Validated @RequestBody ModifyUserPasswordBo bo) { diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java similarity index 90% rename from Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java index fac104a..2dbc438 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysCommonController.java @@ -1,11 +1,8 @@ -package com.cpop.system.business.controller.backstage; +package com.cpop.oam.business.controller.backstage; import com.cpop.core.base.entity.R; -import com.cpop.core.config.CpopConfig; -import com.cpop.core.config.ServerConfig; import com.cpop.core.utils.file.FileUploadUtils; import com.cpop.core.utils.file.FileUtils; -import com.cpop.system.business.service.StoreService; import com.cpop.system.business.vo.SysFileVo; import com.cpop.system.framework.handler.TencentCosHandler; import com.qcloud.cos.model.UploadResult; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysConfigController.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysConfigController.java index 1e4624a..781a1e2 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysConfigController.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/controller/backstage/BackstageSysConfigController.java @@ -44,7 +44,6 @@ public class BackstageSysConfigController { * @author DB * @since 2023/5/11 15:48 **/ - @OperationLog(operationLogEnumType = OperationLogEnum.UPDATE_OAM_CONFIG) @Operation(summary = "设置系统配置信息") @PutMapping("/setSysConfigInfo") public R setSysConfigInfo(@RequestBody @Validated SysConfigInfoBo bo) { diff --git a/Cpop-System/src/main/java/com/cpop/system/business/entity/DictData.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictData.java similarity index 97% rename from Cpop-System/src/main/java/com/cpop/system/business/entity/DictData.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictData.java index 18dbbfb..271177a 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/entity/DictData.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictData.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.entity; +package com.cpop.oam.business.entity; import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseInsertListener; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/entity/DictType.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictType.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/business/entity/DictType.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictType.java index 00868b1..2bbc6dc 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/entity/DictType.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/DictType.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.entity; +package com.cpop.oam.business.entity; import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseInsertListener; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/entity/Menu.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Menu.java similarity index 97% rename from Cpop-System/src/main/java/com/cpop/system/business/entity/Menu.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Menu.java index 1209305..35facd6 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/entity/Menu.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Menu.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.entity; +package com.cpop.oam.business.entity; import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseInsertListener; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/entity/Role.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Role.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/business/entity/Role.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Role.java index ab7403a..42d84e2 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/entity/Role.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/Role.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.entity; +package com.cpop.oam.business.entity; import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseInsertListener; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/entity/RoleMenu.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/RoleMenu.java similarity index 95% rename from Cpop-System/src/main/java/com/cpop/system/business/entity/RoleMenu.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/entity/RoleMenu.java index b507c3b..b836a65 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/entity/RoleMenu.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/entity/RoleMenu.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.entity; +package com.cpop.oam.business.entity; import com.cpop.core.base.entity.BaseEntity; import com.cpop.core.base.entity.BaseInsertListener; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/mapper/DictDataMapper.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictDataMapper.java similarity index 68% rename from Cpop-System/src/main/java/com/cpop/system/business/mapper/DictDataMapper.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictDataMapper.java index 98bd776..ef68988 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/mapper/DictDataMapper.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictDataMapper.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.mapper; +package com.cpop.oam.business.mapper; import com.mybatisflex.core.BaseMapper; -import com.cpop.system.business.entity.DictData; +import com.cpop.oam.business.entity.DictData; /** * 系统-字典数据表 映射层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/mapper/DictTypeMapper.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictTypeMapper.java similarity index 67% rename from Cpop-System/src/main/java/com/cpop/system/business/mapper/DictTypeMapper.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictTypeMapper.java index 0066794..a686491 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/mapper/DictTypeMapper.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/DictTypeMapper.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.mapper; +package com.cpop.oam.business.mapper; import com.mybatisflex.core.BaseMapper; -import com.cpop.system.business.entity.DictType; +import com.cpop.oam.business.entity.DictType; /** * 系统-字典表 映射层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/mapper/MenuMapper.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/MenuMapper.java similarity index 67% rename from Cpop-System/src/main/java/com/cpop/system/business/mapper/MenuMapper.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/MenuMapper.java index 1836b0a..f0d02ff 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/mapper/MenuMapper.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/MenuMapper.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.mapper; +package com.cpop.oam.business.mapper; import com.mybatisflex.core.BaseMapper; -import com.cpop.system.business.entity.Menu; +import com.cpop.oam.business.entity.Menu; /** * 系统菜单表 映射层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMapper.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMapper.java similarity index 67% rename from Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMapper.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMapper.java index 4c6451d..375609c 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMapper.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMapper.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.mapper; +package com.cpop.oam.business.mapper; import com.mybatisflex.core.BaseMapper; -import com.cpop.system.business.entity.Role; +import com.cpop.oam.business.entity.Role; /** * 系统角色表 映射层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMenuMapper.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMenuMapper.java similarity index 68% rename from Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMenuMapper.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMenuMapper.java index 5c4a431..fa27d8c 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/mapper/RoleMenuMapper.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/mapper/RoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.mapper; +package com.cpop.oam.business.mapper; import com.mybatisflex.core.BaseMapper; -import com.cpop.system.business.entity.RoleMenu; +import com.cpop.oam.business.entity.RoleMenu; /** * 系统-角色-菜单表 映射层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/DictDataService.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictDataService.java similarity index 80% rename from Cpop-System/src/main/java/com/cpop/system/business/service/DictDataService.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictDataService.java index 035c928..79728bd 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/DictDataService.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictDataService.java @@ -1,13 +1,12 @@ -package com.cpop.system.business.service; +package com.cpop.oam.business.service; -import com.cpop.system.business.bo.DictDataBo; -import com.cpop.system.business.bo.DictDataPageBo; -import com.cpop.system.business.vo.DictDataListVo; -import com.cpop.system.business.vo.DictDataPageVo; -import com.cpop.system.business.vo.DictDataVo; +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.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; -import com.cpop.system.business.entity.DictData; +import com.cpop.oam.business.entity.DictData; import java.util.List; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/DictTypeService.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictTypeService.java similarity index 85% rename from Cpop-System/src/main/java/com/cpop/system/business/service/DictTypeService.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictTypeService.java index db0e829..594bc5b 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/DictTypeService.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/DictTypeService.java @@ -1,10 +1,10 @@ -package com.cpop.system.business.service; +package com.cpop.oam.business.service; -import com.cpop.system.business.bo.DictTypeBo; -import com.cpop.system.business.vo.DictTypePageVo; +import com.cpop.oam.business.bo.DictTypeBo; +import com.cpop.oam.business.vo.DictTypePageVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; -import com.cpop.system.business.entity.DictType; +import com.cpop.oam.business.entity.DictType; /** * 系统-字典表 服务层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/MenuService.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java similarity index 93% rename from Cpop-System/src/main/java/com/cpop/system/business/service/MenuService.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java index 84f3ba0..1d389e4 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/MenuService.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/MenuService.java @@ -1,11 +1,11 @@ -package com.cpop.system.business.service; +package com.cpop.oam.business.service; import com.cpop.system.business.bo.MenuBo; import com.cpop.system.business.bo.MenuListBo; import com.cpop.system.business.vo.MenuRouteVo; import com.cpop.system.business.vo.MenuVo; import com.mybatisflex.core.service.IService; -import com.cpop.system.business.entity.Menu; +import com.cpop.oam.business.entity.Menu; import java.util.List; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/RoleMenuService.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleMenuService.java similarity index 68% rename from Cpop-System/src/main/java/com/cpop/system/business/service/RoleMenuService.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleMenuService.java index 24257a9..23e6ec7 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/RoleMenuService.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleMenuService.java @@ -1,7 +1,7 @@ -package com.cpop.system.business.service; +package com.cpop.oam.business.service; import com.mybatisflex.core.service.IService; -import com.cpop.system.business.entity.RoleMenu; +import com.cpop.oam.business.entity.RoleMenu; /** * 系统-角色-菜单表 服务层。 diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/RoleService.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleService.java similarity index 93% rename from Cpop-System/src/main/java/com/cpop/system/business/service/RoleService.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleService.java index 7a29688..88b96d0 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/RoleService.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/RoleService.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.service; +package com.cpop.oam.business.service; import com.cpop.system.business.bo.RoleBo; import com.cpop.system.business.bo.RolePageBo; @@ -6,7 +6,7 @@ import com.cpop.system.business.bo.RoleStatusBo; import com.cpop.system.business.vo.RolePageVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; -import com.cpop.system.business.entity.Role; +import com.cpop.oam.business.entity.Role; /** * 系统角色表 服务层。 diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/ClueServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/ClueServiceImpl.java index 67d1181..25fc6c8 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/ClueServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/ClueServiceImpl.java @@ -19,9 +19,9 @@ import com.cpop.oam.business.vo.CluePutOffVo; import com.cpop.oam.business.vo.ClueUpdateVo; import com.cpop.oam.business.vo.PersonSignGoalVo; import com.cpop.oam.framework.constant.OamRedisConstant; -import com.cpop.system.business.entity.DictData; +import com.cpop.oam.business.entity.DictData; import com.cpop.system.business.entity.Store; -import com.cpop.system.business.service.DictDataService; +import com.cpop.oam.business.service.DictDataService; import com.cpop.system.business.service.StoreService; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryOrderBy; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DeptServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DeptServiceImpl.java index 714ad9c..a4a461f 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DeptServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DeptServiceImpl.java @@ -1,10 +1,9 @@ package com.cpop.oam.business.service.impl; +import com.cpop.core.base.exception.ServiceException; +import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.StringUtils; import com.cpop.core.utils.bean.BeanUtils; -import com.cpop.core.base.exception.ServiceException; -import com.cpop.core.utils.MessageUtils; -import com.cpop.core.utils.SpringUtils; import com.cpop.oam.business.bo.DeptBo; import com.cpop.oam.business.bo.DeptListBo; import com.cpop.oam.business.entity.Dept; @@ -160,13 +159,13 @@ public class DeptServiceImpl extends ServiceImpl implements De List deptIds = filterSonDept(list, id); //删除部门，首先要查询员工 if (SpringUtils.getBean(StaffMidDeptService.class).count(QueryWrapper.create().where(STAFF_MID_DEPT.DEPT_ID.in(deptIds))) > 0) { - throw new ServiceException(MessageUtils.message("i18n_alert_peopleUnderTheDepartmentError")); + throw new ServiceException("当前部门下有人员，不允许删除部门!"); } else { //当部门人员及其子部门人员为空时，才允许删除部门 this.removeByIds(deptIds); } }else { - throw new ServiceException(MessageUtils.message("i18n_alert_departmentNotDeactivatedError")); + throw new ServiceException("当前部门未停用，不允许删除部门!"); } } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictDataServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java similarity index 92% rename from Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictDataServiceImpl.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java index 00302e6..bb52d33 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictDataServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictDataServiceImpl.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.service.impl; +package com.cpop.oam.business.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.cpop.core.base.entity.PageDomain; @@ -6,17 +6,17 @@ import com.cpop.core.base.enums.UserType; import com.cpop.core.utils.SqlUtils; import com.cpop.core.utils.StringUtils; import com.cpop.core.utils.bean.BeanUtils; -import com.cpop.system.business.bo.DictDataBo; -import com.cpop.system.business.bo.DictDataPageBo; -import com.cpop.system.business.vo.DictDataPageVo; -import com.cpop.system.business.vo.DictDataVo; +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.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.cpop.system.business.entity.DictData; -import com.cpop.system.business.mapper.DictDataMapper; -import com.cpop.system.business.service.DictDataService; +import com.cpop.oam.business.entity.DictData; +import com.cpop.oam.business.mapper.DictDataMapper; +import com.cpop.oam.business.service.DictDataService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictTypeServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java similarity index 90% rename from Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictTypeServiceImpl.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java index 683e3f6..5960d07 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/DictTypeServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/DictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.service.impl; +package com.cpop.oam.business.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.cpop.core.utils.StringUtils; @@ -6,17 +6,17 @@ import com.cpop.core.base.entity.PageDomain; import com.cpop.core.base.exception.ServiceException; import com.cpop.core.utils.SpringUtils; import com.cpop.core.utils.SqlUtils; -import com.cpop.system.business.bo.DictTypeBo; -import com.cpop.system.business.entity.DictData; -import com.cpop.system.business.service.DictDataService; -import com.cpop.system.business.vo.DictTypePageVo; +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.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.cpop.system.business.entity.DictType; -import com.cpop.system.business.mapper.DictTypeMapper; -import com.cpop.system.business.service.DictTypeService; +import com.cpop.oam.business.entity.DictType; +import com.cpop.oam.business.mapper.DictTypeMapper; +import com.cpop.oam.business.service.DictTypeService; import org.springframework.stereotype.Service; import java.util.Comparator; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java index 2ee2f07..25a2a9a 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/LoginServiceImpl.java @@ -16,8 +16,8 @@ import com.cpop.oam.business.entity.Staff; import com.cpop.oam.business.service.LoginService; import com.cpop.oam.business.service.StaffService; import com.cpop.oam.business.vo.loginInfo.SysStaffLoginInfo; -import com.cpop.system.business.entity.Menu; -import com.cpop.system.business.service.MenuService; +import com.cpop.oam.business.entity.Menu; +import com.cpop.oam.business.service.MenuService; import com.cpop.system.business.vo.LoginUserInfoVo; import com.cpop.system.business.vo.MenuRouteVo; import org.apache.commons.lang3.StringUtils; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/MenuServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java similarity index 98% rename from Cpop-System/src/main/java/com/cpop/system/business/service/impl/MenuServiceImpl.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java index 062bc9f..116147c 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/MenuServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/MenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.service.impl; +package com.cpop.oam.business.service.impl; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; @@ -9,9 +9,9 @@ import com.cpop.core.utils.StringUtils; import com.cpop.core.utils.bean.BeanUtils; import com.cpop.system.business.bo.MenuBo; import com.cpop.system.business.bo.MenuListBo; -import com.cpop.system.business.entity.Menu; -import com.cpop.system.business.mapper.MenuMapper; -import com.cpop.system.business.service.MenuService; +import com.cpop.oam.business.entity.Menu; +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; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleMenuServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleMenuServiceImpl.java similarity index 61% rename from Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleMenuServiceImpl.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleMenuServiceImpl.java index bc64115..42403ab 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleMenuServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleMenuServiceImpl.java @@ -1,9 +1,9 @@ -package com.cpop.system.business.service.impl; +package com.cpop.oam.business.service.impl; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.cpop.system.business.entity.RoleMenu; -import com.cpop.system.business.mapper.RoleMenuMapper; -import com.cpop.system.business.service.RoleMenuService; +import com.cpop.oam.business.entity.RoleMenu; +import com.cpop.oam.business.mapper.RoleMenuMapper; +import com.cpop.oam.business.service.RoleMenuService; import org.springframework.stereotype.Service; /** diff --git a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java similarity index 94% rename from Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleServiceImpl.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java index b9620dc..4f74c79 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/service/impl/RoleServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/RoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.service.impl; +package com.cpop.oam.business.service.impl; import cn.dev33.satoken.stp.StpUtil; import com.cpop.core.base.entity.PageDomain; @@ -11,15 +11,15 @@ import com.cpop.core.utils.SqlUtils; import com.cpop.system.business.bo.RoleBo; import com.cpop.system.business.bo.RolePageBo; import com.cpop.system.business.bo.RoleStatusBo; -import com.cpop.system.business.entity.RoleMenu; -import com.cpop.system.business.service.RoleMenuService; +import com.cpop.oam.business.entity.RoleMenu; +import com.cpop.oam.business.service.RoleMenuService; import com.cpop.system.business.vo.RolePageVo; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.cpop.system.business.entity.Role; -import com.cpop.system.business.mapper.RoleMapper; -import com.cpop.system.business.service.RoleService; +import com.cpop.oam.business.entity.Role; +import com.cpop.oam.business.mapper.RoleMapper; +import com.cpop.oam.business.service.RoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java index 997ccdc..450a30b 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/StaffServiceImpl.java @@ -43,9 +43,9 @@ import java.util.List; import static com.cpop.core.base.table.table.OperationLogTableDef.OPERATION_LOG; import static com.cpop.core.base.table.table.UserTableDef.USER; +import static com.cpop.oam.business.entity.table.RoleTableDef.ROLE; import static com.cpop.oam.business.entity.table.StaffMidDeptTableDef.STAFF_MID_DEPT; import static com.cpop.oam.business.entity.table.StaffTableDef.STAFF; -import static com.cpop.system.business.entity.table.RoleTableDef.ROLE; import static com.mybatisflex.core.query.QueryMethods.distinct; import static com.mybatisflex.core.query.QueryMethods.groupConcat; @@ -177,7 +177,7 @@ public class StaffServiceImpl extends ServiceImpl implements public void updateStaff(StaffBo bo) { //先修改系统用户信息 用户名-手机-邮箱都需要做唯一校验 if (validatedUserInfo(bo)) { - throw new ServiceException(MessageUtils.message("i18n_alert_userOrPhoneOrEmailIsExist")); + throw new ServiceException("用户名或手机号或邮箱已存在!"); } else { User user = BeanUtils.mapToClass(bo, User.class); user.setId(bo.getUserId()); @@ -242,10 +242,10 @@ public class StaffServiceImpl extends ServiceImpl implements if (StringUtils.isBlank(username)){ return; } - if (this.count(QueryWrapper.create() + if (SpringUtils.getBean(UserService.class).count(QueryWrapper.create() .where(USER.USERNAME.eq(username)) .and(USER.ID.ne(id))) > 0) { - throw new ServiceException(MessageUtils.message("i18n_alert_userIsExist")); + throw new ServiceException("用户已存在!"); } } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataListVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataListVo.java similarity index 97% rename from Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataListVo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataListVo.java index 5c92331..a49dab9 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataListVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataListVo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.vo; +package com.cpop.oam.business.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataPageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataPageVo.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataPageVo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataPageVo.java index 73a144f..6d485c4 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataPageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataPageVo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.vo; +package com.cpop.oam.business.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataVo.java similarity index 97% rename from Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataVo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataVo.java index 878c62f..5aad293 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictDataVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictDataVo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.vo; +package com.cpop.oam.business.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypePageVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypePageVo.java similarity index 96% rename from Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypePageVo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypePageVo.java index 325fbad..65d2e16 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypePageVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypePageVo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.vo; +package com.cpop.oam.business.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypeVo.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypeVo.java similarity index 95% rename from Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypeVo.java rename to Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypeVo.java index ede4d2f..b484e27 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/vo/DictTypeVo.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/vo/DictTypeVo.java @@ -1,4 +1,4 @@ -package com.cpop.system.business.vo; +package com.cpop.oam.business.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java index aea7843..1378e50 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/framework/config/InitConfig.java @@ -1,8 +1,8 @@ package com.cpop.oam.framework.config; import com.cpop.core.utils.SpringUtils; -import com.cpop.system.business.entity.Role; -import com.cpop.system.business.service.RoleService; +import com.cpop.oam.business.entity.Role; +import com.cpop.oam.business.service.RoleService; import com.cpop.system.framework.enums.InitRoleEnum; import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; diff --git a/Cpop-System/src/main/resources/mapper/DictDataMapper.xml b/Cpop-Oam/src/main/resources/DictDataMapper.xml similarity index 71% rename from Cpop-System/src/main/resources/mapper/DictDataMapper.xml rename to Cpop-Oam/src/main/resources/DictDataMapper.xml index 0eb0e35..2d25456 100644 --- a/Cpop-System/src/main/resources/mapper/DictDataMapper.xml +++ b/Cpop-Oam/src/main/resources/DictDataMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/Cpop-System/src/main/resources/mapper/DictTypeMapper.xml b/Cpop-Oam/src/main/resources/DictTypeMapper.xml similarity index 71% rename from Cpop-System/src/main/resources/mapper/DictTypeMapper.xml rename to Cpop-Oam/src/main/resources/DictTypeMapper.xml index 36be093..10cf02c 100644 --- a/Cpop-System/src/main/resources/mapper/DictTypeMapper.xml +++ b/Cpop-Oam/src/main/resources/DictTypeMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/Cpop-System/src/main/resources/mapper/MenuMapper.xml b/Cpop-Oam/src/main/resources/mapper/MenuMapper.xml similarity index 73% rename from Cpop-System/src/main/resources/mapper/MenuMapper.xml rename to Cpop-Oam/src/main/resources/mapper/MenuMapper.xml index d952451..6f1aadb 100644 --- a/Cpop-System/src/main/resources/mapper/MenuMapper.xml +++ b/Cpop-Oam/src/main/resources/mapper/MenuMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/Cpop-System/src/main/resources/mapper/RoleMapper.xml b/Cpop-Oam/src/main/resources/mapper/RoleMapper.xml similarity index 73% rename from Cpop-System/src/main/resources/mapper/RoleMapper.xml rename to Cpop-Oam/src/main/resources/mapper/RoleMapper.xml index f11a3d1..2a93395 100644 --- a/Cpop-System/src/main/resources/mapper/RoleMapper.xml +++ b/Cpop-Oam/src/main/resources/mapper/RoleMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/Cpop-System/src/main/resources/mapper/RoleMenuMapper.xml b/Cpop-Oam/src/main/resources/mapper/RoleMenuMapper.xml similarity index 71% rename from Cpop-System/src/main/resources/mapper/RoleMenuMapper.xml rename to Cpop-Oam/src/main/resources/mapper/RoleMenuMapper.xml index 5704ac0..30aafbd 100644 --- a/Cpop-System/src/main/resources/mapper/RoleMenuMapper.xml +++ b/Cpop-Oam/src/main/resources/mapper/RoleMenuMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java b/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java index 40876ba..d9b4a25 100644 --- a/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java +++ b/Cpop-System/src/main/java/com/cpop/system/framework/utils/DictUtils.java @@ -2,7 +2,6 @@ package com.cpop.system.framework.utils; import cn.dev33.satoken.stp.StpUtil; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson2.JSONObject; import com.cpop.core.base.enums.UserType; import com.cpop.core.constant.Constants; import com.cpop.core.service.RedisService;