Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoban3.0
haoban-manage3.0
Commits
3b70e81b
Commit
3b70e81b
authored
Sep 07, 2022
by
墨竹
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:权限
parent
4b35a976
Hide whitespace changes
Inline
Side-by-side
Showing
24 changed files
with
586 additions
and
306 deletions
+586
-306
HaobanRoleQDTO.java
...m/gic/haoban/manage/api/dto/qdto/role/HaobanRoleQDTO.java
+12
-108
HaobanMenuDTO.java
...ava/com/gic/haoban/manage/api/dto/role/HaobanMenuDTO.java
+174
-0
HaobanRoleDTO.java
...ava/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java
+1
-25
HaobanMenuApiService.java
.../haoban/manage/api/service/role/HaobanMenuApiService.java
+5
-2
HaobanRoleApiService.java
.../haoban/manage/api/service/role/HaobanRoleApiService.java
+5
-6
dubbo-haoban-manage3-operation-web.xml
...ain/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml
+2
-1
TabHaobanMenuMapper.java
...n/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
+12
-12
TabHaobanRoleMapper.java
...n/manage/service/dao/mapper/role/TabHaobanRoleMapper.java
+15
-0
TabHaobanMenu.java
.../gic/haoban/manage/service/entity/role/TabHaobanMenu.java
+14
-2
TabHaobanRole.java
.../gic/haoban/manage/service/entity/role/TabHaobanRole.java
+1
-25
HaobanMenuBO.java
.../gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java
+14
-5
HaobanRoleBO.java
.../gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java
+1
-25
HaobanMenuApiServiceImpl.java
...rvice/service/out/impl/role/HaobanMenuApiServiceImpl.java
+12
-6
HaobanRoleApiServiceImpl.java
...rvice/service/out/impl/role/HaobanRoleApiServiceImpl.java
+64
-8
HaobanMenuService.java
...haoban/manage/service/service/role/HaobanMenuService.java
+10
-10
HaobanRoleService.java
...haoban/manage/service/service/role/HaobanRoleService.java
+51
-0
HaobanMenuServiceImpl.java
...nage/service/service/role/impl/HaobanMenuServiceImpl.java
+34
-34
HaobanRoleServiceImpl.java
...nage/service/service/role/impl/HaobanRoleServiceImpl.java
+25
-0
dubbo-haoban-manage-service.xml
...ervice/src/main/resources/dubbo-haoban-manage-service.xml
+1
-1
TabHaobanMenuMapper.xml
...ce/src/main/resources/mapper/role/TabHaobanMenuMapper.xml
+17
-13
TabHaobanRoleMapper.xml
...ce/src/main/resources/mapper/role/TabHaobanRoleMapper.xml
+44
-15
HaobanRoleController.java
...ic/haoban/manage/web/controller/HaobanRoleController.java
+66
-0
HbLogRecordController.java
...anage/web/controller/logrecord/HbLogRecordController.java
+4
-8
dubbo-haoban-manage-web.xml
...3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
+2
-0
No files found.
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/role/HaobanRoleQDTO.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
qdto
.
role
;
import
java.io.Serializable
;
import
java.util.
Date
;
import
java.util.
List
;
/**
* 好办小程序权限(TabHaobanRole)实体类
...
...
@@ -19,38 +19,15 @@ public class HaobanRoleQDTO implements Serializable {
*/
private
String
roleName
;
/**
* 权限id
*/
private
Long
menuId
;
/**
* 权限code
*/
private
String
menuCode
;
/**
* 0:导购;1:店长;3:区经
*/
private
Integer
clerkType
;
private
String
wxEnterpriseId
;
private
String
enterpriseId
;
private
String
creatorId
;
private
String
creatorName
;
private
String
modifierId
;
private
String
modifierName
;
/**
*
1:正常;0:删除
*
权限id
*/
private
Integer
statusFlag
;
private
Date
createTime
;
private
Date
updateTime
;
private
List
<
Long
>
menuIds
;
private
List
<
Long
>
delMenuIds
;
public
Long
getRoleId
()
{
return
roleId
;
...
...
@@ -68,20 +45,12 @@ public class HaobanRoleQDTO implements Serializable {
this
.
roleName
=
roleName
;
}
public
Long
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
public
List
<
Long
>
getMenuIds
()
{
return
menuIds
;
}
public
String
getMenuCode
()
{
return
menuCode
;
}
public
void
setMenuCode
(
String
menuCode
)
{
this
.
menuCode
=
menuCode
;
public
void
setMenuIds
(
List
<
Long
>
menuIds
)
{
this
.
menuIds
=
menuIds
;
}
public
Integer
getClerkType
()
{
...
...
@@ -92,77 +61,12 @@ public class HaobanRoleQDTO implements Serializable {
this
.
clerkType
=
clerkType
;
}
public
String
getWxEnterpriseId
()
{
return
wxEnterpriseId
;
}
public
void
setWxEnterpriseId
(
String
wxEnterpriseId
)
{
this
.
wxEnterpriseId
=
wxEnterpriseId
;
}
public
String
getEnterpriseId
()
{
return
enterpriseId
;
}
public
void
setEnterpriseId
(
String
enterpriseId
)
{
this
.
enterpriseId
=
enterpriseId
;
}
public
String
getCreatorId
()
{
return
creatorId
;
public
List
<
Long
>
getDelMenuIds
()
{
return
delMenuIds
;
}
public
void
set
CreatorId
(
String
creatorId
)
{
this
.
creatorId
=
creatorId
;
public
void
set
DelMenuIds
(
List
<
Long
>
delMenuIds
)
{
this
.
delMenuIds
=
delMenuIds
;
}
public
String
getCreatorName
()
{
return
creatorName
;
}
public
void
setCreatorName
(
String
creatorName
)
{
this
.
creatorName
=
creatorName
;
}
public
String
getModifierId
()
{
return
modifierId
;
}
public
void
setModifierId
(
String
modifierId
)
{
this
.
modifierId
=
modifierId
;
}
public
String
getModifierName
()
{
return
modifierName
;
}
public
void
setModifierName
(
String
modifierName
)
{
this
.
modifierName
=
modifierName
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanMenuDTO.java
0 → 100644
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
api
.
dto
.
role
;
import
java.io.Serializable
;
import
java.util.Date
;
import
java.util.List
;
/**
*
*
* @author mozhu
* @since 2022-09-06 16:35:10
*/
public
class
HaobanMenuDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
909873156099677525L
;
private
Long
menuId
;
/**
* 菜单code
*/
private
String
menuCode
;
/**
* 菜单名称
*/
private
String
menuName
;
/**
* 菜单url
*/
private
String
menuUrl
;
/**
* 菜单图标url
*/
private
String
iconUrl
;
/**
* 层级
*/
private
Integer
menuLevel
;
/**
* 0:菜单;1:按钮
*/
private
Integer
menuType
;
/**
* 排序
*/
private
Integer
menuSort
;
/**
* 父code
*/
private
String
parentCode
;
/**
* 1:正常;0:删除
*/
private
Integer
statusFlag
;
private
Integer
customFlag
;
private
Date
createTime
;
private
Date
updateTime
;
private
List
<
HaobanMenuDTO
>
menuBOList
;
public
Long
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
}
public
String
getMenuCode
()
{
return
menuCode
;
}
public
void
setMenuCode
(
String
menuCode
)
{
this
.
menuCode
=
menuCode
;
}
public
String
getMenuName
()
{
return
menuName
;
}
public
void
setMenuName
(
String
menuName
)
{
this
.
menuName
=
menuName
;
}
public
String
getMenuUrl
()
{
return
menuUrl
;
}
public
void
setMenuUrl
(
String
menuUrl
)
{
this
.
menuUrl
=
menuUrl
;
}
public
String
getIconUrl
()
{
return
iconUrl
;
}
public
void
setIconUrl
(
String
iconUrl
)
{
this
.
iconUrl
=
iconUrl
;
}
public
Integer
getMenuLevel
()
{
return
menuLevel
;
}
public
void
setMenuLevel
(
Integer
menuLevel
)
{
this
.
menuLevel
=
menuLevel
;
}
public
Integer
getMenuType
()
{
return
menuType
;
}
public
void
setMenuType
(
Integer
menuType
)
{
this
.
menuType
=
menuType
;
}
public
Integer
getMenuSort
()
{
return
menuSort
;
}
public
void
setMenuSort
(
Integer
menuSort
)
{
this
.
menuSort
=
menuSort
;
}
public
String
getParentCode
()
{
return
parentCode
;
}
public
void
setParentCode
(
String
parentCode
)
{
this
.
parentCode
=
parentCode
;
}
public
Integer
getStatusFlag
()
{
return
statusFlag
;
}
public
void
setStatusFlag
(
Integer
statusFlag
)
{
this
.
statusFlag
=
statusFlag
;
}
public
Date
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Date
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Date
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
Integer
getCustomFlag
()
{
return
customFlag
;
}
public
void
setCustomFlag
(
Integer
customFlag
)
{
this
.
customFlag
=
customFlag
;
}
public
List
<
HaobanMenuDTO
>
getMenuBOList
()
{
return
menuBOList
;
}
public
void
setMenuBOList
(
List
<
HaobanMenuDTO
>
menuBOList
)
{
this
.
menuBOList
=
menuBOList
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/role/HaobanRoleDTO.java
View file @
3b70e81b
...
...
@@ -18,14 +18,7 @@ public class HaobanRoleDTO implements Serializable {
* 权限名称
*/
private
String
roleName
;
/**
* 权限id
*/
private
Long
menuId
;
/**
* 权限code
*/
private
String
menuCode
;
/**
* 0:导购;1:店长;3:区经
*/
...
...
@@ -68,22 +61,6 @@ public class HaobanRoleDTO implements Serializable {
this
.
roleName
=
roleName
;
}
public
Long
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
}
public
String
getMenuCode
()
{
return
menuCode
;
}
public
void
setMenuCode
(
String
menuCode
)
{
this
.
menuCode
=
menuCode
;
}
public
Integer
getClerkType
()
{
return
clerkType
;
}
...
...
@@ -163,6 +140,5 @@ public class HaobanRoleDTO implements Serializable {
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/Haoban
Role
MenuApiService.java
→
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanMenuApiService.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
api
.
service
.
role
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.haoban.manage.api.dto.role.HaobanMenuDTO
;
import
java.util.List
;
/**
* @author xuwenqian
* @date 2022/9/7 9:46 上午
*/
public
interface
Haoban
Role
MenuApiService
{
public
interface
HaobanMenuApiService
{
/**
* 获取菜单树
...
...
@@ -15,5 +18,5 @@ public interface HaobanRoleMenuApiService {
* @author mozhu
* @date 2022-09-07 09:50:37
*/
ServiceResponse
getMenuTreeList
();
ServiceResponse
<
List
<
HaobanMenuDTO
>>
getMenuTreeList
();
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/role/HaobanRoleApiService.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
api
.
service
.
role
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
import
java.util.List
;
/**
* @author xuwenqian
* @date 2022/9/7 9:46 上午
...
...
@@ -14,23 +13,23 @@ public interface HaobanRoleApiService {
/**
* 添加
*
* @param haobanRoleQDTO
List
* @param haobanRoleQDTO
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-09-07 11:36:08
*/
ServiceResponse
add
(
List
<
HaobanRoleQDTO
>
haobanRoleQDTOList
);
ServiceResponse
add
(
HaobanRoleQDTO
haobanRoleQDTO
,
WebLoginDTO
login
);
/**
* 编辑
*
* @param haobanRoleQDTO
List
* @param haobanRoleQDTO
* @return {@link ServiceResponse }
* @author mozhu
* @date 2022-09-07 11:44:17
*/
ServiceResponse
edit
(
List
<
HaobanRoleQDTO
>
haobanRoleQDTOList
);
ServiceResponse
edit
(
HaobanRoleQDTO
haobanRoleQDTO
,
WebLoginDTO
login
);
/**
...
...
haoban-manage3-operation-web/src/main/webapp/WEB-INF/dubbo-haoban-manage3-operation-web.xml
View file @
3b70e81b
...
...
@@ -65,5 +65,6 @@
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.QywxErrorLogApiService"
id=
"qywxErrorLogApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService"
id=
"haobanQywxFeeApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.role.HaobanRoleApiService"
id=
"haobanRoleApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.role.HaobanMenuApiService"
id=
"haobanMenuApiService"
/>
</beans>
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaoban
Role
MenuMapper.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanMenuMapper.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
service
.
dao
.
mapper
.
role
;
import
com.gic.haoban.manage.service.entity.role.TabHaoban
Role
Menu
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanMenu
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
*
好办小程序菜单(TabHaobanRoleMenu)表数据库访问层
*
*
* @author mozhu
* @since 2022-09-06 16:35:10
*/
public
interface
TabHaoban
Role
MenuMapper
{
public
interface
TabHaobanMenuMapper
{
/**
* 通过ID查询单条数据
...
...
@@ -19,39 +19,39 @@ public interface TabHaobanRoleMenuMapper {
* @param menuId 主键
* @return 实例对象
*/
TabHaoban
Role
Menu
queryById
(
Long
menuId
);
TabHaobanMenu
queryById
(
Long
menuId
);
/**
* 新增数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 影响行数
*/
int
insert
(
TabHaoban
RoleMenu
tabHaobanRole
Menu
);
int
insert
(
TabHaoban
Menu
tabHaoban
Menu
);
/**
* 批量新增数据(MyBatis原生foreach方法)
*
* @param entities List<TabHaoban
Role
Menu> 实例对象列表
* @param entities List<TabHaobanMenu> 实例对象列表
* @return 影响行数
*/
int
insertBatch
(
@Param
(
"entities"
)
List
<
TabHaoban
Role
Menu
>
entities
);
int
insertBatch
(
@Param
(
"entities"
)
List
<
TabHaobanMenu
>
entities
);
/**
* 修改数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 影响行数
*/
int
update
(
TabHaoban
RoleMenu
tabHaobanRole
Menu
);
int
update
(
TabHaoban
Menu
tabHaoban
Menu
);
/**
* 获取所有菜单
*
* @return {@link List }<{@link TabHaoban
Role
Menu }>
* @return {@link List }<{@link TabHaobanMenu }>
* @author mozhu
* @date 2022-09-07 09:54:05
*/
List
<
TabHaoban
Role
Menu
>
getAllMenuList
();
List
<
TabHaobanMenu
>
getAllMenuList
();
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/role/TabHaobanRoleMapper.java
View file @
3b70e81b
...
...
@@ -58,5 +58,20 @@ public interface TabHaobanRoleMapper {
List
<
TabHaobanRole
>
getByEnterpriseIdAndClerkType
(
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"clerkType"
)
Integer
clerkType
);
List
<
Long
>
queryByMenuIds
(
@Param
(
"menuIds"
)
List
<
Long
>
menuIds
,
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"clerkType"
)
Integer
clerkType
);
List
<
Long
>
queryByUnMenuIds
(
@Param
(
"menuIds"
)
List
<
Long
>
menuIds
,
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"clerkType"
)
Integer
clerkType
);
Long
queryByMenuId
(
@Param
(
"menuId"
)
Long
menuId
,
@Param
(
"enterpriseId"
)
String
enterpriseId
,
@Param
(
"wxEnterpriseId"
)
String
wxEnterpriseId
,
@Param
(
"clerkType"
)
Integer
clerkType
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaoban
Role
Menu.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanMenu.java
View file @
3b70e81b
...
...
@@ -4,12 +4,13 @@ import java.io.Serializable;
import
java.util.Date
;
/**
*
好办小程序菜单(TabHaobanRoleMenu)实体类
*
*
* @author mozhu
* @since 2022-09-06 16:35:10
*/
public
class
TabHaobanRoleMenu
implements
Serializable
{
public
class
TabHaobanMenu
implements
Serializable
{
private
static
final
long
serialVersionUID
=
909873156099677525L
;
private
Long
menuId
;
...
...
@@ -49,6 +50,10 @@ public class TabHaobanRoleMenu implements Serializable {
* 1:正常;0:删除
*/
private
Integer
statusFlag
;
/**
* 是否定制菜单:1:是
*/
private
Integer
customFlag
;
private
Date
createTime
;
...
...
@@ -151,5 +156,12 @@ public class TabHaobanRoleMenu implements Serializable {
this
.
updateTime
=
updateTime
;
}
public
Integer
getCustomFlag
()
{
return
customFlag
;
}
public
void
setCustomFlag
(
Integer
customFlag
)
{
this
.
customFlag
=
customFlag
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/role/TabHaobanRole.java
View file @
3b70e81b
...
...
@@ -17,14 +17,7 @@ public class TabHaobanRole implements Serializable {
* 权限名称
*/
private
String
roleName
;
/**
* 权限id
*/
private
Long
menuId
;
/**
* 权限code
*/
private
String
menuCode
;
/**
* 0:导购;1:店长;3:区经
*/
...
...
@@ -67,22 +60,6 @@ public class TabHaobanRole implements Serializable {
this
.
roleName
=
roleName
;
}
public
Long
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
}
public
String
getMenuCode
()
{
return
menuCode
;
}
public
void
setMenuCode
(
String
menuCode
)
{
this
.
menuCode
=
menuCode
;
}
public
Integer
getClerkType
()
{
return
clerkType
;
}
...
...
@@ -162,6 +139,5 @@ public class TabHaobanRole implements Serializable {
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/Haoban
Role
MenuBO.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanMenuBO.java
View file @
3b70e81b
...
...
@@ -5,12 +5,12 @@ import java.util.Date;
import
java.util.List
;
/**
*
好办小程序菜单(TabHaobanRoleMenu)实体类
*
*
* @author mozhu
* @since 2022-09-06 16:35:10
*/
public
class
Haoban
Role
MenuBO
implements
Serializable
{
public
class
HaobanMenuBO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
909873156099677525L
;
...
...
@@ -51,12 +51,13 @@ public class HaobanRoleMenuBO implements Serializable {
* 1:正常;0:删除
*/
private
Integer
statusFlag
;
private
Integer
customFlag
;
private
Date
createTime
;
private
Date
updateTime
;
private
List
<
Haoban
Role
MenuBO
>
menuBOList
;
private
List
<
HaobanMenuBO
>
menuBOList
;
public
Long
getMenuId
()
{
...
...
@@ -155,11 +156,19 @@ public class HaobanRoleMenuBO implements Serializable {
this
.
updateTime
=
updateTime
;
}
public
List
<
HaobanRoleMenuBO
>
getMenuBOList
()
{
public
Integer
getCustomFlag
()
{
return
customFlag
;
}
public
void
setCustomFlag
(
Integer
customFlag
)
{
this
.
customFlag
=
customFlag
;
}
public
List
<
HaobanMenuBO
>
getMenuBOList
()
{
return
menuBOList
;
}
public
void
setMenuBOList
(
List
<
Haoban
Role
MenuBO
>
menuBOList
)
{
public
void
setMenuBOList
(
List
<
HaobanMenuBO
>
menuBOList
)
{
this
.
menuBOList
=
menuBOList
;
}
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/role/HaobanRoleBO.java
View file @
3b70e81b
...
...
@@ -18,14 +18,7 @@ public class HaobanRoleBO implements Serializable {
* 权限名称
*/
private
String
roleName
;
/**
* 权限id
*/
private
Long
menuId
;
/**
* 权限code
*/
private
String
menuCode
;
/**
* 0:导购;1:店长;3:区经
*/
...
...
@@ -68,22 +61,6 @@ public class HaobanRoleBO implements Serializable {
this
.
roleName
=
roleName
;
}
public
Long
getMenuId
()
{
return
menuId
;
}
public
void
setMenuId
(
Long
menuId
)
{
this
.
menuId
=
menuId
;
}
public
String
getMenuCode
()
{
return
menuCode
;
}
public
void
setMenuCode
(
String
menuCode
)
{
this
.
menuCode
=
menuCode
;
}
public
Integer
getClerkType
()
{
return
clerkType
;
}
...
...
@@ -163,6 +140,5 @@ public class HaobanRoleBO implements Serializable {
public
void
setUpdateTime
(
Date
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/Haoban
Role
MenuApiServiceImpl.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanMenuApiServiceImpl.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
.
role
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.haoban.manage.api.service.role.HaobanRoleMenuApiService
;
import
com.gic.haoban.manage.service.service.role.HaobanRoleMenuService
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.haoban.manage.api.dto.role.HaobanMenuDTO
;
import
com.gic.haoban.manage.api.service.role.HaobanMenuApiService
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO
;
import
com.gic.haoban.manage.service.service.role.HaobanMenuService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
@Service
public
class
Haoban
RoleMenuApiServiceImpl
implements
HaobanRole
MenuApiService
{
public
class
Haoban
MenuApiServiceImpl
implements
Haoban
MenuApiService
{
@Autowired
private
Haoban
RoleMenuService
haobanRole
MenuService
;
private
Haoban
MenuService
haoban
MenuService
;
@Override
public
ServiceResponse
getMenuTreeList
()
{
return
ServiceResponse
.
success
(
haobanRoleMenuService
.
getMenuTreeList
());
public
ServiceResponse
<
List
<
HaobanMenuDTO
>>
getMenuTreeList
()
{
List
<
HaobanMenuBO
>
menuTreeList
=
haobanMenuService
.
getMenuTreeList
();
return
ServiceResponse
.
success
(
EntityUtil
.
changeEntityListNew
(
HaobanMenuDTO
.
class
,
menuTreeList
));
}
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
out
.
impl
.
role
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.
commons.util.EntityUtil
;
import
com.gic.
haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
import
com.gic.haoban.manage.api.service.role.HaobanRoleApiService
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanMenu
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanRole
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanRoleBO
;
import
com.gic.haoban.manage.service.service.role.HaobanMenuService
;
import
com.gic.haoban.manage.service.service.role.HaobanRoleService
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.List
;
@Service
public
class
HaobanRoleApiServiceImpl
implements
HaobanRoleApiService
{
private
static
final
Logger
logger
=
LogManager
.
getLogger
(
HaobanRoleApiServiceImpl
.
class
);
@Autowired
private
HaobanRoleService
haobanRoleService
;
@Autowired
private
HaobanMenuService
haobanMenuService
;
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ServiceResponse
add
(
List
<
HaobanRoleQDTO
>
haobanRoleQDTOList
)
{
List
<
TabHaobanRole
>
tabHaobanRoles
=
EntityUtil
.
changeEntityListNew
(
TabHaobanRole
.
class
,
haobanRoleQDTOList
);
return
ServiceResponse
.
success
(
haobanRoleService
.
insertBatch
(
tabHaobanRoles
));
public
ServiceResponse
add
(
HaobanRoleQDTO
haobanRoleQDTO
,
WebLoginDTO
login
)
{
List
<
Long
>
menuIds
=
haobanRoleQDTO
.
getMenuIds
();
List
<
TabHaobanRole
>
haobanRoles
=
new
ArrayList
<>();
for
(
Long
menuId
:
menuIds
)
{
TabHaobanRole
tabHaobanRole
=
new
TabHaobanRole
();
tabHaobanRole
.
setRoleName
(
haobanRoleQDTO
.
getRoleName
());
tabHaobanRole
.
setMenuId
(
menuId
);
tabHaobanRole
.
setClerkType
(
haobanRoleQDTO
.
getClerkType
());
tabHaobanRole
.
setStatusFlag
(
1
);
tabHaobanRole
.
setEnterpriseId
(
login
.
getEnterpriseId
());
tabHaobanRole
.
setWxEnterpriseId
(
login
.
getWxEnterpriseId
());
TabHaobanMenu
tabHaobanMenu
=
haobanMenuService
.
queryById
(
menuId
);
if
(
tabHaobanMenu
!=
null
)
{
tabHaobanRole
.
setMenuCode
(
tabHaobanMenu
.
getMenuCode
());
tabHaobanRole
.
setMenuName
(
tabHaobanMenu
.
getMenuName
());
}
tabHaobanRole
.
setCreatorId
(
login
.
getClerkId
());
tabHaobanRole
.
setCreatorName
(
login
.
getClerkName
());
haobanRoles
.
add
(
tabHaobanRole
);
}
return
ServiceResponse
.
success
(
haobanRoleService
.
insertBatch
(
haobanRoles
));
}
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
ServiceResponse
edit
(
List
<
HaobanRoleQDTO
>
haobanRoleQDTOList
)
{
List
<
TabHaobanRole
>
tabHaobanRoles
=
EntityUtil
.
changeEntityListNew
(
TabHaobanRole
.
class
,
haobanRoleQDTOList
);
for
(
TabHaobanRole
tabHaobanRole
:
tabHaobanRoles
)
{
haobanRoleService
.
update
(
tabHaobanRole
);
public
ServiceResponse
edit
(
HaobanRoleQDTO
haobanRoleQDTO
,
WebLoginDTO
login
)
{
String
enterpriseId
=
login
.
getEnterpriseId
();
String
wxEnterpriseId
=
login
.
getWxEnterpriseId
();
Integer
clerkType
=
haobanRoleQDTO
.
getClerkType
();
List
<
Long
>
delMenuIds
=
haobanRoleQDTO
.
getDelMenuIds
();
List
<
Long
>
delRoleIds
=
haobanRoleService
.
queryByUnMenuIds
(
delMenuIds
,
enterpriseId
,
wxEnterpriseId
,
clerkType
);
//删除已删除的权限
haobanRoleService
.
delByRoleIds
(
delRoleIds
);
List
<
Long
>
menuIds
=
haobanRoleQDTO
.
getMenuIds
();
for
(
Long
menuId
:
menuIds
)
{
Long
roleId
=
haobanRoleService
.
queryByMenuId
(
menuId
,
enterpriseId
,
wxEnterpriseId
,
clerkType
);
if
(
roleId
==
null
)
{
TabHaobanRole
tabHaobanRole
=
new
TabHaobanRole
();
tabHaobanRole
.
setRoleName
(
haobanRoleQDTO
.
getRoleName
());
tabHaobanRole
.
setMenuId
(
menuId
);
tabHaobanRole
.
setClerkType
(
haobanRoleQDTO
.
getClerkType
());
tabHaobanRole
.
setStatusFlag
(
1
);
tabHaobanRole
.
setEnterpriseId
(
login
.
getEnterpriseId
());
tabHaobanRole
.
setWxEnterpriseId
(
login
.
getWxEnterpriseId
());
TabHaobanMenu
tabHaobanMenu
=
haobanMenuService
.
queryById
(
menuId
);
if
(
tabHaobanMenu
!=
null
)
{
tabHaobanRole
.
setMenuCode
(
tabHaobanMenu
.
getMenuCode
());
tabHaobanRole
.
setMenuName
(
tabHaobanMenu
.
getMenuName
());
}
tabHaobanRole
.
setCreatorId
(
login
.
getClerkId
());
tabHaobanRole
.
setCreatorName
(
login
.
getClerkName
());
haobanRoleService
.
insert
(
tabHaobanRole
);
}
else
{
TabHaobanRole
tabHaobanRole
=
new
TabHaobanRole
();
tabHaobanRole
.
setRoleName
(
haobanRoleQDTO
.
getRoleName
());
tabHaobanRole
.
setModifierId
(
login
.
getClerkId
());
tabHaobanRole
.
setModifierName
(
login
.
getClerkName
());
haobanRoleService
.
update
(
tabHaobanRole
);
}
}
return
ServiceResponse
.
success
();
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/Haoban
Role
MenuService.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanMenuService.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
role
;
import
com.gic.haoban.manage.service.entity.role.TabHaoban
Role
Menu
;
import
com.gic.haoban.manage.service.pojo.bo.role.Haoban
Role
MenuBO
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanMenu
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO
;
import
java.util.List
;
/**
*
好办小程序菜单(TabHaobanRoleMenu)表服务接口
*
*
* @author mozhu
* @since 2022-09-06 16:35:11
*/
public
interface
Haoban
Role
MenuService
{
public
interface
HaobanMenuService
{
/**
* 通过ID查询单条数据
...
...
@@ -19,28 +19,28 @@ public interface HaobanRoleMenuService {
* @param menuId 主键
* @return 实例对象
*/
TabHaoban
Role
Menu
queryById
(
Long
menuId
);
TabHaobanMenu
queryById
(
Long
menuId
);
/**
* 新增数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 实例对象
*/
TabHaoban
RoleMenu
insert
(
TabHaobanRoleMenu
tabHaobanRole
Menu
);
TabHaoban
Menu
insert
(
TabHaobanMenu
tabHaoban
Menu
);
/**
* 修改数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 实例对象
*/
TabHaoban
RoleMenu
update
(
TabHaobanRoleMenu
tabHaobanRole
Menu
);
TabHaoban
Menu
update
(
TabHaobanMenu
tabHaoban
Menu
);
/**
* 菜单树
* @return
*/
List
<
Haoban
Role
MenuBO
>
getMenuTreeList
();
List
<
HaobanMenuBO
>
getMenuTreeList
();
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/HaobanRoleService.java
View file @
3b70e81b
...
...
@@ -66,4 +66,55 @@ public interface HaobanRoleService {
* @date 2022-09-07 14:08:19
*/
List
<
HaobanRoleBO
>
getByEnterpriseIdAndClerkType
(
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
);
/**
* 查询菜单id
*
* @param menuIds 菜单id
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link List }<{@link Long }>
* @author mozhu
* @date 2022-09-07 14:32:17
*/
List
<
Long
>
queryByMenuIds
(
List
<
Long
>
menuIds
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
);
/**
* 查询被删除的菜单id
*
* @param menuIds 菜单id
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link List }<{@link Long }>
* @author mozhu
* @date 2022-09-07 14:32:20
*/
List
<
Long
>
queryByUnMenuIds
(
List
<
Long
>
menuIds
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
);
/**
* 通过菜单id查询
*
* @param menuId 菜单id
* @param enterpriseId 企业标识
* @param wxEnterpriseId wx企业标识
* @param clerkType 职员类型
* @return {@link Long }
* @author mozhu
* @date 2022-09-07 17:03:50
*/
Long
queryByMenuId
(
Long
menuId
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
);
/**
* 删除权限
*
* @param roleIds 角色id
* @return int
* @author mozhu
* @date 2022-09-07 14:47:18
*/
void
delByRoleIds
(
List
<
Long
>
roleIds
);
}
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/Haoban
Role
MenuServiceImpl.java
→
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanMenuServiceImpl.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
service
.
service
.
role
.
impl
;
import
com.gic.commons.util.EntityUtil
;
import
com.gic.haoban.manage.service.dao.mapper.role.TabHaoban
Role
MenuMapper
;
import
com.gic.haoban.manage.service.entity.role.TabHaoban
Role
Menu
;
import
com.gic.haoban.manage.service.pojo.bo.role.Haoban
Role
MenuBO
;
import
com.gic.haoban.manage.service.service.role.Haoban
Role
MenuService
;
import
com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper
;
import
com.gic.haoban.manage.service.entity.role.TabHaobanMenu
;
import
com.gic.haoban.manage.service.pojo.bo.role.HaobanMenuBO
;
import
com.gic.haoban.manage.service.service.role.HaobanMenuService
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
@@ -14,16 +14,16 @@ import java.util.Date;
import
java.util.List
;
/**
*
好办小程序菜单(TabHaobanRoleMenu)表服务实现类
*
*
* @author mozhu
* @since 2022-09-06 16:35:11
*/
@Service
public
class
Haoban
RoleMenuServiceImpl
implements
HaobanRole
MenuService
{
public
class
Haoban
MenuServiceImpl
implements
Haoban
MenuService
{
@Autowired
private
TabHaoban
RoleMenuMapper
tabHaobanRole
MenuMapper
;
private
TabHaoban
MenuMapper
tabHaoban
MenuMapper
;
/**
* 通过ID查询单条数据
...
...
@@ -32,61 +32,61 @@ public class HaobanRoleMenuServiceImpl implements HaobanRoleMenuService {
* @return 实例对象
*/
@Override
public
TabHaoban
Role
Menu
queryById
(
Long
menuId
)
{
return
this
.
tabHaoban
Role
MenuMapper
.
queryById
(
menuId
);
public
TabHaobanMenu
queryById
(
Long
menuId
)
{
return
this
.
tabHaobanMenuMapper
.
queryById
(
menuId
);
}
/**
* 新增数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 实例对象
*/
@Override
public
TabHaoban
RoleMenu
insert
(
TabHaobanRoleMenu
tabHaobanRole
Menu
)
{
tabHaoban
Role
Menu
.
setCreateTime
(
new
Date
());
tabHaoban
Role
Menu
.
setUpdateTime
(
new
Date
());
this
.
tabHaoban
RoleMenuMapper
.
insert
(
tabHaobanRole
Menu
);
return
tabHaoban
Role
Menu
;
public
TabHaoban
Menu
insert
(
TabHaobanMenu
tabHaoban
Menu
)
{
tabHaobanMenu
.
setCreateTime
(
new
Date
());
tabHaobanMenu
.
setUpdateTime
(
new
Date
());
this
.
tabHaoban
MenuMapper
.
insert
(
tabHaoban
Menu
);
return
tabHaobanMenu
;
}
/**
* 修改数据
*
* @param tabHaoban
Role
Menu 实例对象
* @param tabHaobanMenu 实例对象
* @return 实例对象
*/
@Override
public
TabHaoban
RoleMenu
update
(
TabHaobanRoleMenu
tabHaobanRole
Menu
)
{
tabHaoban
Role
Menu
.
setUpdateTime
(
new
Date
());
this
.
tabHaoban
RoleMenuMapper
.
update
(
tabHaobanRole
Menu
);
return
this
.
queryById
(
tabHaoban
Role
Menu
.
getMenuId
());
public
TabHaoban
Menu
update
(
TabHaobanMenu
tabHaoban
Menu
)
{
tabHaobanMenu
.
setUpdateTime
(
new
Date
());
this
.
tabHaoban
MenuMapper
.
update
(
tabHaoban
Menu
);
return
this
.
queryById
(
tabHaobanMenu
.
getMenuId
());
}
@Override
public
List
<
Haoban
Role
MenuBO
>
getMenuTreeList
()
{
List
<
TabHaoban
RoleMenu
>
allMenuList
=
tabHaobanRole
MenuMapper
.
getAllMenuList
();
List
<
Haoban
RoleMenuBO
>
menuBOList
=
EntityUtil
.
changeEntityListNew
(
HaobanRole
MenuBO
.
class
,
allMenuList
);
for
(
Haoban
RoleMenuBO
haobanRole
MenuBO
:
menuBOList
)
{
List
<
Haoban
RoleMenuBO
>
menus
=
iterateMenus
(
menuBOList
,
haobanRole
MenuBO
.
getMenuCode
());
haoban
Role
MenuBO
.
setMenuBOList
(
menus
);
public
List
<
HaobanMenuBO
>
getMenuTreeList
()
{
List
<
TabHaoban
Menu
>
allMenuList
=
tabHaoban
MenuMapper
.
getAllMenuList
();
List
<
Haoban
MenuBO
>
menuBOList
=
EntityUtil
.
changeEntityListNew
(
Haoban
MenuBO
.
class
,
allMenuList
);
for
(
Haoban
MenuBO
haoban
MenuBO
:
menuBOList
)
{
List
<
Haoban
MenuBO
>
menus
=
iterateMenus
(
menuBOList
,
haoban
MenuBO
.
getMenuCode
());
haobanMenuBO
.
setMenuBOList
(
menus
);
}
return
menuBOList
;
}
public
List
<
Haoban
RoleMenuBO
>
iterateMenus
(
List
<
HaobanRole
MenuBO
>
menuVoList
,
String
pCode
)
{
List
<
Haoban
Role
MenuBO
>
result
=
new
ArrayList
<>();
for
(
Haoban
RoleMenuBO
haobanRole
MenuBO
:
menuVoList
)
{
String
menuCode
=
haoban
Role
MenuBO
.
getMenuCode
();
String
parentCode
=
haoban
Role
MenuBO
.
getParentCode
();
public
List
<
Haoban
MenuBO
>
iterateMenus
(
List
<
Haoban
MenuBO
>
menuVoList
,
String
pCode
)
{
List
<
HaobanMenuBO
>
result
=
new
ArrayList
<>();
for
(
Haoban
MenuBO
haoban
MenuBO
:
menuVoList
)
{
String
menuCode
=
haobanMenuBO
.
getMenuCode
();
String
parentCode
=
haobanMenuBO
.
getParentCode
();
if
(
StringUtils
.
isNotBlank
(
parentCode
))
{
if
(
parentCode
.
equals
(
pCode
))
{
//递归查询当前子菜单的子菜单
List
<
Haoban
Role
MenuBO
>
iterateMenu
=
iterateMenus
(
menuVoList
,
menuCode
);
haoban
Role
MenuBO
.
setMenuBOList
(
iterateMenu
);
result
.
add
(
haoban
Role
MenuBO
);
List
<
HaobanMenuBO
>
iterateMenu
=
iterateMenus
(
menuVoList
,
menuCode
);
haobanMenuBO
.
setMenuBOList
(
iterateMenu
);
result
.
add
(
haobanMenuBO
);
}
}
}
...
...
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/role/impl/HaobanRoleServiceImpl.java
View file @
3b70e81b
...
...
@@ -90,4 +90,29 @@ public class HaobanRoleServiceImpl implements HaobanRoleService {
List
<
TabHaobanRole
>
haobanRoles
=
tabHaobanRoleMapper
.
getByEnterpriseIdAndClerkType
(
enterpriseId
,
wxEnterpriseId
,
clerkType
);
return
EntityUtil
.
changeEntityListNew
(
HaobanRoleBO
.
class
,
haobanRoles
);
}
@Override
public
List
<
Long
>
queryByMenuIds
(
List
<
Long
>
menuIds
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
)
{
return
tabHaobanRoleMapper
.
queryByMenuIds
(
menuIds
,
enterpriseId
,
wxEnterpriseId
,
clerkType
);
}
@Override
public
List
<
Long
>
queryByUnMenuIds
(
List
<
Long
>
menuIds
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
)
{
return
tabHaobanRoleMapper
.
queryByUnMenuIds
(
menuIds
,
enterpriseId
,
wxEnterpriseId
,
clerkType
);
}
@Override
public
Long
queryByMenuId
(
Long
menuId
,
String
enterpriseId
,
String
wxEnterpriseId
,
Integer
clerkType
)
{
return
tabHaobanRoleMapper
.
queryByMenuId
(
menuId
,
enterpriseId
,
wxEnterpriseId
,
clerkType
);
}
@Override
public
void
delByRoleIds
(
List
<
Long
>
roleIds
)
{
for
(
Long
roleId
:
roleIds
)
{
TabHaobanRole
tabHaobanRole
=
new
TabHaobanRole
();
tabHaobanRole
.
setStatusFlag
(
0
);
tabHaobanRole
.
setRoleId
(
roleId
);
tabHaobanRoleMapper
.
update
(
tabHaobanRole
);
}
}
}
haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
View file @
3b70e81b
...
...
@@ -131,7 +131,7 @@
timeout=
"10000"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.ValidationCodeApiService"
ref=
"validationCodeApiServiceImpl"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.role.Haoban
RoleMenuApiService"
ref=
"haobanRole
MenuApiServiceImpl"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.role.Haoban
MenuApiService"
ref=
"haoban
MenuApiServiceImpl"
/>
<dubbo:service
interface=
"com.gic.haoban.manage.api.service.role.HaobanRoleApiService"
ref=
"haobanRoleApiServiceImpl"
/>
...
...
haoban-manage3-service/src/main/resources/mapper/
TabHaobanRole
MenuMapper.xml
→
haoban-manage3-service/src/main/resources/mapper/
role/TabHaoban
MenuMapper.xml
View file @
3b70e81b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.gic.haoban.manage.service.dao.mapper.role.TabHaoban
Role
MenuMapper"
>
<mapper
namespace=
"com.gic.haoban.manage.service.dao.mapper.role.TabHaobanMenuMapper"
>
<resultMap
type=
"com.gic.haoban.manage.service.entity.role.TabHaoban
RoleMenu"
id=
"TabHaobanRole
MenuMap"
>
<resultMap
type=
"com.gic.haoban.manage.service.entity.role.TabHaoban
Menu"
id=
"TabHaoban
MenuMap"
>
<result
property=
"menuId"
column=
"menu_id"
jdbcType=
"INTEGER"
/>
<result
property=
"menuCode"
column=
"menu_code"
jdbcType=
"VARCHAR"
/>
<result
property=
"menuName"
column=
"menu_name"
jdbcType=
"VARCHAR"
/>
...
...
@@ -12,36 +12,37 @@
<result
property=
"menuType"
column=
"menu_type"
jdbcType=
"INTEGER"
/>
<result
property=
"menuSort"
column=
"menu_sort"
jdbcType=
"INTEGER"
/>
<result
property=
"parentCode"
column=
"parent_code"
jdbcType=
"VARCHAR"
/>
<result
property=
"customFlag"
column=
"custom_flag"
jdbcType=
"INTEGER"
/>
<result
property=
"statusFlag"
column=
"status_flag"
jdbcType=
"INTEGER"
/>
<result
property=
"createTime"
column=
"create_time"
jdbcType=
"TIMESTAMP"
/>
<result
property=
"updateTime"
column=
"update_time"
jdbcType=
"TIMESTAMP"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,
create_time, update_time
menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,
custom_flag, create_time, update_time
</sql>
<!--查询单个-->
<select
id=
"queryById"
resultMap=
"TabHaoban
Role
MenuMap"
>
<select
id=
"queryById"
resultMap=
"TabHaobanMenuMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_
role_
menu
from tab_haoban_menu
where menu_id = #{menuId}
</select>
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
"menuId"
useGeneratedKeys=
"true"
>
insert into tab_haoban_
role_menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status
_flag, create_time, update_time)
values (#{menuId}, #{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuLevel}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag}, #{createTime}, #{updateTime})
insert into tab_haoban_
menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type, menu_sort, parent_code, status_flag,custom
_flag, create_time, update_time)
values (#{menuId}, #{menuCode}, #{menuName}, #{menuUrl}, #{iconUrl}, #{menuLevel}, #{menuType}, #{menuSort}, #{parentCode}, #{statusFlag},
#{customFlag},
#{createTime}, #{updateTime})
</insert>
<insert
id=
"insertBatch"
keyProperty=
"menuId"
useGeneratedKeys=
"true"
>
insert into tab_haoban_
role_
menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type,
menu_sort, parent_code, status_flag, create_time, update_time)
insert into tab_haoban_menu(menu_id, menu_code, menu_name, menu_url, icon_url, menu_level, menu_type,
menu_sort, parent_code, status_flag,
custom_flag,
create_time, update_time)
values
<foreach
collection=
"entities"
item=
"entity"
separator=
","
>
(#{entity.menuId}, #{entity.menuCode}, #{entity.menuName}, #{entity.menuUrl}, #{entity.iconUrl},
#{entity.menuLevel}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode}, #{entity.statusFlag},
#{entity.menuLevel}, #{entity.menuType}, #{entity.menuSort}, #{entity.parentCode}, #{entity.statusFlag},
#{entity.customFlag},
#{entity.createTime}, #{entity.updateTime})
</foreach>
</insert>
...
...
@@ -49,7 +50,7 @@
<!--通过主键修改数据-->
<update
id=
"update"
>
update tab_haoban_
role_
menu
update tab_haoban_menu
<set>
<if
test=
"menuCode != null and menuCode != ''"
>
menu_code = #{menuCode},
...
...
@@ -78,6 +79,9 @@
<if
test=
"statusFlag != null"
>
status_flag = #{statusFlag},
</if>
<if
test=
"customFlag != null"
>
custom_flag = #{customFlag},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
...
...
@@ -89,10 +93,10 @@
</update>
<select
id=
"getAllMenuList"
resultMap=
"TabHaoban
Role
MenuMap"
>
<select
id=
"getAllMenuList"
resultMap=
"TabHaobanMenuMap"
>
select
<include
refid=
"Base_Column_List"
/>
from tab_haoban_
role_
menu
from tab_haoban_menu
where status_flag = 1 order by menu_sort
</select>
...
...
haoban-manage3-service/src/main/resources/mapper/TabHaobanRoleMapper.xml
→
haoban-manage3-service/src/main/resources/mapper/
role/
TabHaobanRoleMapper.xml
View file @
3b70e81b
...
...
@@ -5,8 +5,6 @@
<resultMap
type=
"com.gic.haoban.manage.service.entity.role.TabHaobanRole"
id=
"TabHaobanRoleMap"
>
<result
property=
"roleId"
column=
"role_id"
jdbcType=
"INTEGER"
/>
<result
property=
"roleName"
column=
"role_name"
jdbcType=
"VARCHAR"
/>
<result
property=
"menuId"
column=
"menu_id"
jdbcType=
"INTEGER"
/>
<result
property=
"menuCode"
column=
"menu_code"
jdbcType=
"VARCHAR"
/>
<result
property=
"clerkType"
column=
"clerk_type"
jdbcType=
"INTEGER"
/>
<result
property=
"wxEnterpriseId"
column=
"wx_enterprise_id"
jdbcType=
"VARCHAR"
/>
<result
property=
"enterpriseId"
column=
"enterprise_id"
jdbcType=
"VARCHAR"
/>
...
...
@@ -20,7 +18,7 @@
</resultMap>
<sql
id=
"Base_Column_List"
>
role_id, role_name,
menu_id, menu_code, clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time
role_id, role_name,
clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time
</sql>
<!--查询单个-->
...
...
@@ -33,16 +31,16 @@
<!--新增所有列-->
<insert
id=
"insert"
keyProperty=
"roleId"
useGeneratedKeys=
"true"
>
insert into tab_haoban_role(role_id, role_name,
menu_id, menu_code,
clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
values (#{roleId}, #{roleName}, #{
menuId}, #{menuCode}, #{
clerkType}, #{wxEnterpriseId}, #{enterpriseId}, #{creatorId}, #{creatorName}, #{modifierId}, #{modifierName}, #{statusFlag}, #{createTime}, #{updateTime})
insert into tab_haoban_role(role_id, role_name, clerk_type, wx_enterprise_id, enterprise_id, creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
values (#{roleId}, #{roleName}, #{clerkType}, #{wxEnterpriseId}, #{enterpriseId}, #{creatorId}, #{creatorName}, #{modifierId}, #{modifierName}, #{statusFlag}, #{createTime}, #{updateTime})
</insert>
<insert
id=
"insertBatch"
keyProperty=
"roleId"
useGeneratedKeys=
"true"
>
insert into tab_haoban_role(role_id, role_name,
menu_id, menu_code,
clerk_type, wx_enterprise_id, enterprise_id,
insert into tab_haoban_role(role_id, role_name, clerk_type, wx_enterprise_id, enterprise_id,
creator_id, creator_name, modifier_id, modifier_name, status_flag, create_time, update_time)
values
<foreach
collection=
"entities"
item=
"entity"
separator=
","
>
(#{entity.roleId}, #{entity.roleName}, #{entity.
menuId}, #{entity.menuCode}, #{entity.
clerkType},
(#{entity.roleId}, #{entity.roleName}, #{entity.clerkType},
#{entity.wxEnterpriseId}, #{entity.enterpriseId}, #{entity.creatorId}, #{entity.creatorName},
#{entity.modifierId}, #{entity.modifierName}, #{entity.statusFlag}, #{entity.createTime},
#{entity.updateTime})
...
...
@@ -57,12 +55,6 @@
<if
test=
"roleName != null and roleName != ''"
>
role_name = #{roleName},
</if>
<if
test=
"menuId != null"
>
menu_id = #{menuId},
</if>
<if
test=
"menuCode != null and menuCode != ''"
>
menu_code = #{menuCode},
</if>
<if
test=
"clerkType != null"
>
clerk_type = #{clerkType},
</if>
...
...
@@ -103,8 +95,45 @@
<include
refid=
"Base_Column_List"
/>
from tab_haoban_role
where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId}
and clerk_type = #{clerkType}
and enterprise_id = #{enterpriseId}
and clerk_type = #{clerkType}
</select>
<select
id=
"queryByMenuIds"
resultType=
"java.lang.Long"
>
select
role_id
from tab_haoban_role
where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId}
and clerk_type = #{clerkType}
and menu_id in
<foreach
collection=
"menuIds"
item=
"id"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{id,jdbcType=VARCHAR}
</foreach>
</select>
<select
id=
"queryByUnMenuIds"
resultType=
"java.lang.Long"
>
select
role_id
from tab_haoban_role
where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId}
and clerk_type = #{clerkType}
and menu_id not in
<foreach
collection=
"menuIds"
item=
"id"
index=
"index"
open=
"("
close=
")"
separator=
","
>
#{id,jdbcType=VARCHAR}
</foreach>
</select>
<select
id=
"queryByMenuId"
resultType=
"java.lang.Long"
>
select
role_id
from tab_haoban_role
where wx_enterprise_id = #{wxEnterpriseId}
and enterprise_id = #{enterpriseId}
and clerk_type = #{clerkType}
and menu_id = #{menuId}
</select>
</mapper>
...
...
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/HaobanRoleController.java
0 → 100644
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO
;
import
com.gic.haoban.manage.api.dto.role.HaobanMenuDTO
;
import
com.gic.haoban.manage.api.service.role.HaobanMenuApiService
;
import
com.gic.haoban.manage.api.service.role.HaobanRoleApiService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
/**
* @author mozhu
* @date 2022/9/7 3:03 下午
*/
@RestController
@RequestMapping
(
"/role"
)
public
class
HaobanRoleController
extends
WebBaseController
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
HaobanRoleController
.
class
);
@Autowired
private
HaobanRoleApiService
haobanRoleApiService
;
@Autowired
private
HaobanMenuApiService
haobanMenuApiService
;
@RequestMapping
(
value
=
"/add"
,
method
=
RequestMethod
.
POST
)
private
RestResponse
add
(
@RequestBody
HaobanRoleQDTO
haobanRoleQDTO
)
{
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
haobanRoleApiService
.
add
(
haobanRoleQDTO
,
login
);
return
RestResponse
.
successResult
();
}
@RequestMapping
(
value
=
"/edit"
,
method
=
RequestMethod
.
POST
)
private
RestResponse
edit
(
@RequestBody
HaobanRoleQDTO
haobanRoleQDTO
)
{
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
return
RestResponse
.
successResult
(
haobanRoleApiService
.
edit
(
haobanRoleQDTO
,
login
));
}
@RequestMapping
(
value
=
"/queryMenuByClerkType"
,
method
=
RequestMethod
.
GET
)
private
RestResponse
queryMenuByClerkType
()
{
WebLoginDTO
login
=
AuthWebRequestUtil
.
getLoginUser
();
return
RestResponse
.
successResult
();
}
@RequestMapping
(
"/getMenuTreeList"
)
private
RestResponse
<
List
<
HaobanMenuDTO
>>
getMenuTreeList
()
{
ServiceResponse
<
List
<
HaobanMenuDTO
>>
serviceMenuTreeList
=
haobanMenuApiService
.
getMenuTreeList
();
return
RestResponse
.
successResult
(
serviceMenuTreeList
.
getResult
());
}
}
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/logrecord/HbLogRecordController.java
View file @
3b70e81b
package
com
.
gic
.
haoban
.
manage
.
web
.
controller
.
logrecord
;
import
com.alibaba.fastjson.JSON
;
import
com.gic.api.base.commons.BasePageInfo
;
import
com.gic.api.base.commons.Page
;
import
com.gic.api.base.commons.ServiceResponse
;
import
com.gic.commons.webapi.reponse.RestResponse
;
import
com.gic.dsmongo.api.dto.DocumentResultDTO
;
import
com.gic.dsmongo.api.dto.QueryDocDTO
;
import
com.gic.dsmongo.api.service.MongoOperationService
;
import
com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO
;
import
com.gic.haoban.common.utils.AuthWebRequestUtil
;
import
com.gic.haoban.manage.web.qo.logrecord.LogRecordQo
;
import
com.gic.haoban.manage.web.vo.logrecord.LogRecordTypeVO
;
import
com.gic.log.record.bean.GicLogRecordBean
;
import
com.gic.log.record.bean.OptRecordLog
;
import
com.gic.log.record.enums.OrderEnum
;
import
com.gic.log.record.service.LogSearchApiService
;
import
com.gic.log.record.util.GicLogRecordCategoryEnum
;
import
com.gic.log.record.util.GicLogRecordOptTypeEnum
;
import
com.gic.log.record.util.LogCommenUtil
;
import
com.gic.log.record.util.LogQueryWrapper
;
import
com.mongodb.BasicDBObject
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.lang3.time.DateUtils
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.bson.conversions.Bson
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Objects
;
@Controller
@RequestMapping
(
"/log-record"
)
...
...
haoban-manage3-web/src/main/webapp/WEB-INF/dubbo-haoban-manage-web.xml
View file @
3b70e81b
...
...
@@ -120,4 +120,6 @@
<dubbo:reference
id=
"logSearchApiService"
interface=
"com.gic.log.record.service.LogSearchApiService"
timeout=
"10000"
retries=
"0"
check=
"false"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.fee.HaobanQywxFeeApiService"
id=
"haobanQywxFeeApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.ValidationCodeApiService"
id=
"validationCodeApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.role.HaobanRoleApiService"
id=
"haobanRoleApiService"
/>
<dubbo:reference
interface=
"com.gic.haoban.manage.api.service.role.HaobanMenuApiService"
id=
"haobanMenuApiService"
/>
</beans>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment