Skip to content

G
gic-platform-auth
Commit a60a378f by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !28
parents 5af57a7b 03933e66
Showing with 763 additions and 475 deletions
gic-platform-auth-api/src/main/java/com/gic/auth/constant/AppMenuCodeConstants.java 0 → 100644
package com.gic.auth.constant;
/**
* 权限管理：应用code
* @ClassName: AppMenuCodeConstants

* @Description: 

* @author guojuxing

* @date 2020/10/19 3:31 PM

*/
public class AppMenuCodeConstants {
/**
* 商品应用菜单code
*/
public static final String GOODS_APP = "goods_app";
/**
* gic权限页面code
*/
public static final String GOODS_GIC = "goods";
}
gic-platform-auth-api/src/main/java/com/gic/auth/constant/MenuPlatformTypeEnum.java 0 → 100644
package com.gic.auth.constant;
/**
* 权限菜单平台类型
* @ClassName: MenuPlatformTypeEnum

* @Description: 

* @author guojuxing

* @date 2020/10/23 9:52 AM

*/
public enum MenuPlatformTypeEnum {
GIC(0, "gic"),
HAOBAN_PC(1, "好办后台"),
HAOBAN_APPLET(3, "好办小程序"),
HAOBAN_APP(2, "好办应用"),
HAOBAN_APPLET_APP(4, "好办小程序应用");
private Integer code;
private String message;
private MenuPlatformTypeEnum(Integer code, String message) {
this.code = code;
this.message = message;
}
public Integer getCode() {
return code;
}
public MenuPlatformTypeEnum setCode(Integer code) {
this.code = code;
return this;
}
public String getMessage() {
return message;
}
public MenuPlatformTypeEnum setMessage(String message) {
this.message = message;
return this;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupDTO.java
......@@ -47,9 +47,9 @@ public class AccountGroupDTO implements Serializable{
private Integer enterpriseId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 排序
......@@ -95,12 +95,13 @@ public class AccountGroupDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public AccountGroupDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getSort() {
......@@ -141,7 +142,7 @@ public class AccountGroupDTO implements Serializable{
"accountGroupId=" + accountGroupId +
", accountGroupName='" + accountGroupName + '\'' +
", enterpriseId=" + enterpriseId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", sort=" + sort +
", createTime=" + createTime +
", updateTime=" + updateTime +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/AccountGroupRelDTO.java
......@@ -34,9 +34,9 @@ public class AccountGroupRelDTO implements Serializable{
private Integer enterpriseId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 1:管理员 2:协作人
......@@ -86,14 +86,6 @@ public class AccountGroupRelDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getType() {
return type;
}
......@@ -118,6 +110,15 @@ public class AccountGroupRelDTO implements Serializable{
this.updateTime = updateTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public AccountGroupRelDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
public String toString() {
return "AccountGroupRelDTO{" +
......@@ -125,7 +126,7 @@ public class AccountGroupRelDTO implements Serializable{
", accountGroupId=" + accountGroupId +
", userId=" + userId +
", enterpriseId=" + enterpriseId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", type=" + type +
", createTime=" + createTime +
", updateTime=" + updateTime +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditedGroupUserRelDTO.java
......@@ -34,7 +34,7 @@ public class AuditedGroupUserRelDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -79,12 +79,13 @@ public class AuditedGroupUserRelDTO implements Serializable {
this.userId = userId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public AuditedGroupUserRelDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -118,7 +119,7 @@ public class AuditedGroupUserRelDTO implements Serializable {
", enterpriseId=" + enterpriseId +
", auditedGroupId=" + auditedGroupId +
", userId=" + userId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", auditedGroupIdList=" + auditedGroupIdList +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuditorAuditedGroupRelDTO.java
......@@ -35,7 +35,7 @@ public class AuditorAuditedGroupRelDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class AuditorAuditedGroupRelDTO implements Serializable {
this.auditedGroupId = auditedGroupId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public AuditorAuditedGroupRelDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -119,7 +120,7 @@ public class AuditorAuditedGroupRelDTO implements Serializable {
", enterpriseId=" + enterpriseId +
", auditorId=" + auditorId +
", auditedGroupId=" + auditedGroupId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", auditorIdList=" + auditorIdList +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/AuthCodeDTO.java
......@@ -35,9 +35,9 @@ public class AuthCodeDTO implements Serializable {
private Integer relationId;
/**
* 1有效 0失效
* 0有效 1失效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -77,12 +77,13 @@ public class AuthCodeDTO implements Serializable {
this.relationId = relationId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public AuthCodeDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getExpirationTime() {
......@@ -100,7 +101,7 @@ public class AuthCodeDTO implements Serializable {
", authCode='" + authCode + '\'' +
", enterpriseId=" + enterpriseId +
", relationId=" + relationId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", expirationTime=" + expirationTime +
'}';
}
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/BusinessFrontResDTO.java
......@@ -49,9 +49,9 @@ public class BusinessFrontResDTO implements Serializable{
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -119,12 +119,13 @@ public class BusinessFrontResDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public BusinessFrontResDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -153,7 +154,7 @@ public class BusinessFrontResDTO implements Serializable{
", pageName='" + pageName + '\'' +
", resourceDetail='" + resourceDetail + '\'' +
", enterpriseId=" + enterpriseId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorDTO.java
......@@ -83,9 +83,9 @@ public class CollaboratorDTO implements Serializable{
private String subAppIds;
/**
* 状态: 0:无效 1:youxiao
* 状态: 1:无效 0:youxiao
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -167,12 +167,13 @@ public class CollaboratorDTO implements Serializable{
this.subAppIds = subAppIds;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public CollaboratorDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -253,7 +254,7 @@ public class CollaboratorDTO implements Serializable{
", creator='" + creator + '\'' +
", resourceIds='" + resourceIds + '\'' +
", subAppIds='" + subAppIds + '\'' +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", subAppIdList=" + subAppIdList +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/CollaboratorListDTO.java
......@@ -59,6 +59,8 @@ public class CollaboratorListDTO implements Serializable{
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
*/
......@@ -137,6 +139,15 @@ public class CollaboratorListDTO implements Serializable{
}
public Integer getStatus() {
if (deleteFlag == null) {
return 0;
}
if (deleteFlag == 1) {
return 0;
}
if (deleteFlag == 0) {
return 1;
}
return status;
}
......@@ -152,6 +163,15 @@ public class CollaboratorListDTO implements Serializable{
this.createTime = createTime;
}
public Integer getDeleteFlag() {
return deleteFlag;
}
public CollaboratorListDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
public String toString() {
return "CollaboratorListDTO{" +
......@@ -165,6 +185,7 @@ public class CollaboratorListDTO implements Serializable{
", appName='" + appName + '\'' +
", creator='" + creator + '\'' +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
'}';
}
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuAuthDepartDTO.java
......@@ -43,9 +43,9 @@ public class MenuAuthDepartDTO implements Serializable{
private String positionName;
/**
* 1:有效 0:无效
* 0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -112,12 +112,12 @@ public class MenuAuthDepartDTO implements Serializable{
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public MenuAuthDepartDTO setStatus(Integer status) {
this.status = status;
public MenuAuthDepartDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......@@ -148,7 +148,7 @@ public class MenuAuthDepartDTO implements Serializable{
", departName='" + departName + '\'' +
", positionCode='" + positionCode + '\'' +
", positionName='" + positionName + '\'' +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuDTO.java
......@@ -112,9 +112,9 @@ public class MenuDTO implements Serializable {
private Integer sort;
/**
* 0删除1有效
* 1删除0有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -254,12 +254,13 @@ public class MenuDTO implements Serializable {
this.sort = sort;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public MenuDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getLevel() {
......@@ -388,7 +389,7 @@ public class MenuDTO implements Serializable {
", target=" + target +
", iconUrl='" + iconUrl + '\'' +
", sort=" + sort +
", status=" + status +
", status=" + deleteFlag +
", level=" + level +
", isShow=" + isShow +
", menuCode='" + menuCode + '\'' +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuItemDTO.java
......@@ -29,9 +29,9 @@ public class MenuItemDTO implements Serializable{
private Integer itemId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -67,12 +67,13 @@ public class MenuItemDTO implements Serializable{
this.itemId = itemId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public MenuItemDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -97,7 +98,7 @@ public class MenuItemDTO implements Serializable{
"menuItemId=" + menuItemId +
", menuId=" + menuId +
", itemId=" + itemId +
", status=" + status +
", deleteFlag=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/MenuRoleDTO.java
......@@ -42,9 +42,9 @@ public class MenuRoleDTO implements Serializable{
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -88,12 +88,13 @@ public class MenuRoleDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public MenuRoleDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -119,7 +120,7 @@ public class MenuRoleDTO implements Serializable{
", menuId=" + menuId +
", roleId=" + roleId +
", enterpriseId=" + enterpriseId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/OperationUserDTO.java
......@@ -29,9 +29,9 @@ public class OperationUserDTO implements Serializable{
private String phoneNumber;
/**
* 状态，1有效，0无效
* 状态，0有效，1无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -77,12 +77,13 @@ public class OperationUserDTO implements Serializable{
this.phoneNumber = phoneNumber;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public OperationUserDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -123,7 +124,7 @@ public class OperationUserDTO implements Serializable{
"operationUserId=" + operationUserId +
", operationUserName='" + operationUserName + '\'' +
", phoneNumber='" + phoneNumber + '\'' +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", enterpriseId=" + enterpriseId +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/OrderAppResourceDTO.java
......@@ -44,7 +44,7 @@ public class OrderAppResourceDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getOrderAppResourceId() {
return orderAppResourceId;
......@@ -94,12 +94,13 @@ public class OrderAppResourceDTO implements Serializable {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public OrderAppResourceDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
@Override
......@@ -111,7 +112,7 @@ public class OrderAppResourceDTO implements Serializable {
", content='" + content + '\'' +
", createTime=" + createTime +
", updateTime=" + updateTime +
", status=" + status +
", status=" + deleteFlag +
'}';
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/dto/RoleDTO.java
......@@ -41,9 +41,9 @@ public class RoleDTO implements Serializable{
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -84,12 +84,13 @@ public class RoleDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public RoleDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -122,7 +123,7 @@ public class RoleDTO implements Serializable{
"roleId=" + roleId +
", roleName='" + roleName + '\'' +
", enterpriseId=" + enterpriseId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", menuIds='" + menuIds + '\'' +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/UnionEnterpriseDTO.java
......@@ -36,7 +36,7 @@ public class UnionEnterpriseDTO implements Serializable {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
* 授权状态,1授权中 2授权成功 3授权失败
......@@ -80,12 +80,13 @@ public class UnionEnterpriseDTO implements Serializable {
this.unionEnterpriseName = unionEnterpriseName;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public UnionEnterpriseDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getAuthorizationStatus() {
......@@ -185,7 +186,7 @@ public class UnionEnterpriseDTO implements Serializable {
", unionCompanyName='" + unionCompanyName + '\'' +
", unionManagerName='" + unionManagerName + '\'' +
", unionManagerPhone='" + unionManagerPhone + '\'' +
", status=" + status +
", status=" + deleteFlag +
", authorizationStatus=" + authorizationStatus +
", authorizationTime=" + authorizationTime +
", enterpriseId=" + enterpriseId +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserDTO.java
......@@ -68,9 +68,9 @@ public class UserDTO implements Serializable{
private Integer superAdmin;
/**
* 状态，1有效，0无效
* 状态，0有效，1无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -140,6 +140,11 @@ public class UserDTO implements Serializable{
*/
private String accountGroupIds;
/***
* 营销是否触达 1是0否
*/
private Integer markingFlag;
public Integer getUserId() {
return userId;
}
......@@ -180,12 +185,13 @@ public class UserDTO implements Serializable{
this.superAdmin = superAdmin;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public UserDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -320,6 +326,14 @@ public class UserDTO implements Serializable{
return this;
}
public Integer getMarkingFlag() {
return markingFlag;
}
public void setMarkingFlag(Integer markingFlag) {
this.markingFlag = markingFlag;
}
@Override
public String toString() {
return "UserDTO{" +
......@@ -330,7 +344,7 @@ public class UserDTO implements Serializable{
", passwordType=" + passwordType +
", confirmPassword='" + confirmPassword + '\'' +
", superAdmin=" + superAdmin +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
", enterpriseId=" + enterpriseId +
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserResourceDTO.java
......@@ -43,9 +43,9 @@ public class UserResourceDTO implements Serializable{
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -89,12 +89,13 @@ public class UserResourceDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public UserResourceDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -120,7 +121,7 @@ public class UserResourceDTO implements Serializable{
", resourceId=" + resourceId +
", userId=" + userId +
", enterpriseId=" + enterpriseId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/dto/UserRoleDTO.java
......@@ -42,9 +42,9 @@ public class UserRoleDTO implements Serializable{
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -88,12 +88,13 @@ public class UserRoleDTO implements Serializable{
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public UserRoleDTO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -119,7 +120,7 @@ public class UserRoleDTO implements Serializable{
", roleId=" + roleId +
", userId=" + userId +
", enterpriseId=" + enterpriseId +
", status=" + status +
", status=" + deleteFlag +
", createTime=" + createTime +
", updateTime=" + updateTime +
'}';
......
gic-platform-auth-api/src/main/java/com/gic/auth/qo/CollaboratorListQO.java
......@@ -23,6 +23,8 @@ public class CollaboratorListQO extends PageQO{
private Integer status;
private Integer deleteFlag;
private Integer enterpriseId;
private Integer accountGroupId;
......@@ -76,4 +78,19 @@ public class CollaboratorListQO extends PageQO{
public void setCollaboratorIdList(List<Integer> collaboratorIdList) {
this.collaboratorIdList = collaboratorIdList;
}
public Integer getDeleteFlag() {
if (status != null) {
if (status == 1) {
return 0;
}
return 1;
}
return deleteFlag;
}
public CollaboratorListQO setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/qo/MenuListQO.java
......@@ -23,6 +23,7 @@ public class MenuListQO extends PageQO{
* 0:页面 1：权限项 2：操作项
*/
private Integer menuType;
private List<Integer> menuTypeList;
/**
* 层级
*/
......@@ -136,4 +137,13 @@ public class MenuListQO extends PageQO{
this.platformType = platformType;
return this;
}
public List<Integer> getMenuTypeList() {
return menuTypeList;
}
public MenuListQO setMenuTypeList(List<Integer> menuTypeList) {
this.menuTypeList = menuTypeList;
return this;
}
}
gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java
......@@ -55,7 +55,7 @@ public interface MenuApiService {
ServiceResponse<Set<String>> getAppIdSetByUserId(Integer userId);
/**
* 查询用户拥有的所有菜单路由权限，用于登录用户session用
* 查询用户没有权限的操作项（接口），用于登录用户session用
* @Title: listUserMenu

* @Description:

 * @author guojuxing
......@@ -194,6 +194,15 @@ public interface MenuApiService {
ServiceResponse<List<MenuDTO>> getAllMenuNotTree(String versionCode);
/**
* 查询gic平台所有的菜单数据，menu_type = 0 gic平台的菜单数据塞本地缓存
* @Title: setAllMenuToLocaleCache

* @Description:

* @author guojuxing 

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>


*/
ServiceResponse<List<MenuDTO>> getAllMenu();
/**
* 运维处使用
* @param enterpriseId
* @return
......@@ -473,6 +482,14 @@ public interface MenuApiService {
ServiceResponse<MenuDTO> getMenuByMenuCode(String menuCode);
/**
* 获取已经购买的应用
* @param menuCode 权限菜单code
* @param enterpriseId
* @return
*/
ServiceResponse<MenuDTO> getHasBuyAppByMenuCode(String menuCode, Integer enterpriseId);
/**
* 同步测试菜单数据到生产
* @Title: syncProductMenu

* @Description:
......@@ -481,7 +498,26 @@ public interface MenuApiService {
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> syncProductMenu(String menuCode);
/**
* gic菜单转到某一个应用下面
* @Title: switchGicMenuToApp

* @Description:

* @author guojuxing
* @param gicMenuCode
* @param appMenuCode 

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> switchGicMenuToApp(String gicMenuCode, String appMenuCode);
/**
* app菜单转到gic下面
* @param gicMenuCode
* @param appMenuCode
* @return
*/
ServiceResponse<Void> switchAppMenuToGic(String gicMenuCode, String appMenuCode);
/**
* test
* @Title: test
......
gic-platform-auth-service/src/main/java/com/gic/auth/config/ParamAop.java 0 → 100644
package com.gic.auth.config;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.context.annotation.Configuration;
/**
* 采集GIC系统操作日志
*
* @author leeon
* @date 2019年6月28日
*/
@Aspect
@Configuration
public class ParamAop {
private Logger logger = LogManager.getLogger(ParamAop.class);
/**
* 环绕通知
*
* @param joinPoint
* @return
* @throws Throwable
*/
@Around(value = "execution(* com.gic.*.service..*(..))")
public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
try {
// 当前方法
String currentMethodName = getMethodName(joinPoint);
// 当前方法参数列表
Object[] args = joinPoint.getArgs();
logger.info("请求方法:{}, 参数:{}", currentMethodName, args);
// 执行当前方法
return joinPoint.proceed();
} catch (Throwable throwable) {
logger.warn("拦截器错误", throwable);
throw throwable;
}
}
/**
* 获取当前方法
*
* @param joinPoint
* @return
* @throws
*/
private String getMethodName(ProceedingJoinPoint joinPoint) throws NoSuchMethodException {
Signature signature = joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
Object target = joinPoint.getTarget();
return target.getClass().getName() + "." + methodSignature.getName();
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/constant/DeleteFlagConstants.java 0 → 100644
package com.gic.auth.constant;
/**
* 数据删除标志
* @ClassName: DeleteFlagConstants

* @Description: 

* @author guojuxing

* @date 2020/10/13 4:43 PM

*/
public class DeleteFlagConstants {
/**
* 数据正常状态
*/
public static final int NORMAL_STATUS = 0;
/**
* 数据删除状态
*/
public static final int DELETE_STATUS = 1;
}
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditedGroupMapper.java
......@@ -16,13 +16,7 @@ import java.util.List;
* @date 2020-09-10 9:38
*/
public interface TabAuditedGroupMapper {
/**
* 根据主键删除
*
* @param auditedGroupId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer auditedGroupId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditedGroupUserRelMapper.java
......@@ -16,13 +16,6 @@ import java.util.Map;
* @date 2020-09-10 9:38
*/
public interface TabAuditedGroupUserRelMapper {
/**
* 根据主键删除
*
* @param auditedGroupUserRelId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer auditedGroupUserRelId);
/**
* 插入一条记录
......@@ -133,4 +126,15 @@ public interface TabAuditedGroupUserRelMapper {
* @throws
*/
List<Integer> listAuditedGroupByUserId(@Param("enterpriseId") Integer enterpriseId, @Param("userId") Integer userId);
/**
* deleteByUserId
* @Title: deleteByUserId
* @Description:
* @author zhiwj
* @param userId
* @return void
* @throws
*/
void deleteByUserId(@Param("userId") Integer userId);
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorAuditedGroupRelMapper.java
......@@ -15,13 +15,6 @@ import java.util.Map;
* @date 2020-09-10 9:39
*/
public interface TabAuditorAuditedGroupRelMapper {
/**
* 根据主键删除
*
* @param auditorAuditedGroupRelId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer auditorAuditedGroupRelId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorMapper.java
......@@ -14,13 +14,7 @@ import org.apache.ibatis.annotations.Param;
* @date 2020-09-10 9:39
*/
public interface TabAuditorMapper {
/**
* 根据主键删除
*
* @param auditorId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer auditorId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabAuditorProjectItemRelMapper.java
......@@ -15,13 +15,7 @@ import java.util.Map;
* @date 2020-09-10 9:39
*/
public interface TabAuditorProjectItemRelMapper {
/**
* 根据主键删除
*
* @param auditorProjectItemRelId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer auditorProjectItemRelId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAccountGroupMapper.java
......@@ -13,13 +13,7 @@ import java.util.List;
* @date 2020-09-10 9:39
*/
public interface TabSysAccountGroupMapper {
/**
* 根据主键删除
*
* @param accountGroupId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer accountGroupId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAccountGroupRelMapper.java
......@@ -15,13 +15,6 @@ import java.util.List;
* @date 2020-09-10 9:39
*/
public interface TabSysAccountGroupRelMapper {
/**
* 根据主键删除
*
* @param accountGroupRelId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer accountGroupRelId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysAuthCodeMapper.java
......@@ -14,14 +14,6 @@ import java.util.List;
*/
public interface TabSysAuthCodeMapper {
/**
* 根据主键删除
*
* @param authCodeId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer authCodeId);
/**
* 插入一条记录
*
* @param record 实体对象
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysBusinessFrontResMapper.java
......@@ -13,13 +13,7 @@ import java.util.List;
* @date 2020-09-10 9:39
*/
public interface TabSysBusinessFrontResMapper {
/**
* 根据主键删除
*
* @param resourceId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer resourceId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorMapper.java
......@@ -15,13 +15,6 @@ import java.util.List;
* @date 2020-09-10 9:39
*/
public interface TabSysCollaboratorMapper {
/**
* 根据主键删除
*
* @param collaboratorId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer collaboratorId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysCollaboratorRoleRelMapper.java
......@@ -13,13 +13,7 @@ import java.util.List;
* @date 2020-09-10 9:40
*/
public interface TabSysCollaboratorRoleRelMapper {
/**
* 根据主键删除
*
* @param collaboratorRoleRelId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer collaboratorRoleRelId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuAuthDepartMapper.java
......@@ -14,13 +14,7 @@ import java.util.List;
* @date 2020-09-10 9:40
*/
public interface TabSysMenuAuthDepartMapper {
/**
* 根据主键删除
*
* @param menuDepartId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer menuDepartId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuItemMapper.java
......@@ -15,13 +15,7 @@ import java.util.List;
* @date 2020-09-10 9:40
*/
public interface TabSysMenuItemMapper {
/**
* 根据主键删除
*
* @param menuItemId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer menuItemId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuMapper.java
package com.gic.auth.dao.mapper;
import com.gic.auth.dto.AuthItemListDTO;
import com.gic.auth.dto.MenuDTO;
import com.gic.auth.entity.TabSysMenu;
import com.gic.auth.qo.MenuListQO;
import com.gic.auth.qo.MenuOperationItemListQO;
......@@ -16,13 +17,7 @@ import java.util.List;
* @date 2020-09-10 9:41
*/
public interface TabSysMenuMapper {
/**
* 根据主键删除
*
* @param menuId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer menuId);
/**
* 插入一条记录
......@@ -57,6 +52,16 @@ public interface TabSysMenuMapper {
int updateByPrimaryKeySelective(TabSysMenu record);
/**
* 更新好办小程序应用
* @Title: updatePageForHaobanApplet

* @Description:

* @author guojuxing
* @param record

* @return int


*/
int updatePageForHaobanApplet(TabSysMenu record);
/**
* 根据主键更新记录
*
* @param record 实体对象
......@@ -138,6 +143,26 @@ public interface TabSysMenuMapper {
List<TabSysMenu> listByParentMenuIdList(@Param("parentMenuIdList") List<Integer> parentMenuIdList);
/**
* gic菜单转应用菜单的时候，批量进行修改相关数据
* @Title: updateMenuTmp

* @Description:

* @author guojuxing
* @param menuIdList
* @param project
* @param parentId
* @param parentCode
* @param menuVersion
* @param menuVersionName

* @return void


*/
void updateMenuTmp(@Param("menuIdList") List<Integer> menuIdList,
@Param("project") String project,
@Param("parentId") Integer parentId,
@Param("parentCode") String parentCode,
@Param("menuVersion") String menuVersion,
@Param("menuVersionName") String menuVersionName);
/**
* selectByIdsAndOrderBy
* @Title: selectByIdsAndOrderBy
* @Description:
......@@ -266,9 +291,10 @@ public interface TabSysMenuMapper {
* @Description:

* @author guojuxing
* @param projectList

* @param platformTypeList
* @return void


*/
void deleteNotInApp(@Param("list") List<String> projectList);
void deleteNotInApp(@Param("list") List<String> projectList, @Param("platformTypeList") List<Integer> platformTypeList);
/**
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysMenuRoleMapper.java
......@@ -14,13 +14,7 @@ import java.util.List;
* @date 2020-09-10 9:41
*/
public interface TabSysMenuRoleMapper {
/**
* 根据主键删除
*
* @param menuRoleId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer menuRoleId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysOperationUserMapper.java
......@@ -11,13 +11,7 @@ import org.apache.ibatis.annotations.Param;
* @date 2020-09-10 9:41
*/
public interface TabSysOperationUserMapper {
/**
* 根据主键删除
*
* @param operationUserId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer operationUserId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysOrderAppResourceMapper.java
......@@ -12,13 +12,7 @@ import java.util.List;
* @date 2020-09-10 9:41
*/
public interface TabSysOrderAppResourceMapper {
/**
* 根据主键删除
*
* @param orderAppResourceId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer orderAppResourceId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysResourceMapper.java
......@@ -15,13 +15,6 @@ import java.util.List;
* @date 2020-09-10 9:41
*/
public interface TabSysResourceMapper {
/**
* 根据主键删除
*
* @param resourceId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer resourceId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysRoleMapper.java
......@@ -16,14 +16,6 @@ import java.util.List;
*/
public interface TabSysRoleMapper {
/**
* 根据主键删除
*
* @param roleId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer roleId);
/**
* 插入一条记录
*
* @param record 实体对象
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUnionEnterpriseMapper.java
......@@ -14,13 +14,7 @@ import java.util.List;
* @date 2020-09-10 9:42
*/
public interface TabSysUnionEnterpriseMapper {
/**
* 根据主键删除
*
* @param unionId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer unionId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUnionEnterpriseResourceMapper.java
......@@ -14,13 +14,6 @@ import java.util.List;
* @date 2020-09-10 9:42
*/
public interface TabSysUnionEnterpriseResourceMapper {
/**
* 根据主键删除
*
* @param unionResourceId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer unionResourceId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java
......@@ -15,13 +15,6 @@ import java.util.List;
* @date 2020-09-10 9:42
*/
public interface TabSysUserMapper {
/**
* 根据主键删除
*
* @param userId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer userId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserResourceMapper.java
......@@ -15,13 +15,7 @@ import java.util.Map;
* @date 2020-09-10 9:44
*/
public interface TabSysUserResourceMapper {
/**
* 根据主键删除
*
* @param userResourceId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer userResourceId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserRoleMapper.java
......@@ -12,13 +12,7 @@ import java.util.List;
* @date 2020-09-10 9:45
*/
public interface TabSysUserRoleMapper {
/**
* 根据主键删除
*
* @param userRoleId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer userRoleId);
/**
* 插入一条记录
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabAuditedGroup.java
......@@ -36,7 +36,7 @@ public class TabAuditedGroup {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabAuditedGroup {
this.allCheck = allCheck;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabAuditedGroup setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabAuditedGroupUserRel.java
......@@ -36,7 +36,7 @@ public class TabAuditedGroupUserRel {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabAuditedGroupUserRel {
this.userId = userId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabAuditedGroupUserRel setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabAuditor.java
......@@ -51,7 +51,7 @@ public class TabAuditor {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -119,12 +119,13 @@ public class TabAuditor {
this.isUse = isUse;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabAuditor setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabAuditorAuditedGroupRel.java
......@@ -36,7 +36,7 @@ public class TabAuditorAuditedGroupRel {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabAuditorAuditedGroupRel {
this.auditedGroupId = auditedGroupId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabAuditorAuditedGroupRel setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabAuditorProjectItemRel.java
......@@ -36,7 +36,7 @@ public class TabAuditorProjectItemRel {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabAuditorProjectItemRel {
this.projectItemId = projectItemId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabAuditorProjectItemRel setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysAccountGroup.java
......@@ -29,9 +29,9 @@ public class TabSysAccountGroup {
private Integer enterpriseId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 排序
......@@ -72,12 +72,13 @@ public class TabSysAccountGroup {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysAccountGroup setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getSort() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysAccountGroupRel.java
......@@ -34,9 +34,9 @@ public class TabSysAccountGroupRel {
private Integer enterpriseId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 1:管理员 2:协作人
......@@ -85,14 +85,6 @@ public class TabSysAccountGroupRel {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getType() {
return type;
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysAuthCode.java
......@@ -34,9 +34,9 @@ public class TabSysAuthCode {
private Integer relationId;
/**
* 1有效 0失效
* 0有效 1失效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -85,12 +85,13 @@ public class TabSysAuthCode {
this.relationId = relationId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysAuthCode setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysBusinessFrontRes.java
......@@ -49,9 +49,9 @@ public class TabSysBusinessFrontRes {
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -119,12 +119,13 @@ public class TabSysBusinessFrontRes {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysBusinessFrontRes setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysCollaborator.java
......@@ -64,9 +64,9 @@ public class TabSysCollaborator {
private String subAppIds;
/**
* 状态: 0:无效 1:youxiao
* 状态: 1:无效 0:youxiao
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -150,12 +150,13 @@ public class TabSysCollaborator {
this.subAppIds = subAppIds;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysCollaborator setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysCollaboratorRoleRel.java
......@@ -29,9 +29,9 @@ public class TabSysCollaboratorRoleRel {
private Integer menuId;
/**
* 0:无效2:有效
* 1:无效0:有效
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -67,12 +67,13 @@ public class TabSysCollaboratorRoleRel {
this.menuId = menuId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysCollaboratorRoleRel setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysMenu.java
......@@ -54,9 +54,9 @@ public class TabSysMenu {
private Integer sort;
/**
* 0删除1有效
* 1删除0有效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -187,12 +187,13 @@ public class TabSysMenu {
this.sort = sort;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysMenu setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysMenuAuthDepart.java
......@@ -44,9 +44,9 @@ public class TabSysMenuAuthDepart {
private String positionName;
/**
* 1:有效 0:无效
* 0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -112,12 +112,12 @@ public class TabSysMenuAuthDepart {
return this;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public TabSysMenuAuthDepart setStatus(Integer status) {
this.status = status;
public TabSysMenuAuthDepart setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysMenuItem.java
......@@ -29,9 +29,9 @@ public class TabSysMenuItem {
private Integer itemId;
/**
* 1：有效 0:无效
* 0：有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
* 创建时间
......@@ -67,12 +67,13 @@ public class TabSysMenuItem {
this.itemId = itemId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysMenuItem setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysMenuRole.java
......@@ -34,9 +34,9 @@ public class TabSysMenuRole {
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabSysMenuRole {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysMenuRole setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysOperationUser.java
......@@ -29,9 +29,9 @@ public class TabSysOperationUser {
private String phoneNumber;
/**
* 状态，1有效，0无效
* 状态，0有效，1无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -77,12 +77,13 @@ public class TabSysOperationUser {
this.phoneNumber = phoneNumber;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysOperationUser setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysOrderAppResource.java
......@@ -46,7 +46,7 @@ public class TabSysOrderAppResource {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getOrderAppResourceId() {
return orderAppResourceId;
......@@ -96,11 +96,12 @@ public class TabSysOrderAppResource {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysOrderAppResource setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysResource.java
......@@ -113,7 +113,7 @@ public class TabSysResource {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getResourceId() {
return resourceId;
......@@ -235,11 +235,12 @@ public class TabSysResource {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysResource setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysRole.java
......@@ -29,9 +29,9 @@ public class TabSysRole {
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -67,12 +67,13 @@ public class TabSysRole {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysRole setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysUnionEnterprise.java
......@@ -31,7 +31,7 @@ public class TabSysUnionEnterprise {
/**
*
*/
private Integer status;
private Integer deleteFlag;
/**
* 授权状态,1授权中 2授权成功 3授权失败
......@@ -82,12 +82,13 @@ public class TabSysUnionEnterprise {
this.unionEnterpriseName = unionEnterpriseName;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysUnionEnterprise setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Integer getAuthorizationStatus() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysUnionEnterpriseResource.java
......@@ -66,7 +66,7 @@ public class TabSysUnionEnterpriseResource {
/**
*
*/
private Integer status;
private Integer deleteFlag;
public Integer getUnionResourceId() {
return unionResourceId;
......@@ -148,11 +148,12 @@ public class TabSysUnionEnterpriseResource {
this.updateTime = updateTime;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysUnionEnterpriseResource setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysUser.java
......@@ -39,9 +39,9 @@ public class TabSysUser {
private Integer superAdmin;
/**
* 状态，1有效，0无效
* 状态，0有效，1无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -93,6 +93,11 @@ public class TabSysUser {
*/
private Integer userPosition;
/***
* 营销是否触达 1是0否
*/
private Integer markingFlag;
public Integer getUserId() {
return userId;
}
......@@ -133,12 +138,13 @@ public class TabSysUser {
this.superAdmin = superAdmin;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysUser setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......@@ -223,4 +229,13 @@ public class TabSysUser {
this.userPosition = userPosition;
return this;
}
public Integer getMarkingFlag() {
return markingFlag;
}
public TabSysUser setMarkingFlag(Integer markingFlag) {
this.markingFlag = markingFlag;
return this;
}
}
\ No newline at end of file
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysUserResource.java
......@@ -34,9 +34,9 @@ public class TabSysUserResource {
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabSysUserResource {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysUserResource setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/entity/TabSysUserRole.java
......@@ -34,9 +34,9 @@ public class TabSysUserRole {
private Integer enterpriseId;
/**
* 状态1:有效 0:无效
* 状态0:有效 1:无效
*/
private Integer status;
private Integer deleteFlag;
/**
*
......@@ -80,12 +80,13 @@ public class TabSysUserRole {
this.enterpriseId = enterpriseId;
}
public Integer getStatus() {
return status;
public Integer getDeleteFlag() {
return deleteFlag;
}
public void setStatus(Integer status) {
this.status = status;
public TabSysUserRole setDeleteFlag(Integer deleteFlag) {
this.deleteFlag = deleteFlag;
return this;
}
public Date getCreateTime() {
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/AuditedGroupUserRelService.java
......@@ -79,4 +79,15 @@ public interface AuditedGroupUserRelService {
* @throws
*/
List<Integer> listAuditedGroupByUserId(Integer enterpriseId, Integer userId);
/**
* deleteByUserId
* @Title: deleteByUserId
* @Description:
* @author zhiwj
* @param userId
* @return void
* @throws
*/
void deleteByUserId(Integer userId);
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/MenuService.java
......@@ -71,6 +71,16 @@ public interface MenuService {
void updatePage(MenuDTO menuDTO);
/**
* 更新好办小程序应用数据
* @Title: updatePageForHaobanApplet

* @Description:

* @author guojuxing
* @param menuDTO

* @return void


*/
void updatePageForHaobanApplet(MenuDTO menuDTO);
/**
* 查询页面下面的操作项列表数据
* @Title: listMenuRoleByParentId

* @Description:
......@@ -250,6 +260,31 @@ public interface MenuService {

*/
void deleteNotInApp(List<String> projectList);
/**
* 查询所有的level >= 3的数据
* @Title: listMenuForGicContainChild

* @Description:

* @author guojuxing
* @param parentIdList
level = 2的menu_id集合
* @return java.util.List<com.gic.auth.entity.TabSysMenu>


*/
List<TabSysMenu> listMenuForGicContainChild(List<Integer> parentIdList);
/**
* gic菜单转应用菜单的时候，批量进行修改相关数据
* @Title: updateMenuTmp

* @Description:

* @author guojuxing
* @param menuIdList 需要修改的菜单ID集合
* @param project applicationId
* @param parentId 应用菜单的menuId
* @param parentCode 应用菜单的menuCode
* @param menuVersion 应用的版本code
* @param menuVersionName
 应用的版本名称
* @return void


*/
void updateMenuTmp(List<Integer> menuIdList, String project, Integer parentId, String parentCode, String menuVersion, String menuVersionName);
/***********同步测试环境数据到生产************/
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AccountGroupServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysAccountGroupMapper;
import com.gic.auth.dto.AccountGroupDTO;
import com.gic.auth.entity.TabSysAccountGroup;
......@@ -24,7 +25,7 @@ public class AccountGroupServiceImpl implements AccountGroupService{
private TabSysAccountGroupMapper tabSysAccountGroupMapper;
@Override
public int save(AccountGroupDTO dto) {
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
TabSysAccountGroup record = EntityUtil.changeEntityNew(TabSysAccountGroup.class, dto);
......@@ -73,7 +74,7 @@ public class AccountGroupServiceImpl implements AccountGroupService{
public int updateStatusByAccountGroupId(Integer accountGroupId) {
TabSysAccountGroup record = new TabSysAccountGroup();
record.setAccountGroupId(accountGroupId);
record.setStatus(0);
record.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return tabSysAccountGroupMapper.updateByPrimaryKeySelective(record);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditedGroupServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabAuditedGroupMapper;
import com.gic.auth.dto.AuditedGroupDTO;
import com.gic.auth.entity.TabAuditedGroup;
......@@ -41,7 +42,7 @@ public class AuditedGroupServiceImpl implements AuditedGroupService {
@Override
public Integer save(AuditedGroupDTO auditedGroupDTO) {
TabAuditedGroup auditedGroup = EntityUtil.changeEntityByJSON(TabAuditedGroup.class, auditedGroupDTO);
auditedGroup.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
auditedGroup.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
auditedGroup.setCreateTime(new Date());
tabAuditedGroupMapper.insertSelective(auditedGroup);
return auditedGroup.getAuditedGroupId();
......@@ -70,7 +71,7 @@ public class AuditedGroupServiceImpl implements AuditedGroupService {
@Override
public TabAuditedGroup getAuditedGroup(Integer auditedGroupId) {
TabAuditedGroup tabAuditedGroup = tabAuditedGroupMapper.selectByPrimaryKey(auditedGroupId);
return tabAuditedGroup != null && (GlobalInfo.DATA_STATUS_NORMAL == tabAuditedGroup.getStatus()) ? tabAuditedGroup : null;
return tabAuditedGroup != null && (DeleteFlagConstants.NORMAL_STATUS == tabAuditedGroup.getDeleteFlag()) ? tabAuditedGroup : null;
}
@Override
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditedGroupUserRelServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabAuditedGroupUserRelMapper;
import com.gic.auth.dto.AuditedGroupDTO;
import com.gic.auth.dto.AuditedGroupUserRelDTO;
import com.gic.auth.entity.TabAuditedGroupUserRel;
import com.gic.auth.service.AuditedGroupUserRelService;
import com.gic.commons.util.GlobalInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -36,7 +36,7 @@ public class AuditedGroupUserRelServiceImpl implements AuditedGroupUserRelServic
auditedGroupUserRel.setEnterpriseId(auditedGroupDTO.getEnterpriseId());
auditedGroupUserRel.setAuditedGroupId(auditedGroupDTO.getAuditedGroupId());
auditedGroupUserRel.setUserId(userId);
auditedGroupUserRel.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
auditedGroupUserRel.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
auditedGroupUserRel.setCreateTime(new Date());
tabAuditedGroupUserRelMapper.insertSelectiveByNotExist(auditedGroupUserRel);
}
......@@ -78,4 +78,9 @@ public class AuditedGroupUserRelServiceImpl implements AuditedGroupUserRelServic
public List<Integer> listAuditedGroupByUserId(Integer enterpriseId, Integer userId) {
return tabAuditedGroupUserRelMapper.listAuditedGroupByUserId(enterpriseId, userId);
}
@Override
public void deleteByUserId(Integer userId) {
tabAuditedGroupUserRelMapper.deleteByUserId(userId);
}
}
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditorAuditedGroupRelServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabAuditorAuditedGroupRelMapper;
import com.gic.auth.dto.AuditorAuditedGroupRelDTO;
import com.gic.auth.entity.TabAuditedGroupUserRel;
......@@ -45,7 +46,7 @@ public class AuditorAuditedGroupRelServiceImpl implements AuditorAuditedGroupRel
itemRel.setEnterpriseId(enterpriseId);
itemRel.setAuditorId(auditorId);
itemRel.setAuditedGroupId(auditedGroupId);
itemRel.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
itemRel.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
itemRel.setCreateTime(new Date());
tabAuditorAuditedGroupRelMapper.insertSelectiveByNotExist(itemRel);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditorProjectItemRelServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabAuditorProjectItemRelMapper;
import com.gic.auth.entity.TabAuditorProjectItemRel;
import com.gic.auth.service.AuditorProjectItemRelService;
......@@ -34,7 +35,7 @@ public class AuditorProjectItemRelServiceImpl implements AuditorProjectItemRelSe
itemRel.setEnterpriseId(enterpriseId);
itemRel.setAuditorId(auditorId);
itemRel.setProjectItemId(projectItemId);
itemRel.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
itemRel.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
itemRel.setCreateTime(new Date());
tabAuditorProjectItemRelMapper.insertSelectiveByNotExist(itemRel);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuditorServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabAuditorAuditedGroupRelMapper;
import com.gic.auth.dao.mapper.TabAuditorMapper;
import com.gic.auth.dto.AuditorAuditedGroupRelDTO;
......@@ -71,7 +72,7 @@ public class AuditorServiceImpl implements AuditorService {
auditor.setPhone(copy.getPhone());
auditor.setUserId(copy.getUserId());
auditor.setIsUse(copy.getIsUse());
auditor.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
auditor.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
auditor.setCreateTime(new Date());
tabAuditorMapper.insertSelective(auditor);
return auditor.getAuditorId();
......@@ -93,7 +94,7 @@ public class AuditorServiceImpl implements AuditorService {
@Override
public TabAuditor getAuditor(Integer auditorId) {
TabAuditor auditor = tabAuditorMapper.selectByPrimaryKey(auditorId);
if (auditor != null && auditor.getStatus() == GlobalInfo.DATA_STATUS_NORMAL) {
if (auditor != null && auditor.getDeleteFlag() == DeleteFlagConstants.NORMAL_STATUS) {
return auditor;
}
return null;
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/AuthCodeServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysAuthCodeMapper;
import com.gic.auth.entity.TabSysAuthCode;
import com.gic.auth.service.AuthCodeService;
......@@ -30,7 +31,7 @@ public class AuthCodeServiceImpl implements AuthCodeService {
public int expireAuthCode(Integer authCodeId) {
TabSysAuthCode tabSysAuthCode = new TabSysAuthCode();
tabSysAuthCode.setAuthCodeId(authCodeId);
tabSysAuthCode.setStatus(Constants.DEL_STATUS);
tabSysAuthCode.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabSysAuthCodeMapper.updateByPrimaryKeySelective(tabSysAuthCode);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/BusinessFrontResServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysBusinessFrontResMapper;
import com.gic.auth.dto.BusinessFrontResDTO;
import com.gic.auth.entity.TabSysBusinessFrontRes;
......@@ -25,7 +26,7 @@ public class BusinessFrontResServiceImpl implements BusinessFrontResService{
@Override
public Integer save(BusinessFrontResDTO dto) {
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
TabSysBusinessFrontRes record = EntityUtil.changeEntityNew(TabSysBusinessFrontRes.class, dto);
......@@ -49,7 +50,7 @@ public class BusinessFrontResServiceImpl implements BusinessFrontResService{
public void delete(Integer resourceId) {
TabSysBusinessFrontRes record = new TabSysBusinessFrontRes();
record.setResourceId(resourceId);
record.setStatus(0);
record.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
record.setUpdateTime(new Date());
tabSysBusinessFrontResMapper.updateByPrimaryKeySelective(record);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/CollaboratorServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysCollaboratorMapper;
import com.gic.auth.dto.CollaboratorDTO;
import com.gic.auth.dto.CollaboratorListDTO;
......@@ -31,7 +32,7 @@ public class CollaboratorServiceImpl implements CollaboratorService {
public Integer save(CollaboratorDTO dto) {
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
TabSysCollaborator record = EntityUtil.changeEntityNew(TabSysCollaborator.class, dto);
tabSysCollaboratorMapper.insertSelective(record);
return record.getCollaboratorId();
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/MenuServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.MenuPlatformTypeEnum;
import com.gic.auth.dao.mapper.TabSysMenuMapper;
import com.gic.auth.dto.AuthItemListDTO;
import com.gic.auth.dto.MenuDTO;
......@@ -55,10 +57,10 @@ public class MenuServiceImpl implements MenuService {
//默认gic平台菜单
record.setPlatformType(0);
}
record.setStatus(1);
record.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
if (StringUtils.isBlank(menuDTO.getMenuCode())) {
//权限项没有菜单code数据，但是这样会导致不好批量上传到生产，给一个默认的数据
record.setMenuCode(menuDTO.getParentCode() + "-" + menuDTO.getLevel() + menuDTO.getSort());
record.setMenuCode(menuDTO.getParentCode() == null ? "noParentCode" : menuDTO.getParentCode() + "-" + menuDTO.getLevel() + menuDTO.getSort());
}
tabSysMenuMapper.insertSelective(record);
return record.getMenuId();
......@@ -78,6 +80,14 @@ public class MenuServiceImpl implements MenuService {
}
@Override
public void updatePageForHaobanApplet(MenuDTO menuDTO) {
TabSysMenu record = EntityUtil.changeEntityNew(TabSysMenu.class, menuDTO);
record.setUpdateTime(new Date());
record.setPlatformType(MenuPlatformTypeEnum.HAOBAN_APPLET_APP.getCode());
tabSysMenuMapper.updatePageForHaobanApplet(record);
}
@Override
public List<TabSysMenu> listMenuItemByParentId(Integer parentId) {
List<TabSysMenu> list = tabSysMenuMapper.listMenuItemByParentId(parentId);
if (CollectionUtils.isNotEmpty(list)) {
......@@ -209,7 +219,37 @@ public class MenuServiceImpl implements MenuService {
@Override
public void deleteNotInApp(List<String> projectList) {
tabSysMenuMapper.deleteNotInApp(projectList);
//目前删除platform_type 为XXX的数据，做到同步应用市场应用数据
List<Integer> platformTypeList = new ArrayList<>(2);
platformTypeList.add(MenuPlatformTypeEnum.GIC.getCode());
platformTypeList.add(MenuPlatformTypeEnum.HAOBAN_APP.getCode());
platformTypeList.add(MenuPlatformTypeEnum.HAOBAN_APPLET_APP.getCode());
tabSysMenuMapper.deleteNotInApp(projectList, platformTypeList);
}
@Override
public List<TabSysMenu> listMenuForGicContainChild(List<Integer> parentIdList) {
if (CollectionUtils.isEmpty(parentIdList)) {
return new ArrayList<>();
}
List<TabSysMenu> result = new ArrayList<>();
List<TabSysMenu> list = tabSysMenuMapper.listByParentMenuIdList(parentIdList);
while (CollectionUtils.isNotEmpty(list)) {
result.addAll(list);
List<Integer> menuIdList = list
.stream()
.filter(e -> e != null)
.map(e -> e.getMenuId())
.collect(Collectors.toList());
list.clear();
list = tabSysMenuMapper.listByParentMenuIdList(menuIdList);
}
return result;
}
@Override
public void updateMenuTmp(List<Integer> menuIdList, String project, Integer parentId, String parentCode, String menuVersion, String menuVersionName) {
tabSysMenuMapper.updateMenuTmp(menuIdList, project, parentId, parentCode, menuVersion, menuVersionName);
}
@Override
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/OperationUserServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysOperationUserMapper;
import com.gic.auth.dto.OperationUserDTO;
import com.gic.auth.entity.TabSysOperationUser;
......@@ -32,7 +33,7 @@ public class OperationUserServiceImpl implements OperationUserService{
public Integer save(OperationUserDTO dto) {
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
if (StringUtils.isBlank(dto.getPhoneAreaCode())) {
dto.setPhoneAreaCode("86");
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/OrderAppResourceServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysOrderAppResourceMapper;
import com.gic.auth.dto.OrderAppResourceDTO;
import com.gic.auth.entity.TabSysOrderAppResource;
......@@ -28,7 +29,7 @@ public class OrderAppResourceServiceImpl implements OrderAppResourceService {
public Integer save(OrderAppResourceDTO orderAppResourceDTO) {
TabSysOrderAppResource resource = EntityUtil.changeEntityByJSON(TabSysOrderAppResource.class, orderAppResourceDTO);
resource.setCreateTime(new Date());
resource.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
resource.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
tabSysOrderAppResourceMapper.insertSelective(resource);
return resource.getOrderAppResourceId();
}
......@@ -45,7 +46,7 @@ public class OrderAppResourceServiceImpl implements OrderAppResourceService {
public Integer del(Integer orderAppResourceId) {
TabSysOrderAppResource orderAppResource = new TabSysOrderAppResource();
orderAppResource.setOrderAppResourceId(orderAppResourceId);
orderAppResource.setStatus(GlobalInfo.DATA_STATUS_DELETE);
orderAppResource.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return tabSysOrderAppResourceMapper.updateByPrimaryKeySelective(orderAppResource);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/ResourceServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysResourceMapper;
import com.gic.auth.dto.ResourceDTO;
import com.gic.auth.entity.TabSysResource;
......@@ -31,7 +32,7 @@ public class ResourceServiceImpl implements ResourceService {
@Override
public Integer save(ResourceDTO resourceDTO) {
TabSysResource resource = EntityUtil.changeEntityByOrika(TabSysResource.class, resourceDTO);
resource.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
resource.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
resource.setCreateTime(new Date());
return tabSysResourceMapper.insertSelective(resource);
}
......@@ -45,7 +46,7 @@ public class ResourceServiceImpl implements ResourceService {
@Override
public Integer delResource(Integer resourceId) {
TabSysResource resource = new TabSysResource();
resource.setStatus(GlobalInfo.DATA_STATUS_DELETE);
resource.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
resource.setResourceId(resourceId);
return tabSysResourceMapper.updateByPrimaryKeySelective(resource);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UnionEnterpriseServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysUnionEnterpriseMapper;
import com.gic.auth.entity.TabSysUnionEnterprise;
import com.gic.auth.service.UnionEnterpriseService;
......@@ -46,7 +47,7 @@ public class UnionEnterpriseServiceImpl implements UnionEnterpriseService {
public int delUnionEnterprise(Integer id) {
TabSysUnionEnterprise enterprise = new TabSysUnionEnterprise();
enterprise.setUnionId(id);
enterprise.setStatus(Constants.DEL_STATUS);
enterprise.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
return this.tabSysUnionEnterpriseMapper.updateByPrimaryKeySelective(enterprise);
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UnionEnterrpiseResourceServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.AuthorizationStatusEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dao.mapper.TabSysUnionEnterpriseResourceMapper;
import com.gic.auth.dto.UnionEnterpriseResourceDTO;
import com.gic.auth.entity.TabSysUnionEnterpriseResource;
......@@ -35,7 +36,7 @@ public class UnionEnterrpiseResourceServiceImpl implements UnionEnterpriseResour
return this.tabSysUnionEnterpriseResourceMapper.updateByPrimaryKeySelective(resource);
}else {
resource.setAuthorizationStatus(AuthorizationStatusEnum.NORMAL.getCode());
resource.setStatus(Constants.NORMAL_STATUS);
resource.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
resource.setUpdateTime(new Date());
resource.setCreateTime(new Date());
resource.setUnionId(unionId);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/impl/UserServiceImpl.java
package com.gic.auth.service.impl;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.LoginUserTypeEnum;
import com.gic.auth.dao.mapper.TabSysUserMapper;
import com.gic.auth.dto.UserDTO;
......@@ -33,7 +34,7 @@ public class UserServiceImpl implements UserService {
userDTO.setLoginType(LoginUserTypeEnum.GIC_USER.getCode());
userDTO.setCreateTime(new Date());
userDTO.setUpdateTime(new Date());
userDTO.setStatus(1);
userDTO.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
TabSysUser tabUser = EntityUtil.changeEntityNew(TabSysUser.class, userDTO);
if (tabUser.getAccountType() == null) {
//永久有效账号
......@@ -48,7 +49,7 @@ public class UserServiceImpl implements UserService {
userDTO.setLoginType(LoginUserTypeEnum.OPERATION_USER.getCode());
userDTO.setCreateTime(new Date());
userDTO.setUpdateTime(new Date());
userDTO.setStatus(1);
userDTO.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
//设置超管权限
userDTO.setSuperAdmin(1);
TabSysUser tabUser = EntityUtil.changeEntityNew(TabSysUser.class, userDTO);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AccountGroupApiServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.SignConstants;
import com.gic.auth.dto.AccountGroupDTO;
import com.gic.auth.dto.AccountGroupListDTO;
......@@ -205,7 +206,7 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
Date now = new Date();
for (AccountGroupMemberDTO dto : list) {
AccountGroupRelDTO temp = new AccountGroupRelDTO();
temp.setStatus(1);
temp.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
if (dto.getAccountGroupId() == null) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "分组ID不能改为空");
}
......@@ -343,7 +344,7 @@ public class AccountGroupApiServiceImpl implements AccountGroupApiService {
List<AccountGroupRelDTO> result = new ArrayList<>();
for (Integer userId : userIdList) {
AccountGroupRelDTO temp = new AccountGroupRelDTO();
temp.setStatus(1);
temp.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
temp.setAccountGroupId(groupId);
temp.setCreateTime(now);
temp.setUpdateTime(now);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuthCodeApiServiceImpl.java
package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dto.AuthCodeDTO;
import com.gic.auth.entity.TabSysAuthCode;
import com.gic.auth.service.AuthCodeApiService;
......@@ -29,7 +30,7 @@ public class AuthCodeApiServiceImpl implements AuthCodeApiService {
TabSysAuthCode sysAuthCode = EntityUtil.changeEntityByJSON(TabSysAuthCode.class, authCodeDTO);
sysAuthCode.setCreateTime(new Date());
sysAuthCode.setUpdateTime(new Date());
sysAuthCode.setStatus(Constants.NORMAL_STATUS);
sysAuthCode.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
this.authCodeService.saveAuthCode(sysAuthCode);
return ServiceResponse.success(sysAuthCode.getAuthCodeId());
}
......@@ -56,7 +57,7 @@ public class AuthCodeApiServiceImpl implements AuthCodeApiService {
public ServiceResponse validateAuthCode(Integer authCodeId, String authCode) {
TabSysAuthCode sysAuthCode = this.authCodeService.getAuthCode(authCodeId);
if(sysAuthCode != null){
if(sysAuthCode.getStatus() == 0){
if(sysAuthCode.getDeleteFlag() == DeleteFlagConstants.DELETE_STATUS){
return EnterpriseServiceResponse.failure(ErrorCode.AUTHCODE_USED);
}
if(sysAuthCode.getExpirationTime().before(new Date())){
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/CollaboratorApiServiceImpl.java
......@@ -3,6 +3,7 @@ package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.SignConstants;
import com.gic.auth.dto.AppDTO;
import com.gic.auth.dto.CollaboratorDTO;
......@@ -169,7 +170,7 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
temp.setCreateTime(now);
temp.setUpdateTime(now);
temp.setMenuId(Integer.parseInt(str));
temp.setStatus(1);
temp.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
list.add(temp);
}
collaboratorRoleRelService.deleteByCollaboratorId(collaboratorId);
......@@ -186,7 +187,7 @@ public class CollaboratorApiServiceImpl implements CollaboratorApiService {
}
CollaboratorDTO dto = new CollaboratorDTO();
dto.setCollaboratorId(collaboratorId);
dto.setStatus(0);
dto.setDeleteFlag(DeleteFlagConstants.DELETE_STATUS);
collaboratorService.update(dto);
return ServiceResponse.success();
}
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/RoleApiServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dto.MenuRoleDTO;
import com.gic.auth.dto.RoleDTO;
import com.gic.auth.dto.RoleListDTO;
......@@ -51,7 +52,7 @@ public class RoleApiServiceImpl implements RoleApiService{
}
dto.setUpdateTime(new Date());
dto.setCreateTime(new Date());
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
//验证名称不能重复
if (roleService.isRepeatRoleName(dto.getEnterpriseId(), null, dto.getRoleName())) {
......@@ -164,7 +165,7 @@ public class RoleApiServiceImpl implements RoleApiService{
menuRoleDTO.setMenuId(Integer.parseInt(menuId));
menuRoleDTO.setCreateTime(now);
menuRoleDTO.setUpdateTime(now);
menuRoleDTO.setStatus(1);
menuRoleDTO.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
list.add(menuRoleDTO);
}
menuRoleService.insertForeach(list);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UnionEnterpriseApiServiceImpl.java
......@@ -3,6 +3,7 @@ package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AuthorizationStatusEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.ResourceTypeEnum;
import com.gic.auth.dto.UnionEnterpriseDTO;
import com.gic.auth.dto.UnionEnterpriseResourceDTO;
......@@ -45,7 +46,7 @@ public class UnionEnterpriseApiServiceImpl implements UnionEnterpriseApiService
int i = 0;
if(enterpriseDTO.getUnionId() == null) {
unionEnterprise.setCreateTime(new Date());
unionEnterprise.setStatus(Constants.NORMAL_STATUS);
unionEnterprise.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
unionEnterprise.setAuthorizationStatus(AuthorizationStatusEnum.NORMAL.getCode());
unionEnterprise.setUpdateTime(new Date());
i = this.unionEnterpriseService.saveUnionEnterprise(unionEnterprise);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java
......@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.AccountGroupMemberTypeEnum;
import com.gic.auth.constant.AccountPositionEnum;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.constant.LoginUserTypeEnum;
import com.gic.auth.dto.*;
import com.gic.auth.entity.*;
......@@ -356,6 +357,8 @@ public class UserApiServiceImpl implements UserApiService {
userResourceService.deleteByUserId(userId);
//删除账号分组关联
accountGroupRelService.deleteByUserId(userId, AccountGroupMemberTypeEnum.ADMIN.getCode());
//
auditedGroupUserRelService.deleteByUserId(userId);
userService.delete(userId);
return ServiceResponse.success(tabUser.getUserName());
}
......@@ -629,7 +632,7 @@ public class UserApiServiceImpl implements UserApiService {
accountGroupRelDTO.setCreateTime(now);
accountGroupRelDTO.setUpdateTime(now);
accountGroupRelDTO.setEnterpriseId(enterpriseId);
accountGroupRelDTO.setStatus(1);
accountGroupRelDTO.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
accountGroupRelDTOList.add(accountGroupRelDTO);
}
accountGroupRelService.insertFetch(accountGroupRelDTOList);
......
gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserResourceApiServiceImpl.java
package com.gic.auth.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.constant.DeleteFlagConstants;
import com.gic.auth.dto.UserResourceDTO;
import com.gic.auth.entity.TabSysUser;
import com.gic.auth.service.UserResourceApiService;
......@@ -40,7 +41,7 @@ public class UserResourceApiServiceImpl implements UserResourceApiService{
dto.setCreateTime(new Date());
dto.setUpdateTime(new Date());
dto.setStatus(1);
dto.setDeleteFlag(DeleteFlagConstants.NORMAL_STATUS);
userResourceService.save(dto);
return ServiceResponse.success();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment