oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 添加 DeletableDO

Browse Source 
- 修改 DO extends
This commit is contained in:
sin
2019-03-22 22:22:33 +08:00
parent f4c7f65cb8
commit cc223fa2b3
41 changed files with 176 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java
View File

@@ -1,13 +1,13 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
/**
* 管理员访问日志 DO
*/
public class AdminAccessLogDO extends BaseDO {
public class AdminAccessLogDO extends DeletableDO {
/**
* 编号

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java
View File

@@ -1,11 +1,11 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* 管理员实体
*/
public class AdminDO extends BaseDO {
public class AdminDO extends DeletableDO {
/**
* 账号状态 - 开启

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java
View File

@@ -1,11 +1,11 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* {@link AdminDO} 和 {@link RoleDO} 的关联表
*/
public class AdminRoleDO extends BaseDO {
public class AdminRoleDO extends DeletableDO {
/**
* 编号

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* 数据字典
@@ -11,7 +11,7 @@ import cn.iocoder.common.framework.dataobject.BaseDO;
* value：1 男
* value：2 女
*/
public class DataDictDO extends BaseDO {
public class DataDictDO extends DeletableDO {
/**
* 编号

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java
View File

@@ -1,13 +1,13 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import java.util.Date;
/**
* 资源实体
*/
public class ResourceDO extends BaseDO {
public class ResourceDO extends DeletableDO {
/**
* 资源类型 - 菜单

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java
View File

@@ -1,11 +1,11 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* 角色实体
*/
public class RoleDO extends BaseDO {
public class RoleDO extends DeletableDO {
/**
* 角色编号

4
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java
View File

@@ -1,11 +1,11 @@
package cn.iocoder.mall.admin.dataobject;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
/**
* {@link RoleDO} 和 {@link ResourceDO} 的关联表
*/
public class RoleResourceDO extends BaseDO {
public class RoleResourceDO extends DeletableDO {
/**
* 编号

10
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/AdminServiceImpl.java
View File

@@ -1,7 +1,7 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.admin.api.AdminService;
@@ -88,7 +88,8 @@ public class AdminServiceImpl implements AdminService {
AdminDO admin = AdminConvert.INSTANCE.convert(adminAddDTO)
.setPassword(encodePassword(adminAddDTO.getPassword())) // 加密密码
.setStatus(AdminDO.STATUS_ENABLE);
admin.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
admin.setCreateTime(new Date());
admin.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
adminMapper.insert(admin);
// TODO 插入操作日志
// 返回成功
@@ -159,7 +160,7 @@ public class AdminServiceImpl implements AdminService {
}
// 标记删除 AdminDO
AdminDO updateAdmin = new AdminDO().setId(updateAdminId);
updateAdmin.setDeleted(BaseDO.DELETED_YES);
updateAdmin.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
adminMapper.update(updateAdmin);
// 标记删除 AdminRole
adminRoleMapper.updateToDeletedByAdminId(updateAdminId);
@@ -188,7 +189,8 @@ public class AdminServiceImpl implements AdminService {
if (!roleIds.isEmpty()) {
List<AdminRoleDO> adminRoleDOs = roleIds.stream().map(roleId -> {
AdminRoleDO roleResource = new AdminRoleDO().setAdminId(updateAdminId).setRoleId(roleId);
roleResource.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
roleResource.setCreateTime(new Date());
roleResource.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
return roleResource;
}).collect(Collectors.toList());
adminRoleMapper.insertList(adminRoleDOs);

7
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/DataDictServiceImpl.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.admin.api.DataDictService;
@@ -41,7 +41,8 @@ public class DataDictServiceImpl implements DataDictService {
}
// 保存到数据库
DataDictDO dataDict = DataDictConvert.INSTANCE.convert(dataDictAddDTO);
dataDict.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
dataDict.setCreateTime(new Date());
dataDict.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
dataDictMapper.insert(dataDict);
// TODO 插入操作日志
// 返回成功
@@ -79,7 +80,7 @@ public class DataDictServiceImpl implements DataDictService {
}
// 更新到数据库
DataDictDO updateDataDict = new DataDictDO().setId(dataDictId);
updateDataDict.setDeleted(BaseDO.DELETED_YES);
updateDataDict.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
dataDictMapper.update(updateDataDict);
// TODO 插入操作日志
// 返回成功

7
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/ResourceServiceImpl.java
View File

@@ -1,7 +1,8 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.constant.SysErrorCodeEnum;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.admin.api.ResourceService;
@@ -75,7 +76,7 @@ public class ResourceServiceImpl implements ResourceService {
resource.setHandler("/" + resource.getHandler());
}
resource.setCreateTime(new Date());
resource.setDeleted(BaseDO.DELETED_NO);
resource.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
resourceMapper.insert(resource);
// TODO 操作日志
// 返回成功
@@ -129,7 +130,7 @@ public class ResourceServiceImpl implements ResourceService {
}
// 更新到数据库
ResourceDO resource = new ResourceDO().setId(resourceId);
resource.setDeleted(BaseDO.DELETED_YES);
resource.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
resourceMapper.update(resource);
// 删除资源关联表
roleResourceMapper.updateToDeletedByResourceId(resourceId);

11
admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/service/RoleServiceImpl.java
View File

@@ -1,6 +1,7 @@
package cn.iocoder.mall.admin.service;
import cn.iocoder.common.framework.dataobject.BaseDO;
import cn.iocoder.common.framework.constant.DeleteStatusEnum;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import cn.iocoder.common.framework.util.CollectionUtil;
import cn.iocoder.common.framework.util.ServiceExceptionUtil;
import cn.iocoder.common.framework.vo.CommonResult;
@@ -80,7 +81,8 @@ public class RoleServiceImpl implements RoleService {
// TODO 芋艿，角色名是否要唯一呢？貌似一般系统都是允许的。
// 保存到数据库
RoleDO role = RoleConvert.INSTANCE.convert(roleAddDTO);
role.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
role.setCreateTime(new Date());
role.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
roleMapper.insert(role);
// TODO 插入操作日志
// 返回成功
@@ -111,7 +113,7 @@ public class RoleServiceImpl implements RoleService {
}
// 更新到数据库，标记删除
RoleDO roleDO = new RoleDO().setId(roleId);
roleDO.setDeleted(RoleDO.DELETED_YES);
roleDO.setDeleted(DeleteStatusEnum.DELETE_YES.getValue());
roleMapper.update(roleDO);
// 标记删除 RoleResource
roleResourceMapper.updateToDeletedByRoleId(roleId);
@@ -141,7 +143,8 @@ public class RoleServiceImpl implements RoleService {
if (!resourceIds.isEmpty()) {
List<RoleResourceDO> roleResources = resourceIds.stream().map(resourceId -> {
RoleResourceDO roleResource = new RoleResourceDO().setRoleId(roleId).setResourceId(resourceId);
roleResource.setCreateTime(new Date()).setDeleted(BaseDO.DELETED_NO);
roleResource.setCreateTime(new Date());
roleResource.setDeleted(DeleteStatusEnum.DELETE_NO.getValue());
return roleResource;
}).collect(Collectors.toList());
roleResourceMapper.insertList(roleResources);