opencode/vben-java
1
0
Fork 0
forked from gitee/vben-java
Code Pull Requests Activity

组织架构与权限管理扁平化

Browse Source
This commit is contained in:
vben
2025-12-22 14:42:56 +08:00
parent 66fe29c7dd
commit 3d832fb22c
101 changed files with 948 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vben-apps/vben-admin/src/main/resources/vms/route/route.sql.vm
+2 -2
View File
@@ -1,7 +1,7 @@
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}',999991,null,'sys','M','${table.bunam}','ele-Tickets','/${table.name.replace("_","/")}','/${table.name.replace("_","/")}/index',0,1,1,0,'${table.remark}清单','sa',1);
#if($table.edtyp=="tab")
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}Edit',999992,null,'sys','M','${table.bunam}Edit','ele-Tickets','/${table.name.replace("_","/")}/edit','/${table.name.replace("_","/")}/edit',0,1,0,0,'${table.remark}编辑','sa',1);
#end
vben-apps/vben-jpa/src/main/resources/vms/route/route.sql.vm
+2 -2
View File
@@ -1,7 +1,7 @@
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}',999991,null,'sys','M','${table.bunam}','ele-Tickets','/${table.name.replace("_","/")}','/${table.name.replace("_","/")}/index',0,1,1,0,'${table.remark}清单','sa',1);
#if($table.edtyp=="tab")
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}Edit',999992,null,'sys','M','${table.bunam}Edit','ele-Tickets','/${table.name.replace("_","/")}/edit','/${table.name.replace("_","/")}/edit',0,1,0,0,'${table.remark}编辑','sa',1);
#end
vben-apps/vben-mybatis/src/main/resources/vms/route/route.sql.vm
+2 -2
View File
@@ -1,7 +1,7 @@
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}',999991,null,'sys','M','${table.bunam}','ele-Tickets','/${table.name.replace("_","/")}','/${table.name.replace("_","/")}/index',0,1,1,0,'${table.remark}清单','sa',1);
#if($table.edtyp=="tab")
insert into sys_perm_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
insert into sys_menu (id,ornum,pid,porid,type,code,icon,path,comp,extag,catag,shtag,iftag,name,crman,avtag)
values ('${table.bunam}Edit',999992,null,'sys','M','${table.bunam}Edit','ele-Tickets','/${table.name.replace("_","/")}/edit','/${table.name.replace("_","/")}/edit',0,1,0,0,'${table.remark}编辑','sa',1);
#end
vben-apps/vben-setup/src/main/java/vben/setup/demo/root/DemoInitService.java
+32 -32
View File
@@ -3,10 +3,10 @@ package vben.setup.demo.root;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.setup.sys.perm.api.SysPermApiEntity;
import vben.setup.sys.perm.api.SysPermApiRepo;
import vben.setup.sys.perm.menu.SysPermMenuEntity;
import vben.setup.sys.perm.menu.SysPermMenuRepo;
import vben.setup.sys.api.SysApiEntity;
import vben.setup.sys.api.SysApiRepo;
import vben.setup.sys.menu.SysMenuEntity;
import vben.setup.sys.menu.SysMenuRepo;
import java.util.ArrayList;
import java.util.List;
@@ -19,13 +19,13 @@ import java.util.List;
@Transactional
public class DemoInitService {
private final SysPermMenuRepo menuRrepo;
private final SysMenuRepo menuRrepo;
private final SysPermApiRepo apiRepo;
private final SysApiRepo apiRepo;
public void init() {
List<SysPermMenuEntity> menuList = new ArrayList<>();
SysPermMenuEntity m8000 = new SysPermMenuEntity();
List<SysMenuEntity> menuList = new ArrayList<>();
SysMenuEntity m8000 = new SysMenuEntity();
m8000.setId(8000L);
m8000.setIcon("hugeicons:star");
m8000.setName("使用案例");
@@ -36,7 +36,7 @@ public class DemoInitService {
m8000.setComp("Layout");
menuList.add(m8000);
SysPermMenuEntity m8010 = new SysPermMenuEntity();
SysMenuEntity m8010 = new SysMenuEntity();
m8010.setId(8010L);
m8010.setComp("demo/single/main/index");
m8010.setIcon("pajamas:work-item-requirement");
@@ -46,7 +46,7 @@ public class DemoInitService {
m8010.setPid(8000L);
menuList.add(m8010);
SysPermMenuEntity m8020 = new SysPermMenuEntity();
SysMenuEntity m8020 = new SysMenuEntity();
m8020.setId(8020L);
m8020.setComp("demo/single/cate/index");
m8020.setIcon("pajamas:work-item-requirement");
@@ -56,7 +56,7 @@ public class DemoInitService {
m8020.setPid(8000L);
menuList.add(m8020);
SysPermMenuEntity m8030 = new SysPermMenuEntity();
SysMenuEntity m8030 = new SysMenuEntity();
m8030.setId(8030L);
m8030.setComp("demo/link/index");
m8030.setIcon("pajamas:work-item-requirement");
@@ -68,9 +68,9 @@ public class DemoInitService {
insertMenus(menuList);
List<SysPermApiEntity> apiList = new ArrayList<>();
List<SysApiEntity> apiList = new ArrayList<>();
SysPermApiEntity a801001 = new SysPermApiEntity();
SysApiEntity a801001 = new SysApiEntity();
a801001.setId(801001L);
a801001.setOrnum(801001);
a801001.setName("单一主表-查询");
@@ -78,7 +78,7 @@ public class DemoInitService {
a801001.setPerm("single:main:query");
apiList.add(a801001);
SysPermApiEntity a801002 = new SysPermApiEntity();
SysApiEntity a801002 = new SysApiEntity();
a801002.setId(801002L);
a801002.setOrnum(801002);
a801002.setName("单一主表-新增");
@@ -86,7 +86,7 @@ public class DemoInitService {
a801002.setPerm("single:main:add");
apiList.add(a801002);
SysPermApiEntity a801003 = new SysPermApiEntity();
SysApiEntity a801003 = new SysApiEntity();
a801003.setId(801003L);
a801003.setOrnum(801003);
a801003.setName("单一主表-修改");
@@ -94,7 +94,7 @@ public class DemoInitService {
a801003.setPerm("single:main:edit");
apiList.add(a801003);
SysPermApiEntity a801004 = new SysPermApiEntity();
SysApiEntity a801004 = new SysApiEntity();
a801004.setId(801004L);
a801004.setOrnum(801004);
a801004.setName("单一主表-删除");
@@ -102,7 +102,7 @@ public class DemoInitService {
a801004.setPerm("single:main:remove");
apiList.add(a801004);
SysPermApiEntity a802001 = new SysPermApiEntity();
SysApiEntity a802001 = new SysApiEntity();
a802001.setId(802001L);
a802001.setOrnum(802001);
a802001.setName("单一树表-查询");
@@ -110,7 +110,7 @@ public class DemoInitService {
a802001.setPerm("single:cate:query");
apiList.add(a802001);
SysPermApiEntity a802002 = new SysPermApiEntity();
SysApiEntity a802002 = new SysApiEntity();
a802002.setId(802002L);
a802002.setOrnum(802002);
a802002.setName("单一树表-新增");
@@ -118,7 +118,7 @@ public class DemoInitService {
a802002.setPerm("single:cate:add");
apiList.add(a802002);
SysPermApiEntity a802003 = new SysPermApiEntity();
SysApiEntity a802003 = new SysApiEntity();
a802003.setId(802003L);
a802003.setOrnum(802003);
a802003.setName("单一树表-修改");
@@ -126,7 +126,7 @@ public class DemoInitService {
a802003.setPerm("single:cate:edit");
apiList.add(a802003);
SysPermApiEntity a802004 = new SysPermApiEntity();
SysApiEntity a802004 = new SysApiEntity();
a802004.setId(802004L);
a802004.setOrnum(802004);
a802004.setName("单一树表-删除");
@@ -134,7 +134,7 @@ public class DemoInitService {
a802004.setPerm("single:cate:remove");
apiList.add(a802004);
SysPermApiEntity a803001 = new SysPermApiEntity();
SysApiEntity a803001 = new SysApiEntity();
a803001.setId(803001L);
a803001.setOrnum(803001);
a803001.setName("关联主表-查询");
@@ -142,7 +142,7 @@ public class DemoInitService {
a803001.setPerm("link:main:query");
apiList.add(a803001);
SysPermApiEntity a803002 = new SysPermApiEntity();
SysApiEntity a803002 = new SysApiEntity();
a803002.setId(803002L);
a803002.setOrnum(803002);
a803002.setName("关联主表-新增");
@@ -150,7 +150,7 @@ public class DemoInitService {
a803002.setPerm("link:main:add");
apiList.add(a803002);
SysPermApiEntity a803003 = new SysPermApiEntity();
SysApiEntity a803003 = new SysApiEntity();
a803003.setId(803003L);
a803003.setOrnum(803003);
a803003.setName("关联主表-修改");
@@ -158,7 +158,7 @@ public class DemoInitService {
a803003.setPerm("link:main:edit");
apiList.add(a803003);
SysPermApiEntity a803004 = new SysPermApiEntity();
SysApiEntity a803004 = new SysApiEntity();
a803004.setId(803004L);
a803004.setOrnum(803004);
a803004.setName("关联主表-删除");
@@ -166,7 +166,7 @@ public class DemoInitService {
a803004.setPerm("link:main:remove");
apiList.add(a803004);
SysPermApiEntity a803011 = new SysPermApiEntity();
SysApiEntity a803011 = new SysApiEntity();
a803011.setId(803011L);
a803011.setOrnum(803011);
a803011.setName("关联树表-查询");
@@ -174,7 +174,7 @@ public class DemoInitService {
a803011.setPerm("link:cate:query");
apiList.add(a803011);
SysPermApiEntity a803012 = new SysPermApiEntity();
SysApiEntity a803012 = new SysApiEntity();
a803012.setId(803012L);
a803012.setOrnum(803012);
a803012.setName("关联树表-新增");
@@ -182,7 +182,7 @@ public class DemoInitService {
a803012.setPerm("link:cate:add");
apiList.add(a803012);
SysPermApiEntity a803013 = new SysPermApiEntity();
SysApiEntity a803013 = new SysApiEntity();
a803013.setId(803013L);
a803013.setOrnum(803013);
a803013.setName("关联树表-修改");
@@ -190,7 +190,7 @@ public class DemoInitService {
a803013.setPerm("link:cate:edit");
apiList.add(a803013);
SysPermApiEntity a803014 = new SysPermApiEntity();
SysApiEntity a803014 = new SysApiEntity();
a803014.setId(803014L);
a803014.setOrnum(803014);
a803014.setName("关联树表-删除");
@@ -202,8 +202,8 @@ public class DemoInitService {
}
private void insertMenus(List<SysPermMenuEntity> list) {
for (SysPermMenuEntity main : list) {
private void insertMenus(List<SysMenuEntity> list) {
for (SysMenuEntity main : list) {
main.setAvtag(true);
if(main.getCatag()==null){
main.setCatag(false);
@@ -222,8 +222,8 @@ public class DemoInitService {
menuRrepo.saveAll(list);
}
private void insertApis(List<SysPermApiEntity> list) {
for (SysPermApiEntity api : list) {
private void insertApis(List<SysApiEntity> list) {
for (SysApiEntity api : list) {
api.setAvtag(true);
api.setUptim(api.getCrtim());
}
vben-apps/vben-setup/src/main/java/vben/setup/root/DataInitService.java
+14 -14
View File
@@ -7,13 +7,13 @@ import vben.setup.bpm.bus.BpmBusInitService;
import vben.setup.demo.root.DemoInitService;
import vben.setup.sys.config.SysConfigInitService;
import vben.setup.sys.notice.SysNoticeInitService;
import vben.setup.sys.org.dept.SysOrgDeptInitService;
import vben.setup.sys.org.group.SysOrgGroupInitService;
import vben.setup.sys.org.post.SysOrgPostInitService;
import vben.setup.sys.org.user.SysOrgUserInitService;
import vben.setup.sys.perm.api.SysPermApiInitService;
import vben.setup.sys.perm.menu.SysPermMenuInitService;
import vben.setup.sys.perm.role.SysPermRoleInitService;
import vben.setup.sys.dept.SysDeptInitService;
import vben.setup.sys.group.SysGroupInitService;
import vben.setup.sys.post.SysPostInitService;
import vben.setup.sys.user.SysUserInitService;
import vben.setup.sys.api.SysApiInitService;
import vben.setup.sys.menu.SysMenuInitService;
import vben.setup.sys.role.SysRoleInitService;
import vben.setup.tool.dict.ToolDictInitService;
import vben.setup.tool.num.ToolNumInitService;
@@ -55,19 +55,19 @@ public class DataInitService {
private final JdbcHelper jdbcHelper;
private final SysOrgDeptInitService deptInitService;
private final SysDeptInitService deptInitService;
private final SysOrgUserInitService userInitService;
private final SysUserInitService userInitService;
private final SysOrgPostInitService postInitService;
private final SysPostInitService postInitService;
private final SysOrgGroupInitService groupInitService;
private final SysGroupInitService groupInitService;
private final SysPermMenuInitService menuInitService;
private final SysMenuInitService menuInitService;
private final SysPermApiInitService apiInitService;
private final SysApiInitService apiInitService;
private final SysPermRoleInitService roleInitService;
private final SysRoleInitService roleInitService;
private final SysConfigInitService configInitService;
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/api/SysApiEntity.java
+5 -5
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.perm.api;
package vben.setup.sys.api;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -11,9 +11,9 @@ import java.util.Date;
@Data
@Entity
@Table(name = "sys_perm_api")
@Table(name = "sys_api")
@Schema(description = "权限接口")
public class SysPermApiEntity {
public class SysApiEntity {
/**
* 主键ID
@@ -91,11 +91,11 @@ public class SysPermApiEntity {
@Schema(description = "更新时间")
private Date uptim;
public SysPermApiEntity() {
public SysApiEntity() {
}
public SysPermApiEntity(Long id) {
public SysApiEntity(Long id) {
this.id = id;
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/api/SysApiInitService.java
+90 -90
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.perm.api;
package vben.setup.sys.api;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
@@ -13,220 +13,220 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysPermApiInitService {
public class SysApiInitService {
public void initBase() {
List<SysPermApiEntity> list = new ArrayList<>();
List<SysApiEntity> list = new ArrayList<>();
SysPermApiEntity a101001 = new SysPermApiEntity();
SysApiEntity a101001 = new SysApiEntity();
a101001.setId(101001L);
a101001.setOrnum(101001);
a101001.setName("部门查询");
a101001.setMenid(1010L);
a101001.setPerm("sysorg:dept:query");
a101001.setPerm("sys:dept:query");
list.add(a101001);
SysPermApiEntity a101002 = new SysPermApiEntity();
SysApiEntity a101002 = new SysApiEntity();
a101002.setId(101002L);
a101002.setOrnum(101002);
a101002.setName("部门编辑");
a101002.setMenid(1010L);
a101002.setPerm("sysorg:dept:edit");
a101002.setPerm("sys:dept:edit");
list.add(a101002);
SysPermApiEntity a101003 = new SysPermApiEntity();
SysApiEntity a101003 = new SysApiEntity();
a101003.setId(101003L);
a101003.setOrnum(101003);
a101003.setName("部门删除");
a101003.setMenid(1010L);
a101003.setPerm("sysorg:dept:delete");
a101003.setPerm("sys:dept:delete");
list.add(a101003);
SysPermApiEntity a102001 = new SysPermApiEntity();
SysApiEntity a102001 = new SysApiEntity();
a102001.setId(102001L);
a102001.setOrnum(102001);
a102001.setName("用户查询");
a102001.setMenid(1020L);
a102001.setPerm("sysorg:user:query");
a102001.setPerm("sys:user:query");
list.add(a102001);
SysPermApiEntity a102002 = new SysPermApiEntity();
SysApiEntity a102002 = new SysApiEntity();
a102002.setId(102002L);
a102002.setOrnum(102002);
a102002.setName("用户编辑");
a102002.setMenid(1020L);
a102002.setPerm("sysorg:user:edit");
a102002.setPerm("sys:user:edit");
list.add(a102002);
SysPermApiEntity a102003 = new SysPermApiEntity();
SysApiEntity a102003 = new SysApiEntity();
a102003.setId(102003L);
a102003.setOrnum(102003);
a102003.setName("用户删除");
a102003.setMenid(1020L);
a102003.setPerm("sysorg:user:delete");
a102003.setPerm("sys:user:delete");
list.add(a102003);
SysPermApiEntity a102004 = new SysPermApiEntity();
SysApiEntity a102004 = new SysApiEntity();
a102004.setId(102004L);
a102004.setOrnum(102004);
a102004.setName("用户启用禁用");
a102004.setMenid(1020L);
a102004.setPerm("sysorg:user:avtag");
a102004.setPerm("sys:user:avtag");
list.add(a102004);
SysPermApiEntity a102005 = new SysPermApiEntity();
SysApiEntity a102005 = new SysApiEntity();
a102005.setId(102005L);
a102005.setOrnum(102005);
a102005.setName("用户密码修改");
a102005.setMenid(1020L);
a102005.setPerm("sysorg:user:pacod");
a102005.setPerm("sys:user:pacod");
list.add(a102005);
SysPermApiEntity a103001 = new SysPermApiEntity();
SysApiEntity a103001 = new SysApiEntity();
a103001.setId(103001L);
a103001.setOrnum(103001);
a103001.setName("岗位查询");
a103001.setMenid(1030L);
a103001.setPerm("sysorg:post:query");
a103001.setPerm("sys:post:query");
list.add(a103001);
SysPermApiEntity a103002 = new SysPermApiEntity();
SysApiEntity a103002 = new SysApiEntity();
a103002.setId(103002L);
a103002.setOrnum(103002);
a103002.setName("岗位编辑");
a103002.setMenid(1030L);
a103002.setPerm("sysorg:post:edit");
a103002.setPerm("sys:post:edit");
list.add(a103002);
SysPermApiEntity a103003 = new SysPermApiEntity();
SysApiEntity a103003 = new SysApiEntity();
a103003.setId(103003L);
a103003.setOrnum(103003);
a103003.setName("岗位删除");
a103003.setMenid(1030L);
a103003.setPerm("sysorg:post:delete");
a103003.setPerm("sys:post:delete");
list.add(a103003);
SysPermApiEntity a104001 = new SysPermApiEntity();
SysApiEntity a104001 = new SysApiEntity();
a104001.setId(104001L);
a104001.setOrnum(104001);
a104001.setName("群组查询");
a104001.setMenid(1040L);
a104001.setPerm("sysorg:group:query");
a104001.setPerm("sys:group:query");
list.add(a104001);
SysPermApiEntity a104002 = new SysPermApiEntity();
SysApiEntity a104002 = new SysApiEntity();
a104002.setId(104002L);
a104002.setOrnum(104002);
a104002.setName("群组编辑");
a104002.setMenid(1040L);
a104002.setPerm("sysorg:group:edit");
a104002.setPerm("sys:group:edit");
list.add(a104002);
SysPermApiEntity a104003 = new SysPermApiEntity();
SysApiEntity a104003 = new SysApiEntity();
a104003.setId(104003L);
a104003.setOrnum(104003);
a104003.setName("群组删除");
a104003.setMenid(1040L);
a104003.setPerm("sysorg:group:delete");
a104003.setPerm("sys:group:delete");
list.add(a104003);
SysPermApiEntity a104004 = new SysPermApiEntity();
SysApiEntity a104004 = new SysApiEntity();
a104004.setId(104004L);
a104004.setOrnum(104004);
a104004.setName("群组分类查询");
a104004.setMenid(1040L);
a104004.setPerm("sysorg:groupc:query");
a104004.setPerm("sys:groupc:query");
list.add(a104004);
SysPermApiEntity a104005 = new SysPermApiEntity();
SysApiEntity a104005 = new SysApiEntity();
a104005.setId(104005L);
a104005.setOrnum(104005);
a104005.setName("群组分类编辑");
a104005.setMenid(1040L);
a104005.setPerm("sysorg:groupc:edit");
a104005.setPerm("sys:groupc:edit");
list.add(a104005);
SysPermApiEntity a104006 = new SysPermApiEntity();
SysApiEntity a104006 = new SysApiEntity();
a104006.setId(104006L);
a104006.setOrnum(104006);
a104006.setName("群组分类删除");
a104006.setMenid(1040L);
a104006.setPerm("sysorg:groupc:delete");
a104006.setPerm("sys:groupc:delete");
list.add(a104006);
SysPermApiEntity a105001 = new SysPermApiEntity();
SysApiEntity a105001 = new SysApiEntity();
a105001.setId(105001L);
a105001.setOrnum(105001);
a105001.setName("菜单查询");
a105001.setMenid(1050L);
a105001.setPerm("sysperm:menu:query");
a105001.setPerm("sys:menu:query");
list.add(a105001);
SysPermApiEntity a105002 = new SysPermApiEntity();
SysApiEntity a105002 = new SysApiEntity();
a105002.setId(105002L);
a105002.setOrnum(105002);
a105002.setName("菜单编辑");
a105002.setMenid(1050L);
a105002.setPerm("sysperm:menu:edit");
a105002.setPerm("sys:menu:edit");
list.add(a105002);
SysPermApiEntity a105003 = new SysPermApiEntity();
SysApiEntity a105003 = new SysApiEntity();
a105003.setId(105003L);
a105003.setOrnum(105003);
a105003.setName("菜单删除");
a105003.setMenid(1050L);
a105003.setPerm("sysperm:menu:delete");
a105003.setPerm("sys:menu:delete");
list.add(a105003);
SysPermApiEntity a106001 = new SysPermApiEntity();
SysApiEntity a106001 = new SysApiEntity();
a106001.setId(106001L);
a106001.setOrnum(106001);
a106001.setName("接口查询");
a106001.setMenid(1060L);
a106001.setPerm("sysperm:api:query");
a106001.setPerm("sys:api:query");
list.add(a106001);
SysPermApiEntity a106002 = new SysPermApiEntity();
SysApiEntity a106002 = new SysApiEntity();
a106002.setId(106002L);
a106002.setOrnum(106002);
a106002.setName("接口编辑");
a106002.setMenid(1060L);
a106002.setPerm("sysperm:api:edit");
a106002.setPerm("sys:api:edit");
list.add(a106002);
SysPermApiEntity a106003 = new SysPermApiEntity();
SysApiEntity a106003 = new SysApiEntity();
a106003.setId(106003L);
a106003.setOrnum(106003);
a106003.setName("接口删除");
a106003.setMenid(1060L);
a106003.setPerm("sysperm:api:delete");
a106003.setPerm("sys:api:delete");
list.add(a106003);
SysPermApiEntity a107001 = new SysPermApiEntity();
SysApiEntity a107001 = new SysApiEntity();
a107001.setId(107001L);
a107001.setOrnum(107001);
a107001.setName("角色查询");
a107001.setMenid(1070L);
a107001.setPerm("sysperm:role:query");
a107001.setPerm("sys:role:query");
list.add(a107001);
SysPermApiEntity a107002 = new SysPermApiEntity();
SysApiEntity a107002 = new SysApiEntity();
a107002.setId(107002L);
a107002.setOrnum(107002);
a107002.setName("角色编辑");
a107002.setMenid(1070L);
a107002.setPerm("sysperm:role:edit");
a107002.setPerm("sys:role:edit");
list.add(a107002);
SysPermApiEntity a107003 = new SysPermApiEntity();
SysApiEntity a107003 = new SysApiEntity();
a107003.setId(107003L);
a107003.setOrnum(107003);
a107003.setName("角色删除");
a107003.setMenid(1070L);
a107003.setPerm("sysperm:role:delete");
a107003.setPerm("sys:role:delete");
list.add(a107003);
SysPermApiEntity a108001 = new SysPermApiEntity();
SysApiEntity a108001 = new SysApiEntity();
a108001.setId(108001L);
a108001.setOrnum(108001);
a108001.setName("参数查询");
@@ -234,7 +234,7 @@ public class SysPermApiInitService {
a108001.setPerm("sys:config:query");
list.add(a108001);
SysPermApiEntity a108002 = new SysPermApiEntity();
SysApiEntity a108002 = new SysApiEntity();
a108002.setId(108002L);
a108002.setOrnum(108002);
a108002.setName("参数编辑");
@@ -242,7 +242,7 @@ public class SysPermApiInitService {
a108002.setPerm("sys:config:edit");
list.add(a108002);
SysPermApiEntity a108003 = new SysPermApiEntity();
SysApiEntity a108003 = new SysApiEntity();
a108003.setId(108003L);
a108003.setOrnum(108003);
a108003.setName("参数删除");
@@ -250,7 +250,7 @@ public class SysPermApiInitService {
a108003.setPerm("sys:config:delete");
list.add(a108003);
SysPermApiEntity a109001 = new SysPermApiEntity();
SysApiEntity a109001 = new SysApiEntity();
a109001.setId(109001L);
a109001.setOrnum(109001);
a109001.setName("通知查询");
@@ -258,7 +258,7 @@ public class SysPermApiInitService {
a109001.setPerm("sys:notice:query");
list.add(a109001);
SysPermApiEntity a109002 = new SysPermApiEntity();
SysApiEntity a109002 = new SysApiEntity();
a109002.setId(109002L);
a109002.setOrnum(109002);
a109002.setName("通知编辑");
@@ -266,7 +266,7 @@ public class SysPermApiInitService {
a109002.setPerm("sys:notice:edit");
list.add(a109002);
SysPermApiEntity a109003 = new SysPermApiEntity();
SysApiEntity a109003 = new SysApiEntity();
a109003.setId(109003L);
a109003.setOrnum(109003);
a109003.setName("通知删除");
@@ -274,7 +274,7 @@ public class SysPermApiInitService {
a109003.setPerm("sys:notice:delete");
list.add(a109003);
SysPermApiEntity a201001 = new SysPermApiEntity();
SysApiEntity a201001 = new SysApiEntity();
a201001.setId(201001L);
a201001.setOrnum(201001);
a201001.setName("在线用户查询");
@@ -282,7 +282,7 @@ public class SysPermApiInitService {
a201001.setPerm("mon:online:query");
list.add(a201001);
SysPermApiEntity a201002 = new SysPermApiEntity();
SysApiEntity a201002 = new SysApiEntity();
a201002.setId(201002L);
a201002.setOrnum(201002);
a201002.setName("在线用户强退");
@@ -290,7 +290,7 @@ public class SysPermApiInitService {
a201002.setPerm("mon:online:delete");
list.add(a201002);
SysPermApiEntity a202001 = new SysPermApiEntity();
SysApiEntity a202001 = new SysApiEntity();
a202001.setId(202001L);
a202001.setOrnum(202001);
a202001.setName("登录日志查询");
@@ -298,7 +298,7 @@ public class SysPermApiInitService {
a202001.setPerm("mon:login:query");
list.add(a202001);
SysPermApiEntity a202002 = new SysPermApiEntity();
SysApiEntity a202002 = new SysApiEntity();
a202002.setId(202002L);
a202002.setOrnum(202002);
a202002.setName("登录日志删除");
@@ -306,7 +306,7 @@ public class SysPermApiInitService {
a202002.setPerm("mon:login:delete");
list.add(a202002);
SysPermApiEntity a203001 = new SysPermApiEntity();
SysApiEntity a203001 = new SysApiEntity();
a203001.setId(203001L);
a203001.setOrnum(203001);
a203001.setName("操作日志查询");
@@ -314,7 +314,7 @@ public class SysPermApiInitService {
a203001.setPerm("mon:oper:query");
list.add(a203001);
SysPermApiEntity a203002 = new SysPermApiEntity();
SysApiEntity a203002 = new SysApiEntity();
a203002.setId(203002L);
a203002.setOrnum(203002);
a203002.setName("操作日志删除");
@@ -322,7 +322,7 @@ public class SysPermApiInitService {
a203002.setPerm("mon:oper:delete");
list.add(a203002);
SysPermApiEntity a204001 = new SysPermApiEntity();
SysApiEntity a204001 = new SysApiEntity();
a204001.setId(204001L);
a204001.setOrnum(204001);
a204001.setName("服务器信息查询");
@@ -330,7 +330,7 @@ public class SysPermApiInitService {
a204001.setPerm("mon:server:query");
list.add(a204001);
SysPermApiEntity a205001 = new SysPermApiEntity();
SysApiEntity a205001 = new SysApiEntity();
a205001.setId(205001L);
a205001.setOrnum(205001);
a205001.setName("缓存信息查询");
@@ -338,7 +338,7 @@ public class SysPermApiInitService {
a205001.setPerm("mon:cache:query");
list.add(a205001);
SysPermApiEntity a206001 = new SysPermApiEntity();
SysApiEntity a206001 = new SysApiEntity();
a206001.setId(206001L);
a206001.setOrnum(206001);
a206001.setName("定时任务查询");
@@ -346,7 +346,7 @@ public class SysPermApiInitService {
a206001.setPerm("monjob:main:query");
list.add(a206001);
SysPermApiEntity a206002 = new SysPermApiEntity();
SysApiEntity a206002 = new SysApiEntity();
a206002.setId(206002L);
a206002.setOrnum(206002);
a206002.setName("定时任务修改");
@@ -354,7 +354,7 @@ public class SysPermApiInitService {
a206002.setPerm("monjob:main:edit");
list.add(a206002);
SysPermApiEntity a206003 = new SysPermApiEntity();
SysApiEntity a206003 = new SysApiEntity();
a206003.setId(206003L);
a206003.setOrnum(206003);
a206003.setName("定时任务执行");
@@ -362,7 +362,7 @@ public class SysPermApiInitService {
a206003.setPerm("monjob:main:run");
list.add(a206003);
SysPermApiEntity a206101 = new SysPermApiEntity();
SysApiEntity a206101 = new SysApiEntity();
a206101.setId(206101L);
a206101.setOrnum(206101);
a206101.setName("定时任务日志查询");
@@ -370,7 +370,7 @@ public class SysPermApiInitService {
a206101.setPerm("monjob:log:query");
list.add(a206101);
SysPermApiEntity a206102 = new SysPermApiEntity();
SysApiEntity a206102 = new SysApiEntity();
a206102.setId(206102L);
a206102.setOrnum(206102);
a206102.setName("定时任务日志删除");
@@ -378,7 +378,7 @@ public class SysPermApiInitService {
a206102.setPerm("monjob:log:delete");
list.add(a206102);
SysPermApiEntity a301001 = new SysPermApiEntity();
SysApiEntity a301001 = new SysApiEntity();
a301001.setId(301001L);
a301001.setOrnum(301001);
a301001.setName("字典查询");
@@ -386,7 +386,7 @@ public class SysPermApiInitService {
a301001.setPerm("tooldict:main:query");
list.add(a301001);
SysPermApiEntity a301002 = new SysPermApiEntity();
SysApiEntity a301002 = new SysApiEntity();
a301002.setId(301002L);
a301002.setOrnum(301002);
a301002.setName("字典修改");
@@ -394,7 +394,7 @@ public class SysPermApiInitService {
a301002.setPerm("tooldict:main:edit");
list.add(a301002);
SysPermApiEntity a301003 = new SysPermApiEntity();
SysApiEntity a301003 = new SysApiEntity();
a301003.setId(301003L);
a301003.setOrnum(301003);
a301003.setName("字典删除");
@@ -402,7 +402,7 @@ public class SysPermApiInitService {
a301003.setPerm("tooldict:main:delete");
list.add(a301003);
SysPermApiEntity a301004 = new SysPermApiEntity();
SysApiEntity a301004 = new SysApiEntity();
a301004.setId(301004L);
a301004.setOrnum(301004);
a301004.setName("字典数据查询");
@@ -410,7 +410,7 @@ public class SysPermApiInitService {
a301004.setPerm("tooldict:data:query");
list.add(a301004);
SysPermApiEntity a301005 = new SysPermApiEntity();
SysApiEntity a301005 = new SysApiEntity();
a301005.setId(301005L);
a301005.setOrnum(301005);
a301005.setName("字典数据编辑");
@@ -418,7 +418,7 @@ public class SysPermApiInitService {
a301005.setPerm("tooldict:data:edit");
list.add(a301005);
SysPermApiEntity a301006 = new SysPermApiEntity();
SysApiEntity a301006 = new SysApiEntity();
a301006.setId(301006L);
a301006.setOrnum(301006);
a301006.setName("字典数据删除");
@@ -426,7 +426,7 @@ public class SysPermApiInitService {
a301006.setPerm("tooldict:data:delete");
list.add(a301006);
SysPermApiEntity a302001 = new SysPermApiEntity();
SysApiEntity a302001 = new SysApiEntity();
a302001.setId(302001L);
a302001.setOrnum(302001);
a302001.setName("编号查询");
@@ -434,7 +434,7 @@ public class SysPermApiInitService {
a302001.setPerm("tool:num:query");
list.add(a302001);
SysPermApiEntity a302002 = new SysPermApiEntity();
SysApiEntity a302002 = new SysApiEntity();
a302002.setId(302002L);
a302002.setOrnum(302002);
a302002.setName("编号编辑");
@@ -442,7 +442,7 @@ public class SysPermApiInitService {
a302002.setPerm("tool:num:edit");
list.add(a302002);
SysPermApiEntity a302003 = new SysPermApiEntity();
SysApiEntity a302003 = new SysApiEntity();
a302003.setId(302003L);
a302003.setOrnum(302003);
a302003.setName("编号删除");
@@ -454,9 +454,9 @@ public class SysPermApiInitService {
}
public void initBpm() {
List<SysPermApiEntity> list = new ArrayList<>();
List<SysApiEntity> list = new ArrayList<>();
SysPermApiEntity a603001 = new SysPermApiEntity();
SysApiEntity a603001 = new SysApiEntity();
a603001.setId(603001L);
a603001.setOrnum(603001);
a603001.setName("流程查询");
@@ -464,7 +464,7 @@ public class SysPermApiInitService {
a603001.setPerm("bpmbus:main:query");
list.add(a603001);
SysPermApiEntity a603002 = new SysPermApiEntity();
SysApiEntity a603002 = new SysApiEntity();
a603002.setId(603002L);
a603002.setOrnum(603002);
a603002.setName("流程新增");
@@ -472,7 +472,7 @@ public class SysPermApiInitService {
a603002.setPerm("bpmbus:main:add");
list.add(a603002);
SysPermApiEntity a603003 = new SysPermApiEntity();
SysApiEntity a603003 = new SysApiEntity();
a603003.setId(603003L);
a603003.setOrnum(603003);
a603003.setName("流程编辑");
@@ -484,10 +484,10 @@ public class SysPermApiInitService {
}
private final SysPermApiRepo repo;
private final SysApiRepo repo;
private void insert(List<SysPermApiEntity> list) {
for (SysPermApiEntity api : list) {
private void insert(List<SysApiEntity> list) {
for (SysApiEntity api : list) {
api.setAvtag(true);
api.setUptim(api.getCrtim());
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/api/SysApiRepo.java
+10
View File
@@ -0,0 +1,10 @@
package vben.setup.sys.api;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysApiRepo extends JpaRepository<SysApiEntity,String> {
SysApiEntity findByPerm(String perm);
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/dept/SysOrgDeptEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/dept/SysDeptEntity.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.dept;
package vben.setup.sys.dept;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -14,9 +14,9 @@ import java.util.Date;
*/
@Data
@Entity
@Table(name = "sys_org_dept")
@Table(name = "sys_dept")
@Schema(description = "组织架构-部门")
public class SysOrgDeptEntity {
public class SysDeptEntity {
/**
* 主键ID
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/dept/SysOrgDeptInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/dept/SysDeptInitService.java
+23 -23
View File
@@ -1,10 +1,10 @@
package vben.setup.sys.org.dept;
package vben.setup.sys.dept;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.org.root.SysOrgRepo;
import vben.setup.sys.org.SysOrgRepo;
import java.util.ArrayList;
import java.util.List;
@@ -15,19 +15,19 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysOrgDeptInitService {
public class SysDeptInitService {
public void init() {
List<SysOrgDeptEntity> list=new ArrayList<>();
List<SysDeptEntity> list=new ArrayList<>();
SysOrgDeptEntity dept = new SysOrgDeptEntity();
SysDeptEntity dept = new SysDeptEntity();
dept.setId("d1000");
dept.setName("XX科技");
dept.setType(1);
dept.setTier("_d1000_");
list.add(dept);
SysOrgDeptEntity dept1100 = new SysOrgDeptEntity();
SysDeptEntity dept1100 = new SysDeptEntity();
dept1100.setId("d1100");
dept1100.setName("北京分公司");
dept1100.setType(2);
@@ -35,7 +35,7 @@ public class SysOrgDeptInitService {
dept1100.setTier("_d1000_d1100_");
list.add(dept1100);
SysOrgDeptEntity dept1110 = new SysOrgDeptEntity();
SysDeptEntity dept1110 = new SysDeptEntity();
dept1110.setId("d1110");
dept1110.setName("北京分公司销售部");
dept1110.setType(8);
@@ -43,7 +43,7 @@ public class SysOrgDeptInitService {
dept1110.setTier("_d1000_d1100_d1110_");
list.add(dept1110);
SysOrgDeptEntity dept1111 = new SysOrgDeptEntity();
SysDeptEntity dept1111 = new SysDeptEntity();
dept1111.setId("d1111");
dept1111.setName("北京分公司销售部一组");
dept1111.setType(8);
@@ -51,7 +51,7 @@ public class SysOrgDeptInitService {
dept1111.setTier("_d1000_d1100_d1110_d1111_");
list.add(dept1111);
SysOrgDeptEntity dept1112 = new SysOrgDeptEntity();
SysDeptEntity dept1112 = new SysDeptEntity();
dept1112.setId("d1112");
dept1112.setName("北京分公司销售部二组");
dept1112.setType(8);
@@ -59,7 +59,7 @@ public class SysOrgDeptInitService {
dept1112.setTier("_d1000_d1100_d1110_d1112_");
list.add(dept1112);
SysOrgDeptEntity dept1120 = new SysOrgDeptEntity();
SysDeptEntity dept1120 = new SysDeptEntity();
dept1120.setId("d1120");
dept1120.setName("北京分公司人事部");
dept1120.setType(8);
@@ -67,7 +67,7 @@ public class SysOrgDeptInitService {
dept1120.setTier("_d1000_d1100_d1120_");
list.add(dept1120);
SysOrgDeptEntity dept1130 = new SysOrgDeptEntity();
SysDeptEntity dept1130 = new SysDeptEntity();
dept1130.setId("d1130");
dept1130.setName("北京分公司财务部");
dept1130.setType(8);
@@ -75,7 +75,7 @@ public class SysOrgDeptInitService {
dept1130.setTier("_d1000_d1100_d1130_");
list.add(dept1130);
SysOrgDeptEntity dept1140 = new SysOrgDeptEntity();
SysDeptEntity dept1140 = new SysDeptEntity();
dept1140.setId("d1140");
dept1140.setName("北京分公司综合部");
dept1140.setType(8);
@@ -83,7 +83,7 @@ public class SysOrgDeptInitService {
dept1140.setTier("_d1000_d1100_d1410_");
list.add(dept1140);
SysOrgDeptEntity dept1200 = new SysOrgDeptEntity();
SysDeptEntity dept1200 = new SysDeptEntity();
dept1200.setId("d1200");
dept1200.setName("上海分公司");
dept1200.setType(2);
@@ -91,7 +91,7 @@ public class SysOrgDeptInitService {
dept1200.setTier("_d1000_d1200_");
list.add(dept1200);
SysOrgDeptEntity dept1210 = new SysOrgDeptEntity();
SysDeptEntity dept1210 = new SysDeptEntity();
dept1210.setId("d1210");
dept1210.setName("上海分公司销售部");
dept1210.setType(8);
@@ -99,7 +99,7 @@ public class SysOrgDeptInitService {
dept1210.setTier("_d1000_d1200_d1210_");
list.add(dept1210);
SysOrgDeptEntity dept1220 = new SysOrgDeptEntity();
SysDeptEntity dept1220 = new SysDeptEntity();
dept1220.setId("d1220");
dept1220.setName("上海分公司人事部");
dept1220.setType(8);
@@ -107,7 +107,7 @@ public class SysOrgDeptInitService {
dept1220.setTier("_d1000_d1200_d1220_");
list.add(dept1220);
SysOrgDeptEntity dept1230 = new SysOrgDeptEntity();
SysDeptEntity dept1230 = new SysDeptEntity();
dept1230.setId("d1230");
dept1230.setName("上海分公司财务部");
dept1230.setType(8);
@@ -115,7 +115,7 @@ public class SysOrgDeptInitService {
dept1230.setTier("_d1000_d1200_d1230_");
list.add(dept1230);
SysOrgDeptEntity dept1300 = new SysOrgDeptEntity();
SysDeptEntity dept1300 = new SysDeptEntity();
dept1300.setId("d1300");
dept1300.setName("广州分公司");
dept1300.setType(2);
@@ -123,7 +123,7 @@ public class SysOrgDeptInitService {
dept1300.setTier("_d1000_d1300_");
list.add(dept1300);
SysOrgDeptEntity dept1310 = new SysOrgDeptEntity();
SysDeptEntity dept1310 = new SysDeptEntity();
dept1310.setId("d1310");
dept1310.setName("广州分公司综合部");
dept1310.setType(8);
@@ -131,7 +131,7 @@ public class SysOrgDeptInitService {
dept1310.setTier("_d1000_d1300_d1310_");
list.add(dept1310);
SysOrgDeptEntity dept1320 = new SysOrgDeptEntity();
SysDeptEntity dept1320 = new SysDeptEntity();
dept1320.setId("d1320");
dept1320.setName("广州分公司销售部");
dept1320.setType(8);
@@ -139,7 +139,7 @@ public class SysOrgDeptInitService {
dept1320.setTier("_d1000_d1300_d1320_");
list.add(dept1320);
SysOrgDeptEntity dept1330 = new SysOrgDeptEntity();
SysDeptEntity dept1330 = new SysDeptEntity();
dept1330.setId("d1330");
dept1330.setName("广州分公司人事部");
dept1330.setType(8);
@@ -150,13 +150,13 @@ public class SysOrgDeptInitService {
insert(list);
}
private final SysOrgDeptRepo deptRepo;
private final SysDeptRepo deptRepo;
private final SysOrgRepo orgRepo;
private void insert(List<SysOrgDeptEntity> list) {
private void insert(List<SysDeptEntity> list) {
List<SysOrg> list2 = new ArrayList<>();
for (SysOrgDeptEntity dept : list) {
for (SysDeptEntity dept : list) {
dept.setAvtag(true);
dept.setOrnum(Integer.parseInt(dept.getId().substring(1)));
SysOrg org = new SysOrg();
vben-apps/vben-setup/src/main/java/vben/setup/sys/dept/SysDeptRepo.java
+8
View File
@@ -0,0 +1,8 @@
package vben.setup.sys.dept;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysDeptRepo extends JpaRepository<SysDeptEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/group/SysOrgGroupCateEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/group/SysGroupCateEntity.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.group;
package vben.setup.sys.group;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -13,9 +13,9 @@ import lombok.Data;
*/
@Data
@Entity
@Table(name = "sys_org_group_cate")
@Table(name = "sys_group_cate")
@Schema(description = "组织架构-群组分类")
public class SysOrgGroupCateEntity {
public class SysGroupCateEntity {
/**
* 主键ID
*/
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/group/SysOrgGroupEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/group/SysGroupEntity.java
+4 -4
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.group;
package vben.setup.sys.group;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.*;
@@ -13,9 +13,9 @@ import java.util.List;
*/
@Data
@Entity
@Table(name = "sys_org_group")
@Table(name = "sys_group")
@Schema(description = "组织架构-群组")
public class SysOrgGroupEntity {
public class SysGroupEntity {
/**
* 主键ID
@@ -94,7 +94,7 @@ public class SysOrgGroupEntity {
* 成员列表
*/
@ManyToMany
@JoinTable(name = "sys_org_group_org", joinColumns = {@JoinColumn(name = "gid")},
@JoinTable(name = "sys_group_org", joinColumns = {@JoinColumn(name = "gid")},
inverseJoinColumns = {@JoinColumn(name = "oid")})
@Schema(description = "成员信息")
private List<SysOrg> members;
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/group/SysOrgGroupInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/group/SysGroupInitService.java
+7 -7
View File
@@ -1,10 +1,10 @@
package vben.setup.sys.org.group;
package vben.setup.sys.group;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.org.root.SysOrgRepo;
import vben.setup.sys.org.SysOrgRepo;
import java.util.List;
@@ -14,27 +14,27 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysOrgGroupInitService {
public class SysGroupInitService {
public void init() {
SysOrgGroupEntity group= new SysOrgGroupEntity();
SysGroupEntity group= new SysGroupEntity();
group.setId("g3001");
group.setName("北京分公司管理组");
group.setMembers(List.of(new SysOrg("u4"),new SysOrg("u5"),new SysOrg("p2004"),new SysOrg("d1140")));
insert(group);
SysOrgGroupEntity group2= new SysOrgGroupEntity();
SysGroupEntity group2= new SysGroupEntity();
group2.setId("g3002");
group2.setName("北京分公司销售员");
group2.setMembers(List.of(new SysOrg("u8"),new SysOrg("u9")));
insert(group2);
}
private final SysOrgGroupRepo groupRepo;
private final SysGroupRepo groupRepo;
private final SysOrgRepo orgRepo;
private void insert(SysOrgGroupEntity group) {
private void insert(SysGroupEntity group) {
group.setAvtag(true);
group.setOrnum(Integer.parseInt(group.getId().substring(1)));
groupRepo.save(group);
vben-apps/vben-setup/src/main/java/vben/setup/sys/group/SysGroupRepo.java
+8
View File
@@ -0,0 +1,8 @@
package vben.setup.sys.group;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysGroupRepo extends JpaRepository<SysGroupEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/menu/SysMenuEntity.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.perm.menu;
package vben.setup.sys.menu;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -11,9 +11,9 @@ import java.util.Date;
@Data
@Entity
@Table(name = "sys_perm_menu")
@Table(name = "sys_menu")
@Schema(description = "权限菜单")
public class SysPermMenuEntity {
public class SysMenuEntity {
/**
* 主键ID
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/menu/SysMenuInitService.java
+64 -64
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.perm.menu;
package vben.setup.sys.menu;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
@@ -13,11 +13,11 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysPermMenuInitService {
public class SysMenuInitService {
public void initBase() {
List<SysPermMenuEntity> list=new ArrayList<>();
SysPermMenuEntity m1000 = new SysPermMenuEntity();
List<SysMenuEntity> list=new ArrayList<>();
SysMenuEntity m1000 = new SysMenuEntity();
m1000.setId(1000L);
m1000.setIcon("tdesign:system-setting");
m1000.setName("系统管理");
@@ -28,39 +28,39 @@ public class SysPermMenuInitService {
m1000.setComp("Layout");
list.add(m1000);
SysPermMenuEntity m1010 = new SysPermMenuEntity();
SysMenuEntity m1010 = new SysMenuEntity();
m1010.setId(1010L);
m1010.setComp("sys/org/dept/index");
m1010.setComp("sys/dept/index");
m1010.setIcon("mingcute:department-line");
m1010.setName("部门管理");
m1010.setOrnum(1010);
m1010.setPath("org/dept");
m1010.setPath("dept");
m1010.setPid(1000L);
list.add(m1010);
SysPermMenuEntity m1020 = new SysPermMenuEntity();
SysMenuEntity m1020 = new SysMenuEntity();
m1020.setId(1020L);
m1020.setComp("sys/org/user/index");
m1020.setComp("sys/user/index");
m1020.setIcon("ant-design:user-outlined");
m1020.setName("用户管理");
m1020.setOrnum(1020);
m1020.setPath("org/user");
m1020.setPath("user");
m1020.setPid(1000L);
list.add(m1020);
SysPermMenuEntity m1021 = new SysPermMenuEntity();
SysMenuEntity m1021 = new SysMenuEntity();
m1021.setId(1021L);
m1021.setComp("sys/org/user/tedit");
m1021.setComp("sys/user/tedit");
m1021.setIcon("mingcute:user-edit-line");
m1021.setName("用户编辑");
m1021.setOrnum(1021);
m1021.setPath("org/user/edit");
m1021.setPath("user/edit");
m1021.setCatag(true);
m1021.setShtag(false);
m1021.setPid(1000L);
list.add(m1021);
// SysPermMenuEntity m1022 = new SysPermMenuEntity();
// SysMenuEntity m1022 = new SysMenuEntity();
// m1022.setId(1022L);
// m1022.setComp("_core/profile/index");
// m1022.setIcon("iconamoon:profile");
@@ -70,69 +70,69 @@ public class SysPermMenuInitService {
// m1022.setPid(1000L);
// list.add(m1022);
SysPermMenuEntity m1030 = new SysPermMenuEntity();
SysMenuEntity m1030 = new SysMenuEntity();
m1030.setId(1030L);
m1030.setComp("sys/org/post/index");
m1030.setComp("sys/post/index");
m1030.setIcon("icon-park-outline:appointment");
m1030.setName("岗位管理");
m1030.setOrnum(1030);
m1030.setPath("org/post");
m1030.setPath("post");
m1030.setPid(1000L);
list.add(m1030);
SysPermMenuEntity m1040 = new SysPermMenuEntity();
SysMenuEntity m1040 = new SysMenuEntity();
m1040.setId(1040L);
m1040.setComp("sys/org/group/index");
m1040.setComp("sys/group/index");
m1040.setIcon("material-symbols:group-outline-rounded");
m1040.setName("群组管理");
m1040.setOrnum(1040);
m1040.setPath("org/group");
m1040.setPath("group");
m1040.setPid(1000L);
list.add(m1040);
SysPermMenuEntity m1050 = new SysPermMenuEntity();
SysMenuEntity m1050 = new SysMenuEntity();
m1050.setId(1050L);
m1050.setComp("sys/perm/menu/index");
m1050.setComp("sys/menu/index");
m1050.setIcon("ri:menu-fold-2-fill");
m1050.setName("菜单管理");
m1050.setOrnum(1050);
m1050.setPath("perm/menu");
m1050.setPath("menu");
m1050.setPid(1000L);
list.add(m1050);
SysPermMenuEntity m1060 = new SysPermMenuEntity();
SysMenuEntity m1060 = new SysMenuEntity();
m1060.setId(1060L);
m1060.setComp("sys/perm/api/index");
m1060.setComp("sys/api/index");
m1060.setIcon("ant-design:api-outlined");
m1060.setName("接口管理");
m1060.setOrnum(1060);
m1060.setPath("perm/api");
m1060.setPath("api");
m1060.setPid(1000L);
list.add(m1060);
SysPermMenuEntity m1070 = new SysPermMenuEntity();
SysMenuEntity m1070 = new SysMenuEntity();
m1070.setId(1070L);
m1070.setComp("sys/perm/role/index");
m1070.setComp("sys/role/index");
m1070.setIcon("eos-icons:role-binding-outlined");
m1070.setName("角色管理");
m1070.setOrnum(1070);
m1070.setPath("perm/role");
m1070.setPath("role");
m1070.setPid(1000L);
list.add(m1070);
SysPermMenuEntity m1071 = new SysPermMenuEntity();
SysMenuEntity m1071 = new SysMenuEntity();
m1071.setId(1071L);
m1071.setComp("sys/perm/role/edit");
m1071.setComp("sys/role/edit");
m1071.setIcon("oui:app-users-roles");
m1071.setName("角色编辑");
m1071.setOrnum(1071);
m1071.setPath("perm/role/edit");
m1071.setPath("role/edit");
m1071.setCatag(true);
m1071.setShtag(false);
m1071.setPid(1000L);
list.add(m1071);
SysPermMenuEntity m1080 = new SysPermMenuEntity();
SysMenuEntity m1080 = new SysMenuEntity();
m1080.setId(1080L);
m1080.setComp("sys/config/index");
m1080.setIcon("ant-design:setting-outlined");
@@ -142,7 +142,7 @@ public class SysPermMenuInitService {
m1080.setPid(1000L);
list.add(m1080);
SysPermMenuEntity m1090 = new SysPermMenuEntity();
SysMenuEntity m1090 = new SysMenuEntity();
m1090.setId(1090L);
m1090.setComp("sys/notice/index");
m1090.setIcon("fe:notice-push");
@@ -152,7 +152,7 @@ public class SysPermMenuInitService {
m1090.setPid(1000L);
list.add(m1090);
SysPermMenuEntity m2000 = new SysPermMenuEntity();
SysMenuEntity m2000 = new SysMenuEntity();
m2000.setId(2000L);
m2000.setIcon("eos-icons:monitoring");
m2000.setName("监控中心");
@@ -163,7 +163,7 @@ public class SysPermMenuInitService {
m2000.setComp("Layout");
list.add(m2000);
SysPermMenuEntity m2010 = new SysPermMenuEntity();
SysMenuEntity m2010 = new SysMenuEntity();
m2010.setId(2010L);
m2010.setComp("mon/online/user/index");
m2010.setIcon("oui:online");
@@ -173,7 +173,7 @@ public class SysPermMenuInitService {
m2010.setPid(2000L);
list.add(m2010);
SysPermMenuEntity m2020 = new SysPermMenuEntity();
SysMenuEntity m2020 = new SysMenuEntity();
m2020.setId(2020L);
m2020.setComp("mon/login/log/index");
m2020.setIcon("uiw:login");
@@ -183,7 +183,7 @@ public class SysPermMenuInitService {
m2020.setPid(2000L);
list.add(m2020);
SysPermMenuEntity m2030 = new SysPermMenuEntity();
SysMenuEntity m2030 = new SysMenuEntity();
m2030.setId(2030L);
m2030.setComp("mon/oper/log/index");
m2030.setIcon("icon-park-outline:reverse-operation-in");
@@ -193,7 +193,7 @@ public class SysPermMenuInitService {
m2030.setPid(2000L);
list.add(m2030);
SysPermMenuEntity m2040 = new SysPermMenuEntity();
SysMenuEntity m2040 = new SysMenuEntity();
m2040.setId(2040L);
m2040.setComp("mon/server/index");
m2040.setIcon("mdi:server-outline");
@@ -203,7 +203,7 @@ public class SysPermMenuInitService {
m2040.setPid(2000L);
list.add(m2040);
SysPermMenuEntity m2050 = new SysPermMenuEntity();
SysMenuEntity m2050 = new SysMenuEntity();
m2050.setId(2050L);
m2050.setComp("mon/cache/index");
m2050.setIcon("octicon:cache-24");
@@ -213,7 +213,7 @@ public class SysPermMenuInitService {
m2050.setPid(2000L);
list.add(m2050);
SysPermMenuEntity m2060 = new SysPermMenuEntity();
SysMenuEntity m2060 = new SysMenuEntity();
m2060.setId(2060L);
m2060.setComp("mon/job/main/index");
m2060.setIcon("streamline:task-list");
@@ -223,7 +223,7 @@ public class SysPermMenuInitService {
m2060.setPid(2000L);
list.add(m2060);
SysPermMenuEntity m2061 = new SysPermMenuEntity();
SysMenuEntity m2061 = new SysMenuEntity();
m2061.setId(2061L);
m2061.setComp("mon/job/log/index");
m2061.setIcon("ix:log");
@@ -234,7 +234,7 @@ public class SysPermMenuInitService {
m2061.setShtag(false);
list.add(m2061);
SysPermMenuEntity m3000 = new SysPermMenuEntity();
SysMenuEntity m3000 = new SysMenuEntity();
m3000.setId(3000L);
m3000.setIcon("ant-design:tool-outlined");
m3000.setName("辅助工具");
@@ -245,7 +245,7 @@ public class SysPermMenuInitService {
m3000.setComp("Layout");
list.add(m3000);
SysPermMenuEntity m3010 = new SysPermMenuEntity();
SysMenuEntity m3010 = new SysMenuEntity();
m3010.setId(3010L);
m3010.setComp("tool/dict/index");
m3010.setIcon("fluent-mdl2:dictionary");
@@ -255,7 +255,7 @@ public class SysPermMenuInitService {
m3010.setPid(3000L);
list.add(m3010);
SysPermMenuEntity m3020 = new SysPermMenuEntity();
SysMenuEntity m3020 = new SysMenuEntity();
m3020.setId(3020L);
m3020.setComp("tool/num/index");
m3020.setIcon("streamline-sharp:steps-number");
@@ -265,7 +265,7 @@ public class SysPermMenuInitService {
m3020.setPid(3000L);
list.add(m3020);
SysPermMenuEntity m3030 = new SysPermMenuEntity();
SysMenuEntity m3030 = new SysMenuEntity();
m3030.setId(3030L);
m3030.setComp("tool/oss/main/index");
m3030.setIcon("mdi:file-outline");
@@ -275,7 +275,7 @@ public class SysPermMenuInitService {
m3030.setPid(3000L);
list.add(m3030);
SysPermMenuEntity m3040 = new SysPermMenuEntity();
SysMenuEntity m3040 = new SysMenuEntity();
m3040.setId(3040L);
m3040.setComp("tool/form/index");
m3040.setIcon("fluent:form-20-regular");
@@ -285,7 +285,7 @@ public class SysPermMenuInitService {
m3040.setPid(3000L);
list.add(m3040);
SysPermMenuEntity m3041 = new SysPermMenuEntity();
SysMenuEntity m3041 = new SysMenuEntity();
m3041.setId(3041L);
m3041.setComp("tool/form/edit");
m3041.setIcon("fluent:form-20-regular");
@@ -297,7 +297,7 @@ public class SysPermMenuInitService {
m3041.setPid(3000L);
list.add(m3041);
SysPermMenuEntity m3050 = new SysPermMenuEntity();
SysMenuEntity m3050 = new SysMenuEntity();
m3050.setId(3050L);
m3050.setComp("tool/code/index");
m3050.setIcon("humbleicons:code");
@@ -307,7 +307,7 @@ public class SysPermMenuInitService {
m3050.setPid(3000L);
list.add(m3050);
SysPermMenuEntity m3051 = new SysPermMenuEntity();
SysMenuEntity m3051 = new SysMenuEntity();
m3051.setId(3051L);
m3051.setComp("tool/code/edit");
m3051.setIcon("humbleicons:code");
@@ -322,8 +322,8 @@ public class SysPermMenuInitService {
}
public void initBpm() {
List<SysPermMenuEntity> list=new ArrayList<>();
SysPermMenuEntity m6000 = new SysPermMenuEntity();
List<SysMenuEntity> list=new ArrayList<>();
SysMenuEntity m6000 = new SysMenuEntity();
m6000.setId(6000L);
m6000.setIcon("streamline-sharp:text-flow-rows");
m6000.setName("流程管理");
@@ -334,7 +334,7 @@ public class SysPermMenuInitService {
m6000.setComp("Layout");
list.add(m6000);
SysPermMenuEntity m6010 = new SysPermMenuEntity();
SysMenuEntity m6010 = new SysMenuEntity();
m6010.setId(6010L);
m6010.setComp("bpm/bus/cate/index");
m6010.setIcon("tabler:category-plus");
@@ -344,7 +344,7 @@ public class SysPermMenuInitService {
m6010.setPid(6000L);
list.add(m6010);
SysPermMenuEntity m6020 = new SysPermMenuEntity();
SysMenuEntity m6020 = new SysMenuEntity();
m6020.setId(6020L);
m6020.setComp("bpm/bus/tmpl/index");
m6020.setIcon("carbon:prompt-template");
@@ -354,7 +354,7 @@ public class SysPermMenuInitService {
m6020.setPid(6000L);
list.add(m6020);
SysPermMenuEntity m6021 = new SysPermMenuEntity();
SysMenuEntity m6021 = new SysMenuEntity();
m6021.setId(6021L);
m6021.setComp("bpm/bus/tmpl/edit");
m6021.setIcon("carbon:prompt-template");
@@ -366,7 +366,7 @@ public class SysPermMenuInitService {
m6021.setPid(6000L);
list.add(m6021);
SysPermMenuEntity m6030 = new SysPermMenuEntity();
SysMenuEntity m6030 = new SysMenuEntity();
m6030.setId(6030L);
m6030.setComp("bpm/bus/main/index");
m6030.setIcon("ri:instance-line");
@@ -376,7 +376,7 @@ public class SysPermMenuInitService {
m6030.setPid(6000L);
list.add(m6030);
SysPermMenuEntity m6031 = new SysPermMenuEntity();
SysMenuEntity m6031 = new SysMenuEntity();
m6031.setId(6031L);
m6031.setComp("bpm/bus/main/edit");
m6031.setIcon("ri:instance-line");
@@ -388,7 +388,7 @@ public class SysPermMenuInitService {
m6031.setPid(6000L);
list.add(m6031);
SysPermMenuEntity m6032 = new SysPermMenuEntity();
SysMenuEntity m6032 = new SysMenuEntity();
m6032.setId(6032L);
m6032.setComp("bpm/bus/main/view");
m6032.setIcon("ri:instance-line");
@@ -400,7 +400,7 @@ public class SysPermMenuInitService {
m6032.setPid(6000L);
list.add(m6032);
SysPermMenuEntity m6040 = new SysPermMenuEntity();
SysMenuEntity m6040 = new SysMenuEntity();
m6040.setId(6040L);
m6040.setComp("bpm/todo/index");
m6040.setIcon("ri:todo-line");
@@ -410,7 +410,7 @@ public class SysPermMenuInitService {
m6040.setPid(6000L);
list.add(m6040);
SysPermMenuEntity m6050 = new SysPermMenuEntity();
SysMenuEntity m6050 = new SysMenuEntity();
m6050.setId(6050L);
m6050.setComp("bpm/org/tree/index");
m6050.setIcon("mdi:workflow-outline");
@@ -420,7 +420,7 @@ public class SysPermMenuInitService {
m6050.setPid(6000L);
list.add(m6050);
SysPermMenuEntity m6051 = new SysPermMenuEntity();
SysMenuEntity m6051 = new SysMenuEntity();
m6051.setId(6051L);
m6051.setComp("bpm/org/node/index");
m6051.setIcon("mdi:workflow-outline");
@@ -434,11 +434,11 @@ public class SysPermMenuInitService {
insert(list);
}
private final SysPermMenuRepo repo;
private final SysMenuRepo repo;
private void insert(List<SysPermMenuEntity> list) {
for (SysPermMenuEntity main : list) {
private void insert(List<SysMenuEntity> list) {
for (SysMenuEntity main : list) {
main.setAvtag(true);
if(main.getCatag()==null){
main.setCatag(false);
vben-apps/vben-setup/src/main/java/vben/setup/sys/menu/SysMenuRepo.java
+12
View File
@@ -0,0 +1,12 @@
package vben.setup.sys.menu;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface SysMenuRepo extends JpaRepository<SysMenuEntity,String> {
List<SysMenuEntity> findByNameContaining(String path);
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/root/SysOrgRepo.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/org/SysOrgRepo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.root;
package vben.setup.sys.org;
import org.springframework.data.jpa.repository.JpaRepository;
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/dept/SysOrgDeptRepo.java
-8
View File
@@ -1,8 +0,0 @@
package vben.setup.sys.org.dept;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysOrgDeptRepo extends JpaRepository<SysOrgDeptEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/group/SysOrgGroupRepo.java
-8
View File
@@ -1,8 +0,0 @@
package vben.setup.sys.org.group;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysOrgGroupRepo extends JpaRepository<SysOrgGroupEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/post/SysOrgPostRepo.java
-8
View File
@@ -1,8 +0,0 @@
package vben.setup.sys.org.post;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysOrgPostRepo extends JpaRepository<SysOrgPostEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/user/SysOrgUserRepo.java
-8
View File
@@ -1,8 +0,0 @@
package vben.setup.sys.org.user;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysOrgUserRepo extends JpaRepository<SysOrgUserEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/api/SysPermApiRepo.java
-10
View File
@@ -1,10 +0,0 @@
package vben.setup.sys.perm.api;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysPermApiRepo extends JpaRepository<SysPermApiEntity,String> {
SysPermApiEntity findByPerm(String perm);
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/menu/SysPermMenuRepo.java
-12
View File
@@ -1,12 +0,0 @@
package vben.setup.sys.perm.menu;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface SysPermMenuRepo extends JpaRepository<SysPermMenuEntity,String> {
List<SysPermMenuEntity> findByNameContaining(String path);
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleRepo.java
-8
View File
@@ -1,8 +0,0 @@
package vben.setup.sys.perm.role;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysPermRoleRepo extends JpaRepository<SysPermRoleEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/post/SysOrgPostEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/post/SysPostEntity.java
+4 -4
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.post;
package vben.setup.sys.post;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.*;
@@ -13,9 +13,9 @@ import java.util.List;
*/
@Data
@Entity
@Table(name = "sys_org_post")
@Table(name = "sys_post")
@Schema(description = "组织架构-岗位")
public class SysOrgPostEntity {
public class SysPostEntity {
/**
* 主键ID
@@ -101,7 +101,7 @@ public class SysOrgPostEntity {
* 包含成员
*/
@ManyToMany
@JoinTable(name = "sys_org_post_org", joinColumns = {@JoinColumn(name = "pid")},
@JoinTable(name = "sys_post_org", joinColumns = {@JoinColumn(name = "pid")},
inverseJoinColumns = {@JoinColumn(name = "oid")})
@Schema(description = "员工列表")
private List<SysOrg> users;
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/post/SysOrgPostInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/post/SysPostInitService.java
+9 -9
View File
@@ -1,10 +1,10 @@
package vben.setup.sys.org.post;
package vben.setup.sys.post;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.org.root.SysOrgRepo;
import vben.setup.sys.org.SysOrgRepo;
import java.util.List;
@@ -14,11 +14,11 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysOrgPostInitService {
public class SysPostInitService {
public void init() {
SysOrgPostEntity post1 = new SysOrgPostEntity();
SysPostEntity post1 = new SysPostEntity();
post1.setId("p2001");
post1.setName("董事长");
post1.setUsers(List.of(new SysOrg("u3")));
@@ -26,7 +26,7 @@ public class SysOrgPostInitService {
post1.setTier("_d1000_p2001_");
insert(post1);
SysOrgPostEntity post2 = new SysOrgPostEntity();
SysPostEntity post2 = new SysPostEntity();
post2.setId("p2002");
post2.setName("北京分公司总经理");
post2.setUsers(List.of(new SysOrg("u4")));
@@ -34,7 +34,7 @@ public class SysOrgPostInitService {
post2.setTier("_d1000_d1100_p2002_");
insert(post2);
SysOrgPostEntity post3 = new SysOrgPostEntity();
SysPostEntity post3 = new SysPostEntity();
post3.setId("p2003");
post3.setName("北京分公司销售部长");
post3.setUsers(List.of(new SysOrg("u5")));
@@ -42,7 +42,7 @@ public class SysOrgPostInitService {
post3.setTier("_d1000_d1100_d1110_p2003_");
insert(post3);
SysOrgPostEntity post4 = new SysOrgPostEntity();
SysPostEntity post4 = new SysPostEntity();
post4.setId("p2004");
post4.setName("北京分公司销售经理");
post4.setUsers(List.of(new SysOrg("u6"),new SysOrg("u7")));
@@ -53,11 +53,11 @@ public class SysOrgPostInitService {
}
private final SysOrgPostRepo postRepo;
private final SysPostRepo postRepo;
private final SysOrgRepo orgRepo;
private void insert(SysOrgPostEntity post) {
private void insert(SysPostEntity post) {
post.setAvtag(true);
post.setOrnum(Integer.parseInt(post.getId().substring(1)));
postRepo.save(post);
vben-apps/vben-setup/src/main/java/vben/setup/sys/post/SysPostRepo.java
+8
View File
@@ -0,0 +1,8 @@
package vben.setup.sys.post;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysPostRepo extends JpaRepository<SysPostEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/rece/SysOrgReceEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/rece/SysReceEntity.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.rece;
package vben.setup.sys.rece;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -14,9 +14,9 @@ import java.util.Date;
*/
@Data
@Entity
@Table(name = "sys_org_rece")
@Table(name = "sys_rece")
@Schema(description = "组织架构-最近访问记录")
public class SysOrgReceEntity {
public class SysReceEntity {
/**
* 主键ID
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/role/SysRoleEntity.java
+10 -10
View File
@@ -1,20 +1,20 @@
package vben.setup.sys.perm.role;
package vben.setup.sys.role;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.*;
import lombok.Data;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.perm.api.SysPermApiEntity;
import vben.setup.sys.perm.menu.SysPermMenuEntity;
import vben.setup.sys.api.SysApiEntity;
import vben.setup.sys.menu.SysMenuEntity;
import java.util.Date;
import java.util.List;
@Data
@Entity
@Table(name = "sys_perm_role")
@Table(name = "sys_role")
@Schema(description = "权限角色")
public class SysPermRoleEntity {
public class SysRoleEntity {
/**
* 主键ID
@@ -99,20 +99,20 @@ public class SysPermRoleEntity {
private Integer ornum;
@ManyToMany
@JoinTable(name = "sys_perm_role_org", joinColumns = {@JoinColumn(name = "rid")},
@JoinTable(name = "sys_role_org", joinColumns = {@JoinColumn(name = "rid")},
inverseJoinColumns = {@JoinColumn(name = "oid")})
@Schema(description = "成员列表")
private List<SysOrg> orgs;
@ManyToMany
@JoinTable(name = "sys_perm_role_menu", joinColumns = {@JoinColumn(name = "rid")},
@JoinTable(name = "sys_role_menu", joinColumns = {@JoinColumn(name = "rid")},
inverseJoinColumns = {@JoinColumn(name = "mid")})
@Schema(description = "菜单列表")
private List<SysPermMenuEntity> menus;
private List<SysMenuEntity> menus;
@ManyToMany
@JoinTable(name = "sys_perm_role_api", joinColumns = {@JoinColumn(name = "rid")},
@JoinTable(name = "sys_role_api", joinColumns = {@JoinColumn(name = "rid")},
inverseJoinColumns = {@JoinColumn(name = "aid")})
@Schema(description = "接口列表")
private List<SysPermApiEntity> apis;
private List<SysApiEntity> apis;
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/perm/role/SysPermRoleInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/role/SysRoleInitService.java
+14 -14
View File
@@ -1,12 +1,12 @@
package vben.setup.sys.perm.role;
package vben.setup.sys.role;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.perm.api.SysPermApiEntity;
import vben.setup.sys.perm.api.SysPermApiRepo;
import vben.setup.sys.perm.menu.SysPermMenuRepo;
import vben.setup.sys.api.SysApiEntity;
import vben.setup.sys.api.SysApiRepo;
import vben.setup.sys.menu.SysMenuRepo;
import java.util.ArrayList;
import java.util.List;
@@ -17,11 +17,11 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysPermRoleInitService {
public class SysRoleInitService {
public void init() {
List<SysPermRoleEntity> list = new ArrayList<>();
SysPermRoleEntity role = new SysPermRoleEntity();
List<SysRoleEntity> list = new ArrayList<>();
SysRoleEntity role = new SysRoleEntity();
role.setId(1L);
role.setName("管理员");
role.setNotes("拥有所有权限");
@@ -31,14 +31,14 @@ public class SysPermRoleInitService {
role.setApis(apiRepo.findAll());
list.add(role);
SysPermRoleEntity role2 = new SysPermRoleEntity();
SysRoleEntity role2 = new SysRoleEntity();
role2.setId(2L);
role2.setName("普通用户");
role2.setNotes("只包含流程使用权限");
role2.setOrnum(2);
role2.setOrgs(List.of(new SysOrg("u6"),new SysOrg("u7"),new SysOrg("u8"),new SysOrg("u9")));
role2.setMenus(menuRepo.findByNameContaining("流程"));
List<SysPermApiEntity> apiList = new ArrayList<>();
List<SysApiEntity> apiList = new ArrayList<>();
apiList.add(apiRepo.findByPerm("bpmbus:main:query"));
apiList.add(apiRepo.findByPerm("bpmbus:main:add"));
apiList.add(apiRepo.findByPerm("bpmbus:main:edit"));
@@ -48,14 +48,14 @@ public class SysPermRoleInitService {
insert(list);
}
private final SysPermMenuRepo menuRepo;
private final SysMenuRepo menuRepo;
private final SysPermApiRepo apiRepo;
private final SysApiRepo apiRepo;
private final SysPermRoleRepo roleRepo;
private final SysRoleRepo roleRepo;
private void insert(List<SysPermRoleEntity> list) {
for (SysPermRoleEntity role : list) {
private void insert(List<SysRoleEntity> list) {
for (SysRoleEntity role : list) {
role.setAvtag(true);
role.setUptim(role.getCrtim());
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/role/SysRoleRepo.java
+8
View File
@@ -0,0 +1,8 @@
package vben.setup.sys.role;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysRoleRepo extends JpaRepository<SysRoleEntity,String> {
}
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/user/SysOrgUserEntity.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/user/SysUserEntity.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.setup.sys.org.user;
package vben.setup.sys.user;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
@@ -14,9 +14,9 @@ import java.util.Date;
*/
@Data
@Entity
@Table(name = "sys_org_user")
@Table(name = "sys_user")
@Schema(description = "组织架构-用户")
public class SysOrgUserEntity {
public class SysUserEntity {
/**
* 主键ID
vben-apps/vben-setup/src/main/java/vben/setup/sys/org/user/SysOrgUserInitService.java → vben-apps/vben-setup/src/main/java/vben/setup/sys/user/SysUserInitService.java
+16 -16
View File
@@ -1,10 +1,10 @@
package vben.setup.sys.org.user;
package vben.setup.sys.user;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import vben.common.jpa.entity.SysOrg;
import vben.setup.sys.org.root.SysOrgRepo;
import vben.setup.sys.org.SysOrgRepo;
import java.util.ArrayList;
import java.util.List;
@@ -15,13 +15,13 @@ import java.util.List;
@Service
@RequiredArgsConstructor
@Transactional
public class SysOrgUserInitService {
public class SysUserInitService {
public void init() {
List<SysOrgUserEntity> list = new ArrayList<>();
List<SysUserEntity> list = new ArrayList<>();
SysOrgUserEntity user = new SysOrgUserEntity();
SysUserEntity user = new SysUserEntity();
user.setId("u1");
user.setName("管理员");
user.setUsnam("admin");
@@ -33,7 +33,7 @@ public class SysOrgUserInitService {
user.setNotes("管理员不给修改");
list.add(user);
SysOrgUserEntity user2 = new SysOrgUserEntity();
SysUserEntity user2 = new SysUserEntity();
user2.setId("u2");
user2.setName("小狐狸");
user2.setUsnam("vben");
@@ -44,7 +44,7 @@ public class SysOrgUserInitService {
user2.setSex("2");
list.add(user2);
SysOrgUserEntity user3 = new SysOrgUserEntity();
SysUserEntity user3 = new SysUserEntity();
user3.setId("u3");
user3.setName("张三");
user3.setUsnam("zs");
@@ -52,7 +52,7 @@ public class SysOrgUserInitService {
user3.setTier("_d1000_u3_");
list.add(user3);
SysOrgUserEntity user4 = new SysOrgUserEntity();
SysUserEntity user4 = new SysUserEntity();
user4.setId("u4");
user4.setName("李四");
user4.setUsnam("ls");
@@ -60,7 +60,7 @@ public class SysOrgUserInitService {
user4.setTier("_d1000_d1100_u4_");
list.add(user4);
SysOrgUserEntity user5 = new SysOrgUserEntity();
SysUserEntity user5 = new SysUserEntity();
user5.setId("u5");
user5.setName("王五");
user5.setUsnam("ww");
@@ -68,7 +68,7 @@ public class SysOrgUserInitService {
user5.setTier("_d1000_d1100_d1110_u5_");
list.add(user5);
SysOrgUserEntity user6 = new SysOrgUserEntity();
SysUserEntity user6 = new SysUserEntity();
user6.setId("u6");
user6.setName("赵六");
user6.setUsnam("zl");
@@ -76,7 +76,7 @@ public class SysOrgUserInitService {
user6.setTier("_d1000_d1100_d1110_d1111_u6_");
list.add(user6);
SysOrgUserEntity user7 = new SysOrgUserEntity();
SysUserEntity user7 = new SysUserEntity();
user7.setId("u7");
user7.setName("孙七");
user7.setUsnam("sq");
@@ -84,7 +84,7 @@ public class SysOrgUserInitService {
user7.setTier("_d1000_d1100_d1110_d1111_u7_");
list.add(user7);
SysOrgUserEntity user8 = new SysOrgUserEntity();
SysUserEntity user8 = new SysUserEntity();
user8.setId("u8");
user8.setName("周八");
user8.setUsnam("zb");
@@ -92,7 +92,7 @@ public class SysOrgUserInitService {
user8.setTier("_d1000_d1100_d1110_d1111_u8_");
list.add(user8);
SysOrgUserEntity user9 = new SysOrgUserEntity();
SysUserEntity user9 = new SysUserEntity();
user9.setId("u9");
user9.setName("吴九");
user9.setUsnam("wj");
@@ -103,13 +103,13 @@ public class SysOrgUserInitService {
insert(list);
}
private final SysOrgUserRepo userRepo;
private final SysUserRepo userRepo;
private final SysOrgRepo orgRepo;
private void insert(List<SysOrgUserEntity> list) {
private void insert(List<SysUserEntity> list) {
List<SysOrg> list2=new ArrayList<>();
for (SysOrgUserEntity user : list) {
for (SysUserEntity user : list) {
user.setAvtag(true);
user.setNinam(user.getName());
user.setPacod("$2a$10$09f8rxsX4tbj1CZla2MSOuiwHwp5QAPUzbp5whnoZEFK4/xplNwZq");
vben-apps/vben-setup/src/main/java/vben/setup/sys/user/SysUserRepo.java
+8
View File
@@ -0,0 +1,8 @@
package vben.setup.sys.user;
import org.springframework.data.jpa.repository.JpaRepository;
public interface SysUserRepo extends JpaRepository<SysUserEntity,String> {
}
vben-modules/vben-base/src/main/java/vben/base/auth/login/AuthLoginService.java
+4 -4
View File
@@ -6,8 +6,8 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.perm.api.SysPermApiDao;
import vben.base.sys.user.SysUserDao;
import vben.base.sys.api.SysApiDao;
import vben.common.core.constant.CacheConstants;
import vben.common.core.constant.Constants;
import vben.common.core.domain.model.LoginUser;
@@ -43,9 +43,9 @@ public class AuthLoginService {
@Value("${user.password.lockTime}")
private Integer lockTime;
private final SysPermApiDao apiDao;
private final SysApiDao apiDao;
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
/**
vben-modules/vben-base/src/main/java/vben/base/auth/login/strategy/PasswordAuthStrategy.java
+4 -4
View File
@@ -6,8 +6,8 @@ import cn.hutool.crypto.digest.BCrypt;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import vben.base.sys.org.user.SysOrgUser;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.user.SysUser;
import vben.base.sys.user.SysUserDao;
import vben.common.core.constant.Constants;
import vben.common.core.constant.GlobalConstants;
import vben.common.core.constant.SystemConstants;
@@ -42,7 +42,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
private final CaptchaProperties captchaProperties;
private final AuthLoginService loginService;
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
// @Override
// public LoginVo login(String body, SysClientVo client) {
@@ -145,7 +145,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
private AuthUserVo loadUserByUsername(String username) {
// SysUserVo user = userService.findById().selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, username));
SysOrgUser orgUser = userDao.findByUsnam(username);
SysUser orgUser = userDao.findByUsnam(username);
AuthUserVo user=new AuthUserVo();
user.setUserId(orgUser.getId());
user.setUserName(orgUser.getUsnam());
vben-modules/vben-base/src/main/java/vben/base/auth/login/strategy/SmsAuthStrategy.java
+4 -6
View File
@@ -9,10 +9,9 @@ import vben.base.auth.login.AuthLoginService;
import vben.base.auth.login.vo.LoginVo;
import vben.base.auth.login.vo.SysClientVo;
import vben.base.auth.user.AuthUserVo;
import vben.base.sys.org.user.SysOrgUser;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.user.SysUser;
import vben.base.sys.user.SysUserDao;
import vben.common.core.constant.Constants;
import vben.common.core.constant.GlobalConstants;
import vben.common.core.constant.SystemConstants;
import vben.common.core.domain.model.LoginUser;
import vben.common.core.domain.model.SmsLoginBody;
@@ -24,7 +23,6 @@ import vben.common.core.utils.ObjectUtils;
import vben.common.core.utils.StrUtils;
import vben.common.core.utils.ValidatorUtils;
import vben.common.json.utils.JsonUtils;
import vben.common.redis.utils.RedisUtils;
import vben.common.satoken.utils.LoginHelper;
/**
@@ -37,7 +35,7 @@ import vben.common.satoken.utils.LoginHelper;
@RequiredArgsConstructor
public class SmsAuthStrategy implements IAuthStrategy {
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
private final AuthLoginService loginService;
@@ -87,7 +85,7 @@ public class SmsAuthStrategy implements IAuthStrategy {
private AuthUserVo loadUserByPhonenumber(String phonenumber) {
SysOrgUser orgUser = userDao.findByMonum(phonenumber);
SysUser orgUser = userDao.findByMonum(phonenumber);
AuthUserVo user=new AuthUserVo();
user.setUserId(orgUser.getId());
user.setUserName(orgUser.getUsnam());
vben-modules/vben-base/src/main/java/vben/base/auth/login/strategy/SocialAuthStrategy.java
+4 -4
View File
@@ -8,8 +8,8 @@ import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import org.springframework.stereotype.Service;
import vben.base.sys.org.user.SysOrgUser;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.user.SysUser;
import vben.base.sys.user.SysUserDao;
import vben.common.core.constant.SystemConstants;
import vben.common.core.domain.model.LoginUser;
import vben.common.core.domain.model.SocialLoginBody;
@@ -44,7 +44,7 @@ public class SocialAuthStrategy implements IAuthStrategy {
private final SocialProperties socialProperties;
private final ISysSocialService sysSocialService;
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
private final AuthLoginService loginService;
/**
@@ -109,7 +109,7 @@ public class SocialAuthStrategy implements IAuthStrategy {
}
private AuthUserVo loadUser(String userId) {
SysOrgUser orgUser = userDao.findById(userId);
SysUser orgUser = userDao.findById(userId);
AuthUserVo user=new AuthUserVo();
user.setUserName(orgUser.getUsnam());
user.setUserId(orgUser.getId());
vben-modules/vben-base/src/main/java/vben/base/auth/user/AuthUserApi.java
+5 -7
View File
@@ -3,10 +3,8 @@ package vben.base.auth.user;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import vben.base.sys.org.user.SysOrgUser;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.perm.auth.RouterVo;
import vben.base.sys.perm.auth.SysPermAuthService;
import vben.base.sys.user.SysUser;
import vben.base.sys.user.SysUserDao;
import vben.common.core.domain.R;
import vben.common.core.domain.model.LoginUser;
import vben.common.satoken.utils.LoginHelper;
@@ -17,9 +15,9 @@ import java.util.List;
@RequiredArgsConstructor
public class AuthUserApi {
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
private final SysPermAuthService authService;
private final SysAuthService authService;
/**
* 获取用户信息
@@ -30,7 +28,7 @@ public class AuthUserApi {
public R<UserInfoVo> getInfo() {
UserInfoVo userInfoVo = new UserInfoVo();
LoginUser loginUser = LoginHelper.getLoginUser();
SysOrgUser user = userDao.findById(loginUser.getUserId()+"");
SysUser user = userDao.findById(loginUser.getUserId()+"");
AuthUserVo userVo = new AuthUserVo();
userVo.setUserId(loginUser.getUserId());
userVo.setUserName(loginUser.getUsername());
vben-modules/vben-base/src/main/java/vben/base/sys/perm/auth/MetaVo.java → vben-modules/vben-base/src/main/java/vben/base/auth/user/MetaVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.auth;
package vben.base.auth.user;
import lombok.Data;
import vben.common.core.utils.StrUtils;
vben-modules/vben-base/src/main/java/vben/base/sys/perm/auth/RouterVo.java → vben-modules/vben-base/src/main/java/vben/base/auth/user/RouterVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.auth;
package vben.base.auth.user;
import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/perm/auth/SysPermAuthService.java → vben-modules/vben-base/src/main/java/vben/base/auth/user/SysAuthService.java
+13 -13
View File
@@ -1,12 +1,12 @@
package vben.base.sys.perm.auth;
package vben.base.auth.user;
import cn.hutool.core.collection.CollUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.perm.menu.SysPermMenu;
import vben.base.sys.perm.menu.SysPermMenuDao;
import vben.base.sys.user.SysUserDao;
import vben.base.sys.menu.SysMenu;
import vben.base.sys.menu.SysMenuDao;
import vben.common.core.constant.Constants;
import vben.common.core.constant.SystemConstants;
import vben.common.core.utils.StrUtils;
@@ -20,13 +20,13 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysPermAuthService {
public class SysAuthService {
public List<RouterVo> getRouters(String userId) {
List<RouterVo> routerVoList = RedisUtils.getCacheObject("rlist:" + userId);
if(routerVoList == null) {
if("u1".equals(userId)) {
List<SysPermMenu> menuList = menuDao.findAll();
List<SysMenu> menuList = menuDao.findAll();
routerVoList = buildMenus(menuList);
RedisUtils.setCacheObject("rlist:" + userId, routerVoList);
return routerVoList;
@@ -36,16 +36,16 @@ public class SysPermAuthService {
oids = userDao.findOrgs(userId);
RedisUtils.setCacheObject("oids:" + userId, oids);
}
List<SysPermMenu> menuList=menuDao.findListByOids(oids);
List<SysMenu> menuList=menuDao.findListByOids(oids);
routerVoList = buildMenus(menuList);
RedisUtils.setCacheObject("rlist:" + userId, routerVoList);
}
return routerVoList;
}
private List<RouterVo> buildMenus(List<SysPermMenu> menus) {
private List<RouterVo> buildMenus(List<SysMenu> menus) {
List<RouterVo> routers = new LinkedList<>();
for (SysPermMenu menu : menus) {
for (SysMenu menu : menus) {
String name = menu.getRouteName() + menu.getId();
RouterVo router = new RouterVo();
router.setHidden(!menu.getShtag());
@@ -54,7 +54,7 @@ public class SysPermAuthService {
router.setComponent(menu.getComp());
router.setQuery(menu.getParam());
router.setMeta(new MetaVo(menu.getName(), menu.getIcon(), !menu.getCatag(), menu.getPath()));
List<SysPermMenu> cMenus = menu.getChildren();
List<SysMenu> cMenus = menu.getChildren();
if (CollUtil.isNotEmpty(cMenus) && "1".equals(menu.getType())) {
router.setAlwaysShow(true);
router.setRedirect("noRedirect");
@@ -76,7 +76,7 @@ public class SysPermAuthService {
router.setPath("/");
List<RouterVo> childrenList = new ArrayList<>();
RouterVo children = new RouterVo();
String routerPath = SysPermMenu.innerLinkReplaceEach(menu.getPath());
String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath());
String innerLinkName = StrUtils.upperFirst(routerPath) + menu.getId();
children.setPath(routerPath);
children.setComponent(SystemConstants.INNER_LINK);
@@ -90,8 +90,8 @@ public class SysPermAuthService {
return routers;
}
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
private final SysPermMenuDao menuDao;
private final SysMenuDao menuDao;
}
vben-modules/vben-base/src/main/java/vben/base/mon/login/log/MonLoginLogService.java
+2 -2
View File
@@ -9,7 +9,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.user.SysOrgUserDao;
import vben.base.sys.user.SysUserDao;
import vben.common.core.constant.Constants;
import vben.common.core.utils.IdUtils;
import vben.common.core.utils.ServletUtils;
@@ -115,5 +115,5 @@ public class MonLoginLogService {
private final MonLoginLogDao dao;
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
}
vben-modules/vben-base/src/main/java/vben/base/pub/PubOrgApi.java
+3 -3
View File
@@ -36,7 +36,7 @@ public class PubOrgApi {
return R.ok(mapList);
}
if ((type & 1) != 0) {//部门
Sqler deptSqler = new Sqler("id,name","sys_org_dept");
Sqler deptSqler = new Sqler("id,name","sys_dept");
if (StrUtils.isNotBlank(name)) {
deptSqler.addLike("t.name", name);
} else {
@@ -47,7 +47,7 @@ public class PubOrgApi {
mapList.addAll(list);
}
if ((type & 2) != 0) {//用户
Sqler userSqler = new Sqler("id,name,avatar","sys_org_user");
Sqler userSqler = new Sqler("id,name,avatar","sys_user");
if (StrUtils.isNotBlank(name)) {
userSqler.addLike("t.name", name);
} else {
@@ -58,7 +58,7 @@ public class PubOrgApi {
mapList.addAll(list);
}
if ((type & 4) != 0) {//岗位
Sqler postSqler = new Sqler("id,name","sys_org_post");
Sqler postSqler = new Sqler("id,name","sys_post");
if (StrUtils.isNotBlank(name)) {
postSqler.addLike("t.name", name);
} else {
vben-modules/vben-base/src/main/java/vben/base/pub/PubOrgGroupApi.java
+5 -5
View File
@@ -19,8 +19,8 @@ public class PubOrgGroupApi {
@GetMapping("tree")
public R<List<Stree>> getTree(String name) {
String sql="select id,pid,name,'cate' type from sys_org_group_cate " +
"union all select id,catid as pid,name,'group' type from sys_org_group";
String sql="select id,pid,name,'cate' type from sys_group_cate " +
"union all select id,catid as pid,name,'group' type from sys_group";
List<Stree> list = jdbcHelper.findStreeList(sql);
return R.ok(list);
}
@@ -28,12 +28,12 @@ public class PubOrgGroupApi {
@GetMapping("list")
public R<List<SidName>> getList(String pid,String type,String name) {
if("cate".equals(type)){
String sql="select id,name from sys_org_group where catid=? order by ornum";
String sql="select id,name from sys_group where catid=? order by ornum";
return R.ok(jdbcHelper.findSidNameList(sql, pid));
}else if("group".equals(type)){
String sql="select id,name from sys_org_group where id=? order by ornum";
String sql="select id,name from sys_group where id=? order by ornum";
List<SidName> list = jdbcHelper.findSidNameList(sql, pid);
String sql2="select t.id,t.name from sys_org t inner join sys_org_group_org o on o.oid=t.id where o.gid=?";
String sql2="select t.id,t.name from sys_org t inner join sys_group_org o on o.oid=t.id where o.gid=?";
list.addAll(jdbcHelper.findSidNameList(sql2, pid));
return R.ok(list);
}else{
vben-modules/vben-base/src/main/java/vben/base/pub/PubOrgReceApi.java
+12 -12
View File
@@ -4,8 +4,8 @@ package vben.base.pub;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import vben.base.sys.org.rece.SysOrgRece;
import vben.base.sys.org.rece.SysOrgReceService;
import vben.base.sys.rece.SysRece;
import vben.base.sys.rece.SysReceService;
import vben.common.core.domain.R;
import vben.common.jdbc.sqler.JdbcHelper;
import vben.common.jdbc.sqler.Sqler;
@@ -28,22 +28,22 @@ public class PubOrgReceApi {
List<Map<String, Object>> mapList = new ArrayList<>();
String userId = LoginHelper.getUserId();
if ((type & 1) != 0) {//部门
Sqler deptSqler = new Sqler("t.oid as id", "sys_org_rece");
deptSqler.addInnerJoin("o.name", "sys_org_dept o", "o.id=t.oid");
Sqler deptSqler = new Sqler("t.oid as id", "sys_rece");
deptSqler.addInnerJoin("o.name", "sys_dept o", "o.id=t.oid");
deptSqler.addEqual("t.useid", userId);
mapList.addAll(jdbcHelper.findMapList(deptSqler));
}
if ((type & 2) != 0) {//用户
Sqler userSqler = new Sqler("t.oid as id", "sys_org_rece");
userSqler.addInnerJoin("u.name", "sys_org_user u", "u.id=t.oid");
userSqler.addInnerJoin("d.name as dept", "sys_org_dept d", "d.id=u.depid");
Sqler userSqler = new Sqler("t.oid as id", "sys_rece");
userSqler.addInnerJoin("u.name", "sys_user u", "u.id=t.oid");
userSqler.addInnerJoin("d.name as dept", "sys_dept d", "d.id=u.depid");
userSqler.addEqual("t.useid", userId);
mapList.addAll(jdbcHelper.findMapList(userSqler));
}
if ((type & 4) != 0) {//岗位
Sqler postSqler = new Sqler("t.oid as id", "sys_org_rece");
postSqler.addInnerJoin("p.name", "sys_org_post p", "p.id=t.oid");
postSqler.addInnerJoin("d.name as dept", "sys_org_dept d", "d.id=p.depid");
Sqler postSqler = new Sqler("t.oid as id", "sys_rece");
postSqler.addInnerJoin("p.name", "sys_post p", "p.id=t.oid");
postSqler.addInnerJoin("d.name as dept", "sys_dept d", "d.id=p.depid");
postSqler.addEqual("t.useid", userId);
mapList.addAll(jdbcHelper.findMapList(postSqler));
}
@@ -52,7 +52,7 @@ public class PubOrgReceApi {
}
@PostMapping
public R<Void> post(@RequestBody List<SysOrgRece> reces) {
public R<Void> post(@RequestBody List<SysRece> reces) {
String userId = LoginHelper.getUserId();
scheduledExecutorService.schedule(() -> {
if(reces!=null&&reces.size()>0){
@@ -64,7 +64,7 @@ public class PubOrgReceApi {
private final JdbcHelper jdbcHelper;
private final SysOrgReceService service;
private final SysReceService service;
private final ScheduledExecutorService scheduledExecutorService;
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/api/SysPermApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/api/SysApi.java
+2 -2
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.api;
package vben.base.sys.api;
import lombok.Data;
@@ -8,7 +8,7 @@ import java.util.Date;
* 权限接口
*/
@Data
public class SysPermApi {
public class SysApi {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/perm/api/SysPermApiApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/api/SysApiApi.java
+14 -14
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.api;
package vben.base.sys.api;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -15,11 +15,11 @@ import java.util.Date;
* 接口管理
*/
@RestController
@RequestMapping("sys/perm/api")
@RequestMapping("sys/api")
@RequiredArgsConstructor
public class SysPermApiApi {
public class SysApiApi {
private final SysPermApiService service;
private final SysApiService service;
/**
* 接口分页查询
@@ -27,10 +27,10 @@ public class SysPermApiApi {
* @param menid 所属菜单ID
* @return 接口分页数据
*/
@SaCheckPermission("sysperm:api:query")
@SaCheckPermission("sys:api:query")
@GetMapping
public R<PageData> get(String name, Long menid) {
Sqler sqler = new Sqler("sys_perm_api");
Sqler sqler = new Sqler("sys_api");
sqler.addLike("t.name", name);
sqler.addEqual("t.menid", menid);
sqler.addSelect("t.notes,t.ornum,t.crtim,t.perm");
@@ -43,10 +43,10 @@ public class SysPermApiApi {
* @param id 接口ID
* @return 接口对象
*/
@SaCheckPermission("sysperm:api:query")
@SaCheckPermission("sys:api:query")
@GetMapping("info/{id}")
public R<SysPermApi> one(@PathVariable Long id) {
SysPermApi main=service.findById(id);
public R<SysApi> one(@PathVariable Long id) {
SysApi main=service.findById(id);
return R.ok(main);
}
@@ -56,9 +56,9 @@ public class SysPermApiApi {
* @return 接口ID
*/
@Log(title = "接口管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysperm:api:edit")
@SaCheckPermission("sys:api:edit")
@PostMapping
public R<Long> post(@RequestBody SysPermApi main) {
public R<Long> post(@RequestBody SysApi main) {
main.setAvtag(true);
service.insert(main);
return R.ok(null,main.getId());
@@ -70,9 +70,9 @@ public class SysPermApiApi {
* @return 接口ID
*/
@Log(title = "接口管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysperm:api:edit")
@SaCheckPermission("sys:api:edit")
@PutMapping
public R<Long> put(@RequestBody SysPermApi main) {
public R<Long> put(@RequestBody SysApi main) {
main.setUptim(new Date());
service.update(main);
return R.ok(null,main.getId());
@@ -84,7 +84,7 @@ public class SysPermApiApi {
* @return 接口数量
*/
@Log(title = "接口管理", businessType = BusinessType.DELETE)
@SaCheckPermission("sysperm:api:delete")
@SaCheckPermission("sys:api:delete")
@DeleteMapping("{ids}")
public R<Integer> delete(@PathVariable Long[] ids) {
return R.ok(service.delete(ids));
vben-modules/vben-base/src/main/java/vben/base/sys/perm/api/SysPermApiDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/api/SysApiDao.java
+12 -12
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.api;
package vben.base.sys.api;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -19,30 +19,30 @@ import java.util.Set;
@Component
@RequiredArgsConstructor
public class SysPermApiDao {
public class SysApiDao {
public PageData findPageData(Sqler sqler) {
return jdbcHelper.findPageData(sqler);
}
public Set<String> findSetByOids(String oids) {
String sql = "select distinct perm id from sys_perm_api a inner join sys_perm_role_api ra on ra.aid=a.id inner join sys_perm_role_org ro on ro.rid=ra.rid where a.avtag="+Db.True+" and ro.oid in ("+oids+")";
String sql = "select distinct perm id from sys_api a inner join sys_role_api ra on ra.aid=a.id inner join sys_role_org ro on ro.rid=ra.rid where a.avtag="+Db.True+" and ro.oid in ("+oids+")";
List<String> stringList = jdbcHelper.findSlist(sql);
return new HashSet<>(stringList);
}
public List<Stree> findTreeList() {
return jdbcHelper.findStreeList("select id,name,pid from sys_perm_api where catag="+Db.True+" order by ornum");
return jdbcHelper.findStreeList("select id,name,pid from sys_api where catag="+Db.True+" order by ornum");
}
public SysPermApi findById(Long id) {
String sql = "select * from sys_perm_api where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysPermApi.class), id);
public SysApi findById(Long id) {
String sql = "select * from sys_api where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysApi.class), id);
}
public void insert(SysPermApi main) {
public void insert(SysApi main) {
main.setId(IdUtils.getSnowflakeNextId());
Isqler isqler = new Isqler("sys_perm_api");
Isqler isqler = new Isqler("sys_api");
isqler.add("id", main.getId());
isqler.add("name", main.getName());
isqler.add("type", main.getType());
@@ -56,8 +56,8 @@ public class SysPermApiDao {
jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams());
}
public void update(SysPermApi main) {
Usqler usqler = new Usqler("sys_perm_api");
public void update(SysApi main) {
Usqler usqler = new Usqler("sys_api");
usqler.addWhere("id=?", main.getId());
usqler.add("name", main.getName());
usqler.add("type", main.getType());
@@ -71,7 +71,7 @@ public class SysPermApiDao {
}
public void deleteById(Long id) {
String sql = "delete from sys_perm_api where id=?";
String sql = "delete from sys_api where id=?";
jdbcHelper.getTp().update(sql, id);
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/api/SysPermApiService.java → vben-modules/vben-base/src/main/java/vben/base/sys/api/SysApiService.java
+6 -6
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.api;
package vben.base.sys.api;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -10,9 +10,9 @@ import vben.common.jdbc.sqler.Sqler;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysPermApiService {
public class SysApiService {
private final SysPermApiDao dao;
private final SysApiDao dao;
@Transactional(readOnly = true)
public PageData findPageData(Sqler sqler) {
@@ -20,15 +20,15 @@ public class SysPermApiService {
}
@Transactional(readOnly = true)
public SysPermApi findById(Long id) {
public SysApi findById(Long id) {
return dao.findById(id);
}
public void insert(SysPermApi main) {
public void insert(SysApi main) {
dao.insert(main);
}
public void update(SysPermApi main) {
public void update(SysApi main) {
dao.update(main);
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/dept/SysOrgDept.java → vben-modules/vben-base/src/main/java/vben/base/sys/dept/SysDept.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.dept;
package vben.base.sys.dept;
import lombok.Data;
@@ -10,7 +10,7 @@ import java.util.List;
* 组织架构部门
*/
@Data
public class SysOrgDept {
public class SysDept {
/**
* 主键ID
@@ -30,7 +30,7 @@ public class SysOrgDept {
/**
* 子部门
*/
private List<SysOrgDept> children = new ArrayList<>();
private List<SysDept> children = new ArrayList<>();
/**
* 部门类别
vben-modules/vben-base/src/main/java/vben/base/sys/org/dept/SysOrgDeptApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/dept/SysDeptApi.java
+13 -13
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.dept;
package vben.base.sys.dept;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -18,11 +18,11 @@ import java.util.List;
* 部门管理
*/
@RestController
@RequestMapping("sys/org/dept")
@RequestMapping("sys/dept")
@RequiredArgsConstructor
public class SysOrgDeptApi {
public class SysDeptApi {
private final SysOrgDeptService service;
private final SysDeptService service;
/**
* 部门列表查询
@@ -30,9 +30,9 @@ public class SysOrgDeptApi {
* @return 部门集合数据
*/
@GetMapping("list")
@SaCheckPermission("sysorg:dept:query")
public R<List<SysOrgDeptVo>> list(String name) {
Sqler sqler = new Sqler("sys_org_dept");
@SaCheckPermission("sys:dept:query")
public R<List<SysDeptVo>> list(String name) {
Sqler sqler = new Sqler("sys_dept");
sqler.addSelect("t.pid,t.notes,t.ornum");
sqler.addLike("t.name", name);
sqler.addOrder("t.ornum");
@@ -47,10 +47,10 @@ public class SysOrgDeptApi {
* @param pid 上级部门ID
* @return 部门分页数据
*/
@SaCheckPermission("sysorg:dept:query")
@SaCheckPermission("sys:dept:query")
@GetMapping
public R<PageData> get(String name,String pid) {
Sqler sqler = new Sqler("sys_org_dept");
Sqler sqler = new Sqler("sys_dept");
sqler.addSelect("t.pid,t.notes,t.ornum");
sqler.selectCUinfo();
sqler.addLike("t.name", name);
@@ -78,8 +78,8 @@ public class SysOrgDeptApi {
*/
@SaCheckPermission("sysorg:dept:query")
@GetMapping("info/{id}")
public R<SysOrgDept> info(@PathVariable String id) {
SysOrgDept main = service.findById(id);
public R<SysDept> info(@PathVariable String id) {
SysDept main = service.findById(id);
return R.ok(main);
}
@@ -91,7 +91,7 @@ public class SysOrgDeptApi {
@SaCheckPermission("sysorg:dept:edit")
@PostMapping
@Log(title = "部门管理", businessType = BusinessType.INSERT)
public R<String> post(@RequestBody SysOrgDept main) {
public R<String> post(@RequestBody SysDept main) {
service.insert(main);
return R.ok(null,main.getId());
}
@@ -104,7 +104,7 @@ public class SysOrgDeptApi {
@SaCheckPermission("sysorg:dept:edit")
@Log(title = "部门管理", businessType = BusinessType.UPDATE)
@PutMapping
public R<String> put(@RequestBody SysOrgDept main) {
public R<String> put(@RequestBody SysDept main) {
service.update(main);
return R.ok(null,main.getId());
}
vben-modules/vben-base/src/main/java/vben/base/sys/dept/SysDeptDao.java
+96
View File
@@ -0,0 +1,96 @@
package vben.base.sys.dept;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Component;
import vben.common.core.utils.StrUtils;
import vben.common.jdbc.dto.Stree;
import vben.common.jdbc.root.Db;
import vben.common.jdbc.sqler.Isqler;
import vben.common.jdbc.sqler.JdbcHelper;
import vben.common.jdbc.sqler.Sqler;
import vben.common.jdbc.sqler.Usqler;
import java.util.List;
@Component
@RequiredArgsConstructor
public class SysDeptDao {
public SysDept findById(String id) {
String sql = "select * from sys_dept where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysDept.class), id);
}
public void insert(SysDept sysDept) {
Isqler sqler = new Isqler("sys_dept");
sqler.add("id", sysDept.getId());
sqler.add("name", sysDept.getName());
sqler.add("type", sysDept.getType());
sqler.add("pid", sysDept.getPid());
sqler.add("tier", sysDept.getTier());
sqler.add("notes", sysDept.getNotes());
sqler.add("ornum", sysDept.getOrnum());
sqler.add("crtim", sysDept.getCrtim());
sqler.add("uptim", sysDept.getCrtim());
sqler.add("avtag", sysDept.getAvtag());
sqler.add("label", sysDept.getLabel());
sqler.add("cruid", sysDept.getCruid());
sqler.add("upuid", sysDept.getCruid());
sqler.add("ex1", sysDept.getEx1());
sqler.add("ex2", sysDept.getEx2());
sqler.add("ex3", sysDept.getEx3());
sqler.add("ex4", sysDept.getEx4());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
}
public void update(SysDept sysDept) {
Usqler sqler = new Usqler("sys_dept");
sqler.addWhere("id=?", sysDept.getId());
sqler.add("name", sysDept.getName());
sqler.add("type", sysDept.getType());
sqler.add("pid", sysDept.getPid());
sqler.add("tier", sysDept.getTier());
sqler.add("notes", sysDept.getNotes());
sqler.add("ornum", sysDept.getOrnum());
sqler.add("uptim", sysDept.getUptim());
sqler.add("avtag", sysDept.getAvtag());
sqler.add("label", sysDept.getLabel());
sqler.add("upuid", sysDept.getUpuid());
sqler.add("ex1", sysDept.getEx1());
sqler.add("ex2", sysDept.getEx2());
sqler.add("ex3", sysDept.getEx3());
sqler.add("ex4", sysDept.getEx4());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
}
public Integer getCount(String pid) {
String sql = "select count(1) from sys_dept where pid=?";
return jdbcHelper.getTp().queryForObject(sql, Integer.class, pid);
}
public String findTier(String id) {
String sql = "select tier from sys_dept where id=?";
return jdbcHelper.getTp().queryForObject(sql, String.class, id);
}
public void deleteById(String id) {
String sql = "delete from sys_dept where id=?";
jdbcHelper.getTp().update(sql, id);
}
public List<Stree> findTree(String id){
Sqler sqler = new Sqler("sys_dept");
sqler.addSelect("pid");
sqler.addWhere("t.avtag = "+ Db.True);
if (StrUtils.isNotBlank(id)) {
sqler.addWhere("t.tier not like ?", "%_" + id + "_%");
// sqler.addWhere("t.id <> ?", id);
}
sqler.addOrder("t.ornum");
return jdbcHelper.findStreeList(sqler);
}
private final JdbcHelper jdbcHelper;
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/dept/SysOrgDeptService.java → vben-modules/vben-base/src/main/java/vben/base/sys/dept/SysDeptService.java
+25 -25
View File
@@ -1,11 +1,11 @@
package vben.base.sys.org.dept;
package vben.base.sys.dept;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.root.OrgDao;
import vben.base.sys.org.Org;
import vben.base.sys.org.OrgDao;
import vben.common.core.exception.ServiceException;
import vben.common.core.utils.IdUtils;
import vben.common.core.utils.StrUtils;
@@ -21,18 +21,18 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgDeptService {
public class SysDeptService {
private final JdbcHelper jdbcHelper;
private final SysOrgDeptDao deptDao;
private final SysDeptDao deptDao;
private final OrgDao orgDao;
@Transactional(readOnly = true)
public List<SysOrgDeptVo> findVoList(Sqler sqler) {
public List<SysDeptVo> findVoList(Sqler sqler) {
return jdbcHelper.getTp().query(sqler.getSql(),
new BeanPropertyRowMapper<>(SysOrgDeptVo.class), sqler.getParams());
new BeanPropertyRowMapper<>(SysDeptVo.class), sqler.getParams());
}
@Transactional(readOnly = true)
@@ -41,11 +41,11 @@ public class SysOrgDeptService {
}
@Transactional(readOnly = true)
public SysOrgDept findById(String id) {
public SysDept findById(String id) {
return deptDao.findById(id);
}
public void insert(SysOrgDept main) {
public void insert(SysDept main) {
if (main.getId() == null) {
main.setId("d" + IdUtils.getSnowflakeNextIdStr());
}
@@ -66,7 +66,7 @@ public class SysOrgDeptService {
deptDao.insert(main);
}
public void update(SysOrgDept main) {
public void update(SysDept main) {
if (main.getOrnum() == null) {
main.setOrnum(0);
}
@@ -88,7 +88,7 @@ public class SysOrgDeptService {
Org org = new Org(main.getId(), main.getName(), 1);
deptDao.update(main);
String oldTier = jdbcHelper.findString("select tier from sys_org_dept where id=?", main.getId());
String oldTier = jdbcHelper.findString("select tier from sys_dept where id=?", main.getId());
if (!oldTier.equals(main.getTier())) {
dealDeptTier(oldTier, main.getTier(), main.getId());
dealUserTier(oldTier, main.getTier());
@@ -98,27 +98,27 @@ public class SysOrgDeptService {
}
private void dealDeptTier(String oldTier, String newTier, String id) {
String sql = "select id,tier as name from sys_org_dept where tier like ? and id<>?";
String sql = "select id,tier as name from sys_dept where tier like ? and id<>?";
List<SidName> list = jdbcHelper.findSidNameList(sql, oldTier + "%", id);
String updateSql = "update sys_org_dept set tier=? where id=?";
String updateSql = "update sys_dept set tier=? where id=?";
List<Object[]> updateList = new ArrayList<>();
batchReady(oldTier, newTier, list, updateList);
jdbcHelper.batch(updateSql, updateList);
}
private void dealUserTier(String oldTier, String newTier) {
String sql = "select id,tier as name from sys_org_user where tier like ?";
String sql = "select id,tier as name from sys_user where tier like ?";
List<SidName> list = jdbcHelper.findSidNameList(sql, oldTier + "%");
String updateSql = "update sys_org_user set tier=? where id=?";
String updateSql = "update sys_user set tier=? where id=?";
List<Object[]> updateList = new ArrayList<>();
batchReady(oldTier, newTier, list, updateList);
jdbcHelper.batch(updateSql, updateList);
}
private void dealPostTier(String oldTier, String newTier) {
String sql = "select id,tier as name from sys_org_post where tier like ?";
String sql = "select id,tier as name from sys_post where tier like ?";
List<SidName> list = jdbcHelper.findSidNameList(sql, oldTier + "%");
String updateSql = "update sys_org_post set tier=? where id=?";
String updateSql = "update sys_post set tier=? where id=?";
List<Object[]> updateList = new ArrayList<>();
batchReady(oldTier, newTier, list, updateList);
jdbcHelper.batch(updateSql, updateList);
@@ -146,10 +146,10 @@ public class SysOrgDeptService {
}
public void move(Smove bo) {
SysOrgDept dragDept = deptDao.findById(bo.getDraid());
String sql = "select id,ornum from sys_org_dept where ornum>? and pid=?";
SysDept dragDept = deptDao.findById(bo.getDraid());
String sql = "select id,ornum from sys_dept where ornum>? and pid=?";
List<SidOrnum> list2 = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(SidOrnum.class), dragDept.getOrnum(), dragDept.getPid());
String updateSql = "update sys_org_dept set ornum=? where id=?";
String updateSql = "update sys_dept set ornum=? where id=?";
List<Object[]> updateList = new ArrayList<>();
for (SidOrnum sidOrnum : list2) {
Object[] arr = new Object[2];
@@ -164,12 +164,12 @@ public class SysOrgDeptService {
Integer count = deptDao.getCount(bo.getDroid());
dragDept.setOrnum(count + 1);
} else if ("before".equals(bo.getType())) {
SysOrgDept dropDept = deptDao.findById(bo.getDroid());
SysDept dropDept = deptDao.findById(bo.getDroid());
dragDept.setPid(dropDept.getPid());
dragDept.setOrnum(dropDept.getOrnum());
String sql3 = "select id,ornum from sys_org_dept where ornum>? and pid=?";
String sql3 = "select id,ornum from sys_dept where ornum>? and pid=?";
List<SidOrnum> list3 = jdbcHelper.getTp().query(sql3, new BeanPropertyRowMapper<>(SidOrnum.class), dropDept.getOrnum(), dropDept.getPid());
String updateSql3 = "update sys_org_dept set ornum=? where id=?";
String updateSql3 = "update sys_dept set ornum=? where id=?";
List<Object[]> updateList3 = new ArrayList<>();
for (SidOrnum sidOrnum : list3) {
Object[] arr = new Object[2];
@@ -179,10 +179,10 @@ public class SysOrgDeptService {
}
jdbcHelper.batch(updateSql3, updateList3);
dropDept.setOrnum(dropDept.getOrnum() + 1);
String updateSql4 = "update sys_org_dept set ornum=? where id=?";
String updateSql4 = "update sys_dept set ornum=? where id=?";
jdbcHelper.update(updateSql4, dropDept.getOrnum(), dropDept.getId());
} else if ("after".equals(bo.getType())) {
SysOrgDept dropDept = deptDao.findById(bo.getDroid());
SysDept dropDept = deptDao.findById(bo.getDroid());
Integer count = deptDao.getCount(dropDept.getPid());
if (dragDept.getPid() != null && dragDept.getPid().equals(dropDept.getPid())) {
dragDept.setOrnum(count);
vben-modules/vben-base/src/main/java/vben/base/sys/org/dept/SysOrgDeptVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/dept/SysDeptVo.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.dept;
package vben.base.sys.dept;
import lombok.Data;
@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.List;
@Data
public class SysOrgDeptVo {
public class SysDeptVo {
private String id;
@@ -16,7 +16,7 @@ public class SysOrgDeptVo {
private String type;
private List<SysOrgDeptVo> children;
private List<SysDeptVo> children;
private Date crtim;
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroup.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroup.java
+3 -3
View File
@@ -1,7 +1,7 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.Data;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import java.util.Date;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
* 组织架构群组
*/
@Data
public class SysOrgGroup {
public class SysGroup {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupApi.java
+10 -10
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -14,11 +14,11 @@ import vben.common.log.enums.BusinessType;
* 群组管理
*/
@RestController
@RequestMapping("sys/org/group")
@RequestMapping("sys/group")
@RequiredArgsConstructor
public class SysOrgGroupApi {
public class SysGroupApi {
private final SysOrgGroupService service;
private final SysGroupService service;
/**
* 群组分页查询
@@ -29,13 +29,13 @@ public class SysOrgGroupApi {
@SaCheckPermission("sysorg:group:query")
@GetMapping
public R<PageData> get(Long catid, String name) {
Sqler sqler = new Sqler("sys_org_group");
Sqler sqler = new Sqler("sys_group");
if (StrUtils.isNotBlank(name)) {
sqler.addLike("t.name", name);
} else if (catid!=null) {
sqler.addEqual("t.catid", catid);
}
sqler.addLeftJoin("c.name catna","sys_org_group_cate c","c.id=t.catid");
sqler.addLeftJoin("c.name catna","sys_group_cate c","c.id=t.catid");
sqler.addSelect("t.ornum,t.notes,t.crtim,t.uptim,t.avtag");
return R.ok(service.findPageData(sqler));
}
@@ -47,8 +47,8 @@ public class SysOrgGroupApi {
*/
@SaCheckPermission("sysorg:group:query")
@GetMapping("info/{id}")
public R<SysOrgGroup> info(@PathVariable String id) {
SysOrgGroup main = service.findById(id);
public R<SysGroup> info(@PathVariable String id) {
SysGroup main = service.findById(id);
return R.ok(main);
}
@@ -60,7 +60,7 @@ public class SysOrgGroupApi {
@Log(title = "群组管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysorg:group:edit")
@PostMapping
public R<String> post(@RequestBody SysOrgGroup main) {
public R<String> post(@RequestBody SysGroup main) {
service.insert(main);
return R.ok(null,main.getId());
}
@@ -73,7 +73,7 @@ public class SysOrgGroupApi {
@Log(title = "群组管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysorg:group:edit")
@PutMapping
public R<String> put(@RequestBody SysOrgGroup main) {
public R<String> put(@RequestBody SysGroup main) {
service.update(main);
return R.ok(null,main.getId());
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupCate.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupCate.java
+2 -2
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.Data;
@@ -7,7 +7,7 @@ import lombok.Data;
* 群组分类
*/
@Data
public class SysOrgGroupCate {
public class SysGroupCate {
/**
* 主键ID
*/
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupCateApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupCateApi.java
+8 -8
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -15,11 +15,11 @@ import java.util.List;
* 群组分类管理
*/
@RestController
@RequestMapping("sys/org/groupc")
@RequestMapping("sys/groupc")
@RequiredArgsConstructor
public class SysOrgGroupCateApi {
public class SysGroupCateApi {
private final SysOrgGroupCateService service;
private final SysGroupCateService service;
/**
* 群组分类树状查询
@@ -39,8 +39,8 @@ public class SysOrgGroupCateApi {
*/
@SaCheckPermission("sysorg:groupc:query")
@GetMapping("info/{id}")
public R<SysOrgGroupCate> info(@PathVariable String id) {
SysOrgGroupCate cate = service.findById(id);
public R<SysGroupCate> info(@PathVariable String id) {
SysGroupCate cate = service.findById(id);
return R.ok(cate);
}
@@ -52,7 +52,7 @@ public class SysOrgGroupCateApi {
@Log(title = "群组分类管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysorg:groupc:edit")
@PostMapping
public R<String> post(@RequestBody SysOrgGroupCate cate) {
public R<String> post(@RequestBody SysGroupCate cate) {
service.insert(cate);
return R.ok(null,cate.getId());
}
@@ -65,7 +65,7 @@ public class SysOrgGroupCateApi {
@Log(title = "群组分类管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysorg:groupc:edit")
@PutMapping
public R<String> put(@RequestBody SysOrgGroupCate cate) {
public R<String> put(@RequestBody SysGroupCate cate) {
service.update(cate);
return R.ok(null,cate.getId());
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupCateDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupCateDao.java
+13 -13
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -13,23 +13,23 @@ import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgGroupCateDao {
public class SysGroupCateDao {
public List<Stree> findTreeList(String id) {
if(StrUtils.isBlank(id)) {
return jdbcHelper.findStreeList("select id,name,pid from sys_org_group_cate order by ornum");
return jdbcHelper.findStreeList("select id,name,pid from sys_group_cate order by ornum");
}else{
return jdbcHelper.findStreeList("select id,name,pid from sys_org_group_cate where id <> ? order by ornum",id);
return jdbcHelper.findStreeList("select id,name,pid from sys_group_cate where id <> ? order by ornum",id);
}
}
public SysOrgGroupCate findById(String id) {
String sql = "select * from sys_org_group_cate where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgGroupCate.class), id);
public SysGroupCate findById(String id) {
String sql = "select * from sys_group_cate where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysGroupCate.class), id);
}
public void insert(SysOrgGroupCate cate) {
Isqler isqler = new Isqler("sys_org_group_cate");
public void insert(SysGroupCate cate) {
Isqler isqler = new Isqler("sys_group_cate");
isqler.add("id", cate.getId());
isqler.add("name", cate.getName());
isqler.add("pid", cate.getPid());
@@ -37,8 +37,8 @@ public class SysOrgGroupCateDao {
jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams());
}
public void update(SysOrgGroupCate cate) {
Usqler usqler = new Usqler("sys_org_group_cate");
public void update(SysGroupCate cate) {
Usqler usqler = new Usqler("sys_group_cate");
usqler.addWhere("id=?", cate.getId());
usqler.add("name", cate.getName());
usqler.add("ornum", cate.getOrnum());
@@ -47,12 +47,12 @@ public class SysOrgGroupCateDao {
}
public void deleteById(String id) {
String sql = "delete from sys_org_group_cate where id=?";
String sql = "delete from sys_group_cate where id=?";
jdbcHelper.getTp().update(sql, id);
}
public Integer getCount(String pid){
String countSql="select count(1) from sys_org_group_cate where pid=?";
String countSql="select count(1) from sys_group_cate where pid=?";
Integer count = jdbcHelper.getTp().queryForObject(countSql,Integer.class,pid);
if(count==null){
count=0;
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupCateService.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupCateService.java
+17 -17
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -16,30 +16,30 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgGroupCateService {
public class SysGroupCateService {
public List<Stree> findTreeList(String id) {
return cateDao.findTreeList(id);
}
@Transactional(readOnly = true)
public SysOrgGroupCate findById(String id) {
public SysGroupCate findById(String id) {
return cateDao.findById(id);
}
public void insert(SysOrgGroupCate cate) {
public void insert(SysGroupCate cate) {
cate.setId(IdUtils.getSnowflakeNextIdStr());
cate.setOrnum(cateDao.getCount(cate.getPid()) + 1);
cateDao.insert(cate);
}
public void update(SysOrgGroupCate cate) {
public void update(SysGroupCate cate) {
cateDao.update(cate);
}
public Integer delete(String id) {
Integer size=1;
String sql = "select id from sys_org_group_cate where pid=?";
String sql = "select id from sys_group_cate where pid=?";
List<String> list = jdbcHelper.getTp().queryForList(sql, String.class, id);
for (String l : list) {
cateDao.deleteById(l);
@@ -50,10 +50,10 @@ public class SysOrgGroupCateService {
}
public void move(Smove bo) {
SysOrgGroupCate dragCate = cateDao.findById(bo.getDraid());
String sql = "select id,ornum from sys_org_group_cate where ornum>? and pid=?";
SysGroupCate dragCate = cateDao.findById(bo.getDraid());
String sql = "select id,ornum from sys_group_cate where ornum>? and pid=?";
List<SidOrnum> list2 = jdbcHelper.getTp().query(sql,new BeanPropertyRowMapper<>(SidOrnum.class),dragCate.getOrnum(), dragCate.getPid());
String updateSql = "update sys_org_group_cate set ornum=? where id=?";
String updateSql = "update sys_group_cate set ornum=? where id=?";
List<Object[]> updateList = new ArrayList<>();
for (SidOrnum sidOrnum : list2) {
Object[] arr = new Object[2];
@@ -67,12 +67,12 @@ public class SysOrgGroupCateService {
Integer count = cateDao.getCount(bo.getDroid());
dragCate.setOrnum(count + 1);
} else if ("before".equals(bo.getType())) {
SysOrgGroupCate dropCate = cateDao.findById(bo.getDroid());
SysGroupCate dropCate = cateDao.findById(bo.getDroid());
dragCate.setPid(dropCate.getPid());
dragCate.setOrnum(dropCate.getOrnum());
String sql3 = "select id,ornum from sys_org_group_cate where ornum>? and pid=?";
String sql3 = "select id,ornum from sys_group_cate where ornum>? and pid=?";
List<SidOrnum> list3 = jdbcHelper.getTp().query(sql3, new BeanPropertyRowMapper<>(SidOrnum.class),dropCate.getOrnum(), dropCate.getPid());
String updateSql3 = "update sys_org_group_cate set ornum=? where id=?";
String updateSql3 = "update sys_group_cate set ornum=? where id=?";
List<Object[]> updateList3 = new ArrayList<>();
for (SidOrnum sidOrnum : list3) {
Object[] arr = new Object[2];
@@ -82,15 +82,15 @@ public class SysOrgGroupCateService {
}
jdbcHelper.batch(updateSql3, updateList3);
dropCate.setOrnum(dropCate.getOrnum() + 1);
String updateSql4 = "update sys_org_group_cate set ornum=? where id=?";
String updateSql4 = "update sys_group_cate set ornum=? where id=?";
jdbcHelper.update(updateSql4, dropCate.getOrnum(), dropCate.getId());
} else if ("after".equals(bo.getType())) {
SysOrgGroupCate dropCate = cateDao.findById(bo.getDroid());
SysGroupCate dropCate = cateDao.findById(bo.getDroid());
dragCate.setPid(dropCate.getPid());
dragCate.setOrnum(dropCate.getOrnum() + 1);
String sql3 = "select id,ornum from sys_org_group_cate where ornum>? and pid=?";
String sql3 = "select id,ornum from sys_group_cate where ornum>? and pid=?";
List<SidOrnum> list3 = jdbcHelper.getTp().query(sql3,new BeanPropertyRowMapper<>(SidOrnum.class),dropCate.getOrnum(), dropCate.getPid());
String updateSql3 = "update sys_org_group_cate set ornum=? where id=?";
String updateSql3 = "update sys_group_cate set ornum=? where id=?";
List<Object[]> updateList3 = new ArrayList<>();
for (SidOrnum sidOrnum : list3) {
Object[] arr = new Object[2];
@@ -105,5 +105,5 @@ public class SysOrgGroupCateService {
private final JdbcHelper jdbcHelper;
private final SysOrgGroupCateDao cateDao;
private final SysGroupCateDao cateDao;
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupDao.java
+16 -16
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.RequiredArgsConstructor;
import vben.common.jdbc.sqler.Isqler;
@@ -6,27 +6,27 @@ import vben.common.jdbc.sqler.JdbcHelper;
import vben.common.jdbc.sqler.Usqler;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Component;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import java.util.ArrayList;
import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgGroupDao {
public class SysGroupDao {
public SysOrgGroup findById(String id) {
String sql = "select * from sys_org_group where id = ?";
SysOrgGroup group = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgGroup.class), id);
String sql2 = "select t.id,t.name from sys_org t inner join sys_org_group_org o on o.oid=t.id where o.gid = ?";
public SysGroup findById(String id) {
String sql = "select * from sys_group where id = ?";
SysGroup group = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysGroup.class), id);
String sql2 = "select t.id,t.name from sys_org t inner join sys_group_org o on o.oid=t.id where o.gid = ?";
List<Org> users = jdbcHelper.getTp().query(sql2, new BeanPropertyRowMapper<>(Org.class), id);
group.setMembers(users);
return group;
}
public void insert(SysOrgGroup group) {
Isqler sqler = new Isqler("sys_org_group");
public void insert(SysGroup group) {
Isqler sqler = new Isqler("sys_group");
sqler.add("id", group.getId());
sqler.add("name", group.getName());
sqler.add("notes", group.getNotes());
@@ -47,12 +47,12 @@ public class SysOrgGroupDao {
arr[1]=org.getId();
insertMemberList.add(arr);
}
String insertMemberSql="insert into sys_org_group_org(gid,oid) values(?,?)";
String insertMemberSql="insert into sys_group_org(gid,oid) values(?,?)";
jdbcHelper.batch(insertMemberSql, insertMemberList);
}
public void update(SysOrgGroup group) {
Usqler usqler = new Usqler("sys_org_group");
public void update(SysGroup group) {
Usqler usqler = new Usqler("sys_group");
usqler.addWhere("id=?", group.getId());
usqler.add("name", group.getName());
usqler.add("notes", group.getNotes());
@@ -64,7 +64,7 @@ public class SysOrgGroupDao {
usqler.add("catid", group.getCatid());
jdbcHelper.getTp().update(usqler.getSql(), usqler.getParams());
jdbcHelper.update("delete from sys_org_group_org where gid = ?", group.getId());
jdbcHelper.update("delete from sys_group_org where gid = ?", group.getId());
List<Object[]> insertMemberList = new ArrayList<>();
for (Org org : group.getMembers()) {
Object[] arr=new Object[2];
@@ -72,15 +72,15 @@ public class SysOrgGroupDao {
arr[1]=org.getId();
insertMemberList.add(arr);
}
String insertMemberSql="insert into sys_org_group_org(gid,oid) values(?,?)";
String insertMemberSql="insert into sys_group_org(gid,oid) values(?,?)";
jdbcHelper.batch(insertMemberSql, insertMemberList);
}
public void deleteById(String id) {
String sql = "delete from sys_org_group where id=?";
String sql = "delete from sys_group where id=?";
jdbcHelper.getTp().update(sql, id);
String sql2 = "delete from sys_org_group_org where gid=?";
String sql2 = "delete from sys_group_org where gid=?";
jdbcHelper.getTp().update(sql2, id);
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/group/SysOrgGroupService.java → vben-modules/vben-base/src/main/java/vben/base/sys/group/SysGroupService.java
+8 -8
View File
@@ -1,10 +1,10 @@
package vben.base.sys.org.group;
package vben.base.sys.group;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.root.OrgDao;
import vben.base.sys.org.Org;
import vben.base.sys.org.OrgDao;
import vben.common.core.utils.IdUtils;
import vben.common.jdbc.dto.PageData;
import vben.common.jdbc.sqler.JdbcHelper;
@@ -16,10 +16,10 @@ import java.util.Date;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgGroupService {
public class SysGroupService {
@Transactional(readOnly = true)
public SysOrgGroup findById(String id) {
public SysGroup findById(String id) {
return groupDao.findById(id);
}
@@ -28,7 +28,7 @@ public class SysOrgGroupService {
return jdbcHelper.findPageData(sqler);
}
public void insert(SysOrgGroup main) {
public void insert(SysGroup main) {
if (main.getId() == null) {
main.setId("g"+IdUtils.getSnowflakeNextIdStr());
}
@@ -38,7 +38,7 @@ public class SysOrgGroupService {
groupDao.insert(main);
}
public void update(SysOrgGroup main) {
public void update(SysGroup main) {
main.setUptim(new Date());
main.setUpuid(LoginHelper.getUserId());
Org org = new Org(main.getId(), main.getName(), 8);
@@ -56,7 +56,7 @@ public class SysOrgGroupService {
private final JdbcHelper jdbcHelper;
private final SysOrgGroupDao groupDao;
private final SysGroupDao groupDao;
private final OrgDao orgDao;
vben-modules/vben-base/src/main/java/vben/base/sys/perm/menu/SysPermMenu.java → vben-modules/vben-base/src/main/java/vben/base/sys/menu/SysMenu.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.menu;
package vben.base.sys.menu;
import lombok.Data;
import vben.common.core.constant.Constants;
@@ -12,7 +12,7 @@ import java.util.List;
* 权限菜单
*/
@Data
public class SysPermMenu {
public class SysMenu {
/**
* 主键ID
@@ -32,7 +32,7 @@ public class SysPermMenu {
/**
* 子菜单
*/
private List<SysPermMenu> children = new ArrayList<>();
private List<SysMenu> children = new ArrayList<>();
/**
* 是否可用
vben-modules/vben-base/src/main/java/vben/base/sys/perm/menu/SysPermMenuApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/menu/SysMenuApi.java
+16 -16
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.menu;
package vben.base.sys.menu;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -16,21 +16,21 @@ import java.util.List;
* 菜单管理
*/
@RestController
@RequestMapping("sys/perm/menu")
@RequestMapping("sys/menu")
@RequiredArgsConstructor
public class SysPermMenuApi {
public class SysMenuApi {
private final SysPermMenuService service;
private final SysMenuService service;
/**
* 菜单列表查询
* @param name 菜单名称
* @return 菜单列表集合
*/
@SaCheckPermission("sysperm:menu:query")
@SaCheckPermission("sys:menu:query")
@GetMapping("list")
public R<List<SysPermMenuVo>> list(String name) {
Sqler sqler = new Sqler("t.*","sys_perm_menu");
public R<List<SysMenuVo>> list(String name) {
Sqler sqler = new Sqler("t.*","sys_menu");
//sqler.addSelect("t.pid,t.notes,t.crtim,t.uptim,t.ornum");
sqler.addLike("t.name", name);
sqler.addOrder("t.ornum");
@@ -45,7 +45,7 @@ public class SysPermMenuApi {
* @param id 菜单ID，如传入则查询出来的树结构会排除自身及子节点
* @return 菜单树状集合
*/
@SaCheckPermission("sysperm:menu:query")
@SaCheckPermission("sys:menu:query")
@GetMapping("tree")
public R<List<Ltree>> tree(Long id) {
return R.ok(service.findTree(id));
@@ -56,10 +56,10 @@ public class SysPermMenuApi {
* @param id 菜单ID
* @return 菜单对象
*/
@SaCheckPermission("sysperm:menu:query")
@SaCheckPermission("sys:menu:query")
@GetMapping("info/{id}")
public R<SysPermMenu> info(@PathVariable Long id) {
SysPermMenu main = service.findById(id);
public R<SysMenu> info(@PathVariable Long id) {
SysMenu main = service.findById(id);
return R.ok(main);
}
@@ -69,9 +69,9 @@ public class SysPermMenuApi {
* @return 菜单ID
*/
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysperm:menu:edit")
@SaCheckPermission("sys:menu:edit")
@PostMapping
public R<Long> post(@RequestBody SysPermMenu main) {
public R<Long> post(@RequestBody SysMenu main) {
if(main.getPid()==null){
main.setPid(0L);
}
@@ -85,9 +85,9 @@ public class SysPermMenuApi {
* @return 菜单ID
*/
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysperm:menu:edit")
@SaCheckPermission("sys:menu:edit")
@PutMapping
public R<Long> put(@RequestBody SysPermMenu main) {
public R<Long> put(@RequestBody SysMenu main) {
if(main.getPid()==null){
main.setPid(0L);
}
@@ -101,7 +101,7 @@ public class SysPermMenuApi {
* @return 菜单数量
*/
@Log(title = "菜单管理", businessType = BusinessType.DELETE)
@SaCheckPermission("sysperm:menu:delete")
@SaCheckPermission("sys:menu:delete")
@DeleteMapping("{ids}")
public R<Integer> delete(@PathVariable Long[] ids) {
return R.ok(service.delete(ids));
vben-modules/vben-base/src/main/java/vben/base/sys/perm/menu/SysPermMenuDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/menu/SysMenuDao.java
+25 -25
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.menu;
package vben.base.sys.menu;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -18,17 +18,17 @@ import java.util.List;
@Component
@RequiredArgsConstructor
public class SysPermMenuDao {
public class SysMenuDao {
public List<SysPermMenu> findListByOids(String oids) {
String sql = "select distinct m.shtag,m.type,m.name,m.path,m.icon,m.comp,m.ornum,m.id,m.pid,m.outag,m.catag from sys_perm_menu m inner join sys_perm_role_menu rm on rm.mid=m.id inner join sys_perm_role_org ro on ro.rid=rm.rid where m.avtag="+Db.True+" and ro.oid in ("+oids+") order by m.pid,m.ornum";
List<SysPermMenu> list = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(SysPermMenu.class));
public List<SysMenu> findListByOids(String oids) {
String sql = "select distinct m.shtag,m.type,m.name,m.path,m.icon,m.comp,m.ornum,m.id,m.pid,m.outag,m.catag from sys_menu m inner join sys_role_menu rm on rm.mid=m.id inner join sys_role_org ro on ro.rid=rm.rid where m.avtag="+Db.True+" and ro.oid in ("+oids+") order by m.pid,m.ornum";
List<SysMenu> list = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(SysMenu.class));
return getChildPerms(list, Constants.TOP_PARENT_ID);
}
public List<SysPermMenu> findAll() {
String sql = "select m.shtag,m.type,m.name,m.path,m.icon,m.comp,m.ornum,m.id,m.pid,m.outag,m.catag from sys_perm_menu m where m.avtag="+Db.True+" order by m.pid,m.ornum";
List<SysPermMenu> list = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(SysPermMenu.class));
public List<SysMenu> findAll() {
String sql = "select m.shtag,m.type,m.name,m.path,m.icon,m.comp,m.ornum,m.id,m.pid,m.outag,m.catag from sys_menu m where m.avtag="+Db.True+" order by m.pid,m.ornum";
List<SysMenu> list = jdbcHelper.getTp().query(sql, new BeanPropertyRowMapper<>(SysMenu.class));
return getChildPerms(list, Constants.TOP_PARENT_ID);
}
@@ -39,9 +39,9 @@ public class SysPermMenuDao {
* @param parentId 传入的父节点ID
* @return String
*/
private List<SysPermMenu> getChildPerms(List<SysPermMenu> list, Long parentId) {
List<SysPermMenu> returnList = new ArrayList<>();
for (SysPermMenu t : list) {
private List<SysMenu> getChildPerms(List<SysMenu> list, Long parentId) {
List<SysMenu> returnList = new ArrayList<>();
for (SysMenu t : list) {
// 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
if (t.getPid().equals(parentId)) {
recursionFn(list, t);
@@ -55,11 +55,11 @@ public class SysPermMenuDao {
/**
* 递归列表
*/
private void recursionFn(List<SysPermMenu> list, SysPermMenu t) {
private void recursionFn(List<SysMenu> list, SysMenu t) {
// 得到子节点列表
List<SysPermMenu> childList = StreamUtils.filter(list, n -> n.getPid().equals(t.getId()));
List<SysMenu> childList = StreamUtils.filter(list, n -> n.getPid().equals(t.getId()));
t.setChildren(childList);
for (SysPermMenu tChild : childList) {
for (SysMenu tChild : childList) {
// 判断是否有子节点
if (list.stream().anyMatch(n -> n.getPid().equals(tChild.getId()))) {
recursionFn(list, tChild);
@@ -67,14 +67,14 @@ public class SysPermMenuDao {
}
}
public SysPermMenu findById(Long id) {
String sql = "select * from sys_perm_menu where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysPermMenu.class), id);
public SysMenu findById(Long id) {
String sql = "select * from sys_menu where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysMenu.class), id);
}
public void insert(SysPermMenu menu) {
public void insert(SysMenu menu) {
menu.setId(IdUtils.getSnowflakeNextId());
Isqler isqler = new Isqler("sys_perm_menu");
Isqler isqler = new Isqler("sys_menu");
isqler.add("id", menu.getId());
isqler.add("name", menu.getName());
isqler.add("pid", menu.getPid());
@@ -94,8 +94,8 @@ public class SysPermMenuDao {
jdbcHelper.getTp().update(isqler.getSql(), isqler.getParams());
}
public void update(SysPermMenu menu) {
Usqler usqler = new Usqler("sys_perm_menu");
public void update(SysMenu menu) {
Usqler usqler = new Usqler("sys_menu");
usqler.addWhere("id=?", menu.getId());
usqler.add("name", menu.getName());
usqler.add("pid", menu.getPid());
@@ -115,12 +115,12 @@ public class SysPermMenuDao {
}
public void deleteById(Long id) {
String sql = "delete from sys_perm_menu where id=?";
String sql = "delete from sys_menu where id=?";
jdbcHelper.getTp().update(sql, id);
}
public List<Ltree> findTree(Long id){
Sqler sqler = new Sqler("sys_perm_menu");
Sqler sqler = new Sqler("sys_menu");
sqler.addSelect("pid");
sqler.addWhere("t.avtag = "+ Db.True);
if (id!=null) {
@@ -136,9 +136,9 @@ public class SysPermMenuDao {
private final JdbcHelper jdbcHelper;
public List<SysPermMenuVo> findList(Sqler sqler) {
public List<SysMenuVo> findList(Sqler sqler) {
return jdbcHelper.getTp().query(sqler.getSql(),
new BeanPropertyRowMapper<>(SysPermMenuVo.class),sqler.getParams());
new BeanPropertyRowMapper<>(SysMenuVo.class),sqler.getParams());
}
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/menu/SysPermMenuService.java → vben-modules/vben-base/src/main/java/vben/base/sys/menu/SysMenuService.java
+7 -7
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.menu;
package vben.base.sys.menu;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -11,10 +11,10 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysPermMenuService {
public class SysMenuService {
@Transactional(readOnly = true)
public SysPermMenu findById(Long id) {
public SysMenu findById(Long id) {
return dao.findById(id);
}
@@ -24,15 +24,15 @@ public class SysPermMenuService {
}
@Transactional(readOnly = true)
public List<SysPermMenuVo> findList(Sqler sqler) {
public List<SysMenuVo> findList(Sqler sqler) {
return dao.findList(sqler);
}
public void insert(SysPermMenu main) {
public void insert(SysMenu main) {
dao.insert(main);
}
public void update(SysPermMenu main) {
public void update(SysMenu main) {
dao.update(main);
}
@@ -43,6 +43,6 @@ public class SysPermMenuService {
return ids.length;
}
private final SysPermMenuDao dao;
private final SysMenuDao dao;
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/menu/SysPermMenuVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/menu/SysMenuVo.java
+3 -3
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.menu;
package vben.base.sys.menu;
import lombok.Data;
@@ -6,7 +6,7 @@ import java.util.Date;
import java.util.List;
@Data
public class SysPermMenuVo {
public class SysMenuVo {
/**
* 主键ID
@@ -31,7 +31,7 @@ public class SysPermMenuVo {
/**
* 子菜单
*/
private List<SysPermMenuVo> children;
private List<SysMenuVo> children;
/**
* 备注
vben-modules/vben-base/src/main/java/vben/base/sys/org/root/Org.java → vben-modules/vben-base/src/main/java/vben/base/sys/org/Org.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.root;
package vben.base.sys.org;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/org/root/OrgDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/org/OrgDao.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.root;
package vben.base.sys.org;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
vben-modules/vben-base/src/main/java/vben/base/sys/org/dept/SysOrgDeptDao.java
-96
View File
@@ -1,96 +0,0 @@
package vben.base.sys.org.dept;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Component;
import vben.common.core.utils.StrUtils;
import vben.common.jdbc.dto.Stree;
import vben.common.jdbc.root.Db;
import vben.common.jdbc.sqler.Isqler;
import vben.common.jdbc.sqler.JdbcHelper;
import vben.common.jdbc.sqler.Sqler;
import vben.common.jdbc.sqler.Usqler;
import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgDeptDao {
public SysOrgDept findById(String id) {
String sql = "select * from sys_org_dept where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgDept.class), id);
}
public void insert(SysOrgDept sysOrgDept) {
Isqler sqler = new Isqler("sys_org_dept");
sqler.add("id", sysOrgDept.getId());
sqler.add("name", sysOrgDept.getName());
sqler.add("type", sysOrgDept.getType());
sqler.add("pid", sysOrgDept.getPid());
sqler.add("tier", sysOrgDept.getTier());
sqler.add("notes", sysOrgDept.getNotes());
sqler.add("ornum", sysOrgDept.getOrnum());
sqler.add("crtim", sysOrgDept.getCrtim());
sqler.add("uptim", sysOrgDept.getCrtim());
sqler.add("avtag", sysOrgDept.getAvtag());
sqler.add("label", sysOrgDept.getLabel());
sqler.add("cruid", sysOrgDept.getCruid());
sqler.add("upuid", sysOrgDept.getCruid());
sqler.add("ex1", sysOrgDept.getEx1());
sqler.add("ex2", sysOrgDept.getEx2());
sqler.add("ex3", sysOrgDept.getEx3());
sqler.add("ex4", sysOrgDept.getEx4());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
}
public void update(SysOrgDept sysOrgDept) {
Usqler sqler = new Usqler("sys_org_dept");
sqler.addWhere("id=?", sysOrgDept.getId());
sqler.add("name", sysOrgDept.getName());
sqler.add("type", sysOrgDept.getType());
sqler.add("pid", sysOrgDept.getPid());
sqler.add("tier", sysOrgDept.getTier());
sqler.add("notes", sysOrgDept.getNotes());
sqler.add("ornum", sysOrgDept.getOrnum());
sqler.add("uptim", sysOrgDept.getUptim());
sqler.add("avtag", sysOrgDept.getAvtag());
sqler.add("label", sysOrgDept.getLabel());
sqler.add("upuid", sysOrgDept.getUpuid());
sqler.add("ex1", sysOrgDept.getEx1());
sqler.add("ex2", sysOrgDept.getEx2());
sqler.add("ex3", sysOrgDept.getEx3());
sqler.add("ex4", sysOrgDept.getEx4());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
}
public Integer getCount(String pid) {
String sql = "select count(1) from sys_org_dept where pid=?";
return jdbcHelper.getTp().queryForObject(sql, Integer.class, pid);
}
public String findTier(String id) {
String sql = "select tier from sys_org_dept where id=?";
return jdbcHelper.getTp().queryForObject(sql, String.class, id);
}
public void deleteById(String id) {
String sql = "delete from sys_org_dept where id=?";
jdbcHelper.getTp().update(sql, id);
}
public List<Stree> findTree(String id){
Sqler sqler = new Sqler("sys_org_dept");
sqler.addSelect("pid");
sqler.addWhere("t.avtag = "+ Db.True);
if (StrUtils.isNotBlank(id)) {
sqler.addWhere("t.tier not like ?", "%_" + id + "_%");
// sqler.addWhere("t.id <> ?", id);
}
sqler.addOrder("t.ornum");
return jdbcHelper.findStreeList(sqler);
}
private final JdbcHelper jdbcHelper;
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/post/SysOrgPost.java → vben-modules/vben-base/src/main/java/vben/base/sys/post/SysPost.java
+3 -3
View File
@@ -1,7 +1,7 @@
package vben.base.sys.org.post;
package vben.base.sys.post;
import lombok.Data;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import java.util.Date;
import java.util.List;
@@ -10,7 +10,7 @@ import java.util.List;
* 组织架构岗位
*/
@Data
public class SysOrgPost {
public class SysPost {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/org/post/SysOrgPostApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/post/SysPostApi.java
+15 -15
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.post;
package vben.base.sys.post;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -14,11 +14,11 @@ import vben.common.log.enums.BusinessType;
* 岗位管理
*/
@RestController
@RequestMapping("sys/org/post")
@RequestMapping("sys/post")
@RequiredArgsConstructor
public class SysOrgPostApi {
public class SysPostApi {
private final SysOrgPostService service;
private final SysPostService service;
/**
* 岗位分页查询
@@ -26,16 +26,16 @@ public class SysOrgPostApi {
* @param name 岗位名称
* @return 岗位分页数据
*/
@SaCheckPermission("sysorg:post:query")
@SaCheckPermission("sys:post:query")
@GetMapping
public R<PageData> get(String depid, String name) {
Sqler sqler = new Sqler("sys_org_post");
Sqler sqler = new Sqler("sys_post");
if (StrUtils.isNotBlank(name)) {
sqler.addLike("t.name", name);
} else if (depid!=null) {
sqler.addEqual("t.depid", depid);
}
sqler.addInnerJoin("d.name depna","sys_org_dept d","d.id=t.depid");
sqler.addInnerJoin("d.name depna","sys_dept d","d.id=t.depid");
sqler.addSelect("t.crtim,t.uptim,t.notes,t.avtag");
sqler.addOrder("t.ornum");
return R.ok(service.findPageData(sqler));
@@ -46,10 +46,10 @@ public class SysOrgPostApi {
* @param id 岗位ID
* @return 岗位对象
*/
@SaCheckPermission("sysorg:post:query")
@SaCheckPermission("sys:post:query")
@GetMapping("info/{id}")
public R<SysOrgPost> info(@PathVariable String id) {
SysOrgPost main = service.findById(id);
public R<SysPost> info(@PathVariable String id) {
SysPost main = service.findById(id);
return R.ok(main);
}
@@ -59,9 +59,9 @@ public class SysOrgPostApi {
* @return 岗位ID
*/
@Log(title = "岗位管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysorg:post:edit")
@SaCheckPermission("sys:post:edit")
@PostMapping
public R<String> post(@RequestBody SysOrgPost main) {
public R<String> post(@RequestBody SysPost main) {
service.insert(main);
return R.ok(null,main.getId());
}
@@ -72,9 +72,9 @@ public class SysOrgPostApi {
* @return 岗位ID
*/
@Log(title = "岗位管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysorg:post:edit")
@SaCheckPermission("sys:post:edit")
@PutMapping
public R<String> put(@RequestBody SysOrgPost main) {
public R<String> put(@RequestBody SysPost main) {
service.update(main);
return R.ok(null,main.getId());
}
@@ -85,7 +85,7 @@ public class SysOrgPostApi {
* @return 岗位数量
*/
@Log(title = "岗位管理", businessType = BusinessType.DELETE)
@SaCheckPermission("sysorg:post:delete")
@SaCheckPermission("sys:post:delete")
@DeleteMapping("{ids}")
public R<Integer> delete(@PathVariable String[] ids) {
return R.ok(service.delete(ids));
vben-modules/vben-base/src/main/java/vben/base/sys/org/post/SysOrgPostDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/post/SysPostDao.java
+16 -16
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.post;
package vben.base.sys.post;
import lombok.RequiredArgsConstructor;
import vben.common.jdbc.sqler.Isqler;
@@ -6,26 +6,26 @@ import vben.common.jdbc.sqler.JdbcHelper;
import vben.common.jdbc.sqler.Usqler;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Component;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import java.util.ArrayList;
import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgPostDao {
public class SysPostDao {
public SysOrgPost findById(String id) {
String sql = "select * from sys_org_post where id = ?";
SysOrgPost post= jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgPost.class), id);
String sql2 = "select t.id,t.name from sys_org t inner join sys_org_post_org o on o.oid=t.id where o.pid = ?";
public SysPost findById(String id) {
String sql = "select * from sys_post where id = ?";
SysPost post= jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysPost.class), id);
String sql2 = "select t.id,t.name from sys_org t inner join sys_post_org o on o.oid=t.id where o.pid = ?";
List<Org> users = jdbcHelper.getTp().query(sql2, new BeanPropertyRowMapper<>(Org.class), id);
post.setUsers(users);
return post;
}
public void insert(SysOrgPost post) {
Isqler sqler = new Isqler("sys_org_post");
public void insert(SysPost post) {
Isqler sqler = new Isqler("sys_post");
sqler.add("id", post.getId());
sqler.add("name", post.getName());
sqler.add("depid", post.getDepid());
@@ -46,12 +46,12 @@ public class SysOrgPostDao {
arr[1]=user.getId();
insertMemberList.add(arr);
}
String insertMemberSql="insert into sys_org_post_org(pid,oid) values(?,?)";
String insertMemberSql="insert into sys_post_org(pid,oid) values(?,?)";
jdbcHelper.batch(insertMemberSql, insertMemberList);
}
public void update(SysOrgPost post) {
Usqler sqler = new Usqler("sys_org_post");
public void update(SysPost post) {
Usqler sqler = new Usqler("sys_post");
sqler.addWhere("id=?", post.getId());
sqler.add("name", post.getName());
sqler.add("depid", post.getDepid());
@@ -63,7 +63,7 @@ public class SysOrgPostDao {
sqler.add("label", post.getLabel());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
jdbcHelper.update("delete from sys_org_post_org where pid = ?", post.getId());
jdbcHelper.update("delete from sys_post_org where pid = ?", post.getId());
List<Object[]> insertMemberList = new ArrayList<>();
for (Org user : post.getUsers()) {
Object[] arr=new Object[2];
@@ -71,15 +71,15 @@ public class SysOrgPostDao {
arr[1]=user.getId();
insertMemberList.add(arr);
}
String insertMemberSql="insert into sys_org_post_org(pid,oid) values(?,?)";
String insertMemberSql="insert into sys_post_org(pid,oid) values(?,?)";
jdbcHelper.batch(insertMemberSql, insertMemberList);
}
public void deleteById(String id) {
String sql = "delete from sys_org_post where id=?";
String sql = "delete from sys_post where id=?";
jdbcHelper.getTp().update(sql, id);
String sql2 = "delete from sys_org_post_org where pid=?";
String sql2 = "delete from sys_post_org where pid=?";
jdbcHelper.getTp().update(sql2, id);
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/post/SysOrgPostService.java → vben-modules/vben-base/src/main/java/vben/base/sys/post/SysPostService.java
+10 -10
View File
@@ -1,10 +1,10 @@
package vben.base.sys.org.post;
package vben.base.sys.post;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.root.OrgDao;
import vben.base.sys.org.Org;
import vben.base.sys.org.OrgDao;
import vben.common.core.utils.IdUtils;
import vben.common.jdbc.dto.PageData;
import vben.common.jdbc.sqler.JdbcHelper;
@@ -16,28 +16,28 @@ import java.util.Date;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgPostService {
public class SysPostService {
public PageData findPageData(Sqler sqler) {
return jdbcHelper.findPageData(sqler);
}
public void insert(SysOrgPost main) {
public void insert(SysPost main) {
if (main.getId() == null ) {
main.setId("p"+IdUtils.getSnowflakeNextIdStr());
}
main.setCruid(LoginHelper.getUserId());
String tier = jdbcHelper.findString("select tier from sys_org_dept where id=?", main.getDepid());
String tier = jdbcHelper.findString("select tier from sys_dept where id=?", main.getDepid());
main.setTier(tier + main.getId() + "_");
Org org = new Org(main.getId(), main.getName(),4);
orgDao.insert(org);
postDao.insert(main);
}
public void update(SysOrgPost main) {
public void update(SysPost main) {
main.setUptim(new Date());
main.setUpuid(LoginHelper.getUserId());
String tier = jdbcHelper.findString("select tier from sys_org_dept where id=?", main.getDepid());
String tier = jdbcHelper.findString("select tier from sys_dept where id=?", main.getDepid());
main.setTier(tier +main.getId() + "_");
Org org = new Org(main.getId(), main.getName(),4);
postDao.update(main);
@@ -53,13 +53,13 @@ public class SysOrgPostService {
}
@Transactional(readOnly = true)
public SysOrgPost findById(String id) {
public SysPost findById(String id) {
return postDao.findById(id);
}
private final JdbcHelper jdbcHelper;
private final SysOrgPostDao postDao;
private final SysPostDao postDao;
private final OrgDao orgDao;
vben-modules/vben-base/src/main/java/vben/base/sys/profile/SysProfileApi.java
+5 -5
View File
@@ -6,8 +6,8 @@ import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import vben.base.sys.org.user.SysOrgUser;
import vben.base.sys.org.user.SysOrgUserService;
import vben.base.sys.user.SysUser;
import vben.base.sys.user.SysUserService;
import vben.base.tool.oss.main.ToolOssMainService;
import vben.base.tool.oss.root.Zfile;
import vben.base.tool.oss.service.SysOssService;
@@ -35,7 +35,7 @@ import java.util.Arrays;
@RequestMapping("/system/user/profile")
public class SysProfileApi extends BaseController {
private final SysOrgUserService userService;
private final SysUserService userService;
private final SysOssService ossService;
@@ -46,7 +46,7 @@ public class SysProfileApi extends BaseController {
*/
@GetMapping
public R<ProfileVo> profile() {
SysOrgUser user = userService.findById(LoginHelper.getUserId());
SysUser user = userService.findById(LoginHelper.getUserId());
ProfileUserVo vo=new ProfileUserVo();
vo.setUserId(user.getId());
vo.setEmail(user.getEmail());
@@ -73,7 +73,7 @@ public class SysProfileApi extends BaseController {
*/
@PutMapping
public R<Void> updateProfile(@Validated @RequestBody SysUserProfileBo profile) {
SysOrgUser user = userService.findById(LoginHelper.getUserId());
SysUser user = userService.findById(LoginHelper.getUserId());
user.setEmail(profile.getEmail());
user.setName(profile.getNickName());
user.setNinam(profile.getNickName());
vben-modules/vben-base/src/main/java/vben/base/sys/org/rece/SysOrgRece.java → vben-modules/vben-base/src/main/java/vben/base/sys/rece/SysRece.java
+2 -2
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.rece;
package vben.base.sys.rece;
import lombok.Data;
@@ -8,7 +8,7 @@ import java.util.Date;
* 组织架构最近访问记录
*/
@Data
public class SysOrgRece {
public class SysRece {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/org/rece/SysOrgReceDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/rece/SysReceDao.java
+9 -9
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.rece;
package vben.base.sys.rece;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
@@ -10,12 +10,12 @@ import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgReceDao {
public class SysReceDao {
public void saveAll(List<SysOrgRece> list) {
public void saveAll(List<SysRece> list) {
List<Object[]> deleteList = new ArrayList<>();
List<Object[]> insertLIst = new ArrayList<>();
for (SysOrgRece rece : list) {
for (SysRece rece : list) {
Object[] arr = new Object[2];
arr[0] = rece.getUseid();
arr[1] = rece.getOid();
@@ -28,15 +28,15 @@ public class SysOrgReceDao {
arr2[3] = rece.getUptim();
insertLIst.add(arr2);
}
String deleteSql = "delete from sys_org_rece where useid=? and oid=?";
String deleteSql = "delete from sys_rece where useid=? and oid=?";
jdbcHelper.batch(deleteSql, deleteList);
String insertSql = "insert into sys_org_rece(id,useid,oid,uptim) values(?,?,?,?)";
String insertSql = "insert into sys_rece(id,useid,oid,uptim) values(?,?,?,?)";
jdbcHelper.batch(insertSql, insertLIst);
}
public void insert(SysOrgRece rece) {
Isqler sqler = new Isqler("sys_org_rece");
public void insert(SysRece rece) {
Isqler sqler = new Isqler("sys_rece");
sqler.add("id", rece.getId());
sqler.add("name", rece.getUseid());
sqler.add("depid", rece.getOid());
@@ -45,7 +45,7 @@ public class SysOrgReceDao {
}
public void deleteById(String id) {
String sql = "delete from sys_org_rece where id=?";
String sql = "delete from sys_rece where id=?";
jdbcHelper.getTp().update(sql, id);
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/rece/SysOrgReceService.java → vben-modules/vben-base/src/main/java/vben/base/sys/rece/SysReceService.java
+14 -14
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.rece;
package vben.base.sys.rece;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -15,11 +15,11 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgReceService {
public class SysReceService {
//todo 有时间再优化
public int update(List<SysOrgRece> reces,String userId) {
for (SysOrgRece rece : reces) {
public int update(List<SysRece> reces, String userId) {
for (SysRece rece : reces) {
rece.setOid(rece.getId());
rece.setId(IdUtils.getSnowflakeNextIdStr());
rece.setUseid(userId);
@@ -27,24 +27,24 @@ public class SysOrgReceService {
//1.如果当前数量小于10，则去数据库查询最新的差额记录数
if (reces.size() < 10) {
Sqler sqler = new Sqler("t.id,t.useid,t.oid,t.uptim", "sys_org_rece", 1, 10 - reces.size());
Sqler sqler = new Sqler("t.id,t.useid,t.oid,t.uptim", "sys_rece", 1, 10 - reces.size());
sqler.addDescOrder("t.uptim");
sqler.addEqual("t.useid", userId);
List<SysOrgRece> list;
List<SysRece> list;
if (DbType.MYSQL.equals(Db.Type)) {
list = jdbcHelper.getTp().query(sqler.getMysqlPagingSql(), new BeanPropertyRowMapper<>(SysOrgRece.class),sqler.getParams());
list = jdbcHelper.getTp().query(sqler.getMysqlPagingSql(), new BeanPropertyRowMapper<>(SysRece.class),sqler.getParams());
} else if(DbType.PGSQL.equals(Db.Type)) {
list = jdbcHelper.getTp().query(sqler.getPgsqlPagingSql(), new BeanPropertyRowMapper<>(SysOrgRece.class),sqler.getParams());
list = jdbcHelper.getTp().query(sqler.getPgsqlPagingSql(), new BeanPropertyRowMapper<>(SysRece.class),sqler.getParams());
} else if(DbType.ORACLE.equals(Db.Type)) {
list = jdbcHelper.getTp().query(sqler.getOraclePagingLowerCaseSql(), new BeanPropertyRowMapper<>(SysOrgRece.class),sqler.getParams());
list = jdbcHelper.getTp().query(sqler.getOraclePagingLowerCaseSql(), new BeanPropertyRowMapper<>(SysRece.class),sqler.getParams());
}else{
list = jdbcHelper.getTp().query(sqler.getSqlserverPagingSql(), new BeanPropertyRowMapper<>(SysOrgRece.class),sqler.getParams());
list = jdbcHelper.getTp().query(sqler.getSqlserverPagingSql(), new BeanPropertyRowMapper<>(SysRece.class),sqler.getParams());
}
//去重
for (SysOrgRece dbRece : list) {
for (SysRece dbRece : list) {
boolean flag = false;
for (SysOrgRece rece : reces) {
for (SysRece rece : reces) {
if (dbRece.getOid().equals(rece.getOid())) {
flag = true;
}
@@ -56,7 +56,7 @@ public class SysOrgReceService {
}
//2.清空当前用户的最近使用记录
jdbcHelper.update("delete from sys_org_rece where useid=?", userId);
jdbcHelper.update("delete from sys_rece where useid=?", userId);
//3.更新记录
dao.saveAll(reces);
@@ -65,6 +65,6 @@ public class SysOrgReceService {
private final JdbcHelper jdbcHelper;
private final SysOrgReceDao dao;
private final SysReceDao dao;
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/ApiVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/ApiVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/MenuVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/MenuVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/SysPermRole.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/SysRole.java
+2 -2
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import lombok.Data;
import vben.common.jdbc.dto.SidName;
@@ -11,7 +11,7 @@ import java.util.List;
* 权限角色
*/
@Data
public class SysPermRole {
public class SysRole {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/SysPermRoleApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/SysRoleApi.java
+16 -16
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import cn.dev33.satoken.annotation.SaCheckPermission;
import lombok.RequiredArgsConstructor;
@@ -15,21 +15,21 @@ import java.util.List;
* 角色管理
*/
@RestController
@RequestMapping("sys/perm/role")
@RequestMapping("sys/role")
@RequiredArgsConstructor
public class SysPermRoleApi {
public class SysRoleApi {
private final SysPermRoleService service;
private final SysRoleService service;
/**
* 角色分页查询
* @param name 角色名称
* @return 角色分页数据
*/
@SaCheckPermission("sysperm:role:query")
@SaCheckPermission("sys:role:query")
@GetMapping
public R<PageData> get(String name) {
Sqler sqler = new Sqler("sys_perm_role");
Sqler sqler = new Sqler("sys_role");
sqler.addLike("t.name", name);
sqler.addSelect("t.notes,t.ornum,t.crtim");
sqler.addOrder("t.ornum");
@@ -42,10 +42,10 @@ public class SysPermRoleApi {
* @param id 角色ID
* @return 角色对象
*/
@SaCheckPermission("sysperm:role:query")
@SaCheckPermission("sys:role:query")
@GetMapping("info/{id}")
public R<SysPermRole> info(@PathVariable Long id) {
SysPermRole main = service.findById(id);
public R<SysRole> info(@PathVariable Long id) {
SysRole main = service.findById(id);
return R.ok(main);
}
@@ -53,7 +53,7 @@ public class SysPermRoleApi {
* 菜单与接口关联数据查询
* @return 菜单与权限集合
*/
@SaCheckPermission("sysperm:role:query")
@SaCheckPermission("sys:role:query")
@GetMapping("perms")
public R<List<MenuVo>> perms() {
List<MenuVo> list = service.findMenuVoList();
@@ -66,9 +66,9 @@ public class SysPermRoleApi {
* @return 角色ID
*/
@Log(title = "角色管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysperm:role:edit")
@SaCheckPermission("sys:role:edit")
@PostMapping
public R<Long> post(@RequestBody SysPermRole main) {
public R<Long> post(@RequestBody SysRole main) {
service.insert(main);
return R.ok(null,main.getId());
}
@@ -79,9 +79,9 @@ public class SysPermRoleApi {
* @return 角色ID
*/
@Log(title = "角色管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysperm:role:edit")
@SaCheckPermission("sys:role:edit")
@PutMapping
public R<Long> put(@RequestBody SysPermRole main) {
public R<Long> put(@RequestBody SysRole main) {
service.update(main);
return R.ok(null,main.getId());
}
@@ -92,7 +92,7 @@ public class SysPermRoleApi {
* @return 角色数量
*/
@Log(title = "角色管理", businessType = BusinessType.DELETE)
@SaCheckPermission("sysperm:role:delete")
@SaCheckPermission("sys:role:delete")
@DeleteMapping("{ids}")
public R<Integer> delete(@PathVariable Long[] ids) {
return R.ok(service.delete(ids));
@@ -102,7 +102,7 @@ public class SysPermRoleApi {
* 角色菜单与权限刷新
*/
@Log(title = "角色管理", businessType = BusinessType.GRANT)
@SaCheckPermission("sysperm:role:edit")
@SaCheckPermission("sys:role:edit")
@PutMapping("cache")
public R<Void> cache() {
service.clearCache();
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/SysPermRoleDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/SysRoleDao.java
+27 -27
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -17,15 +17,15 @@ import java.util.Objects;
@Component
@RequiredArgsConstructor
public class SysPermRoleDao {
public class SysRoleDao {
private final JdbcHelper jdbcHelper;
public List<MenuVo> findMenuVoList() {
String menuSql="select id,name,pid,icon,type from sys_perm_menu where avtag="+Db.True+" order by ornum";
String menuSql="select id,name,pid,icon,type from sys_menu where avtag="+Db.True+" order by ornum";
List<MenuVo> menus= jdbcHelper.getTp().query(menuSql, new BeanPropertyRowMapper<>(MenuVo.class));
String apiSql="select id,name,menid from sys_perm_api where avtag="+Db.True+" order by ornum";
String apiSql="select id,name,menid from sys_api where avtag="+Db.True+" order by ornum";
List<ApiVo> apis= jdbcHelper.getTp().query(apiSql, new BeanPropertyRowMapper<>(ApiVo.class));
for (MenuVo menu : menus) {
@@ -42,9 +42,9 @@ public class SysPermRoleDao {
return jdbcHelper.findPageData(sqler);
}
public SysPermRole findById(Long id) {
String sql = "select * from sys_perm_role where id = ?";
SysPermRole role = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysPermRole.class), id);
public SysRole findById(Long id) {
String sql = "select * from sys_role where id = ?";
SysRole role = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysRole.class), id);
//创建人与修改人
String cusql = "select name from sys_org where id = ?";
if(role.getCruid()!=null){
@@ -54,18 +54,18 @@ public class SysPermRoleDao {
role.setUpuna(jdbcHelper.findString(cusql, role.getUpuid()));
}
//成员、菜单与接口
String orgSql="select t.id,t.name from sys_org t inner join sys_perm_role_org o on o.oid=t.id where o.rid=?";
String orgSql="select t.id,t.name from sys_org t inner join sys_role_org o on o.oid=t.id where o.rid=?";
List<SidName> orgList = jdbcHelper.getTp().query(orgSql, new BeanPropertyRowMapper<>(SidName.class),id);
role.setOrgs(orgList);
List<Long> menidList = jdbcHelper.findLlist("select mid id from sys_perm_role_menu where rid=?", id);
List<Long> menidList = jdbcHelper.findLlist("select mid id from sys_role_menu where rid=?", id);
role.setMenus(menidList);
List<Long> apiidList = jdbcHelper.findLlist("select aid id from sys_perm_role_api where rid=?", id);
List<Long> apiidList = jdbcHelper.findLlist("select aid id from sys_role_api where rid=?", id);
role.setApis(apiidList);
return role;
}
public void insert(SysPermRole role) {
Isqler sqler = new Isqler("sys_perm_role");
public void insert(SysRole role) {
Isqler sqler = new Isqler("sys_role");
sqler.add("id", role.getId());
sqler.add("name", role.getName());
sqler.add("notes", role.getNotes());
@@ -79,7 +79,7 @@ public class SysPermRoleDao {
sqler.add("scope", role.getScope());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
String apiSql = "insert into sys_perm_role_api(rid,aid) values(?,?)";
String apiSql = "insert into sys_role_api(rid,aid) values(?,?)";
List<Object[]> apiInsertList = new ArrayList<>();
for (Long aid : role.getApis()) {
Object[] arr = new Object[2];
@@ -89,7 +89,7 @@ public class SysPermRoleDao {
}
jdbcHelper.batch(apiSql, apiInsertList);
String menuSql = "insert into sys_perm_role_menu(rid,mid) values(?,?)";
String menuSql = "insert into sys_role_menu(rid,mid) values(?,?)";
List<Object[]> menuInsertList = new ArrayList<>();
for (Long mid : role.getMenus()) {
Object[] arr = new Object[2];
@@ -99,7 +99,7 @@ public class SysPermRoleDao {
}
jdbcHelper.batch(menuSql, menuInsertList);
String orgSql = "insert into sys_perm_role_org(rid,oid) values(?,?)";
String orgSql = "insert into sys_role_org(rid,oid) values(?,?)";
List<Object[]> orgInsertList = new ArrayList<>();
for (SidName sidName : role.getOrgs()) {
Object[] arr = new Object[2];
@@ -110,8 +110,8 @@ public class SysPermRoleDao {
jdbcHelper.batch(orgSql, orgInsertList);
}
public void update(SysPermRole role) {
Usqler sqler = new Usqler("sys_perm_role");
public void update(SysRole role) {
Usqler sqler = new Usqler("sys_role");
sqler.addWhere("id=?", role.getId());
sqler.add("name", role.getName());
sqler.add("notes", role.getNotes());
@@ -123,8 +123,8 @@ public class SysPermRoleDao {
sqler.add("scope", role.getScope());
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
jdbcHelper.update("delete from sys_perm_role_api where rid=?", role.getId());
String apiSql = "insert into sys_perm_role_api(rid,aid) values(?,?)";
jdbcHelper.update("delete from sys_role_api where rid=?", role.getId());
String apiSql = "insert into sys_role_api(rid,aid) values(?,?)";
List<Object[]> apiInsertList = new ArrayList<>();
for (Long aid : role.getApis()) {
Object[] arr = new Object[2];
@@ -134,8 +134,8 @@ public class SysPermRoleDao {
}
jdbcHelper.batch(apiSql, apiInsertList);
jdbcHelper.update("delete from sys_perm_role_menu where rid=?", role.getId());
String menuSql = "insert into sys_perm_role_menu(rid,mid) values(?,?)";
jdbcHelper.update("delete from sys_role_menu where rid=?", role.getId());
String menuSql = "insert into sys_role_menu(rid,mid) values(?,?)";
List<Object[]> menuInsertList = new ArrayList<>();
for (Long mid : role.getMenus()) {
Object[] arr = new Object[2];
@@ -145,8 +145,8 @@ public class SysPermRoleDao {
}
jdbcHelper.batch(menuSql, menuInsertList);
jdbcHelper.update("delete from sys_perm_role_org where rid=?", role.getId());
String orgSql = "insert into sys_perm_role_org(rid,oid) values(?,?)";
jdbcHelper.update("delete from sys_role_org where rid=?", role.getId());
String orgSql = "insert into sys_role_org(rid,oid) values(?,?)";
List<Object[]> orgInsertList = new ArrayList<>();
for (SidName sidName : role.getOrgs()) {
Object[] arr = new Object[2];
@@ -158,10 +158,10 @@ public class SysPermRoleDao {
}
public void deleteById(Long id) {
jdbcHelper.update("delete from sys_perm_role_org where rid=?", id);
jdbcHelper.update("delete from sys_perm_role_api where rid=?", id);
jdbcHelper.update("delete from sys_perm_role_menu where rid=?", id);
jdbcHelper.update("delete from sys_perm_role where id=?", id);
jdbcHelper.update("delete from sys_role_org where rid=?", id);
jdbcHelper.update("delete from sys_role_api where rid=?", id);
jdbcHelper.update("delete from sys_role_menu where rid=?", id);
jdbcHelper.update("delete from sys_role where id=?", id);
}
}
vben-modules/vben-base/src/main/java/vben/base/sys/perm/role/SysPermRoleService.java → vben-modules/vben-base/src/main/java/vben/base/sys/role/SysRoleService.java
+6 -6
View File
@@ -1,4 +1,4 @@
package vben.base.sys.perm.role;
package vben.base.sys.role;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -14,16 +14,16 @@ import java.util.List;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysPermRoleService {
public class SysRoleService {
private final SysPermRoleDao dao;
private final SysRoleDao dao;
@Transactional(readOnly = true)
public PageData findPageData(Sqler sqler) {
return dao.findPageData(sqler);
}
public SysPermRole findById(Long id) {
public SysRole findById(Long id) {
return dao.findById(id);
}
@@ -31,14 +31,14 @@ public class SysPermRoleService {
return dao.findMenuVoList();
}
public void insert(SysPermRole main) {
public void insert(SysRole main) {
main.setId(IdUtils.getSnowflakeNextId());
main.setCruid(LoginHelper.getUserId());
dao.insert(main);
clearCache();
}
public void update(SysPermRole main) {
public void update(SysRole main) {
dao.update(main);
main.setUpuid(LoginHelper.getUserId());
clearCache();
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/SysOrgUser.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/SysUser.java
+2 -2
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.user;
package vben.base.sys.user;
import lombok.Data;
import lombok.experimental.Accessors;
@@ -10,7 +10,7 @@ import java.util.Date;
*/
@Data
@Accessors(chain = true)
public class SysOrgUser {
public class SysUser {
/**
* 主键ID
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/SysOrgUserApi.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/SysUserApi.java
+12 -12
View File
@@ -1,11 +1,11 @@
package vben.base.sys.org.user;
package vben.base.sys.user;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.crypto.digest.BCrypt;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import vben.base.sys.org.user.bo.IdAvtagBo;
import vben.base.sys.org.user.bo.IdPacodBo;
import vben.base.sys.user.bo.IdAvtagBo;
import vben.base.sys.user.bo.IdPacodBo;
import vben.common.core.domain.R;
import vben.common.core.utils.StrUtils;
import vben.common.jdbc.dto.PageData;
@@ -17,11 +17,11 @@ import vben.common.log.enums.BusinessType;
* 用户管理
*/
@RestController
@RequestMapping("sys/org/user")
@RequestMapping("sys/user")
@RequiredArgsConstructor
public class SysOrgUserApi {
public class SysUserApi {
private final SysOrgUserService service;
private final SysUserService service;
/**
* 用户分页查询
@@ -35,7 +35,7 @@ public class SysOrgUserApi {
@SaCheckPermission("sysorg:user:query")
@GetMapping
public R<PageData> get(String depid, String name, String usnam, String ninam, String monum) {
Sqler sqler = new Sqler("sys_org_user");
Sqler sqler = new Sqler("sys_user");
if (StrUtils.isNotBlank(name) || StrUtils.isNotBlank(usnam) || StrUtils.isNotBlank(ninam) || StrUtils.isNotBlank(monum)) {
sqler.addLike("t.name", name);
sqler.addLike("t.usnam", usnam);
@@ -44,7 +44,7 @@ public class SysOrgUserApi {
} else if (depid!=null) {
sqler.addEqual("t.depid", depid);
}
sqler.addLeftJoin("d.name depna","sys_org_dept d","d.id=t.depid");
sqler.addLeftJoin("d.name depna","sys_dept d","d.id=t.depid");
sqler.addSelect("t.crtim,t.uptim,t.notes,t.avtag,t.monum,t.usnam");
sqler.addOrder("t.ornum");
return R.ok(service.findPageData(sqler));
@@ -57,8 +57,8 @@ public class SysOrgUserApi {
*/
@SaCheckPermission("sysorg:user:query")
@GetMapping("info/{id}")
public R<SysOrgUser> info(@PathVariable String id) {
SysOrgUser main = service.findById(id);
public R<SysUser> info(@PathVariable String id) {
SysUser main = service.findById(id);
return R.ok(main);
}
@@ -70,7 +70,7 @@ public class SysOrgUserApi {
@Log(title = "用户管理", businessType = BusinessType.INSERT)
@SaCheckPermission("sysorg:user:edit")
@PostMapping
public R<String> post(@RequestBody SysOrgUser main) {
public R<String> post(@RequestBody SysUser main) {
service.insert(main);
return R.ok(null,main.getId());
}
@@ -83,7 +83,7 @@ public class SysOrgUserApi {
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@SaCheckPermission("sysorg:user:edit")
@PutMapping
public R<String> put(@RequestBody SysOrgUser main) {
public R<String> put(@RequestBody SysUser main) {
service.update(main);
return R.ok(null,main.getId());
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/SysOrgUserDao.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/SysUserDao.java
+30 -30
View File
@@ -1,12 +1,12 @@
package vben.base.sys.org.user;
package vben.base.sys.user;
import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Component;
import vben.base.mon.login.log.MonLoginLog;
import vben.base.sys.org.user.bo.IdAvtagBo;
import vben.base.sys.org.user.vo.IdCatagTierVo;
import vben.base.sys.user.bo.IdAvtagBo;
import vben.base.sys.user.vo.IdCatagTierVo;
import vben.common.core.exception.ServiceException;
import vben.common.core.utils.StrUtils;
import vben.common.jdbc.sqler.Isqler;
@@ -18,37 +18,37 @@ import java.util.List;
@Component
@RequiredArgsConstructor
public class SysOrgUserDao {
public class SysUserDao {
public void changeAvatg(IdAvtagBo bo) {
String sql = "update sys_org_user set avtag = ? where id = ?";
String sql = "update sys_user set avtag = ? where id = ?";
jdbcHelper.update(sql, bo.avtag, bo.getId());
}
public void resetPassword(String id, String password) {
String sql = "update sys_org_user set pacod = ? where id = ?";
String sql = "update sys_user set pacod = ? where id = ?";
jdbcHelper.update(sql, password, id);
}
public String findPassword(String id) {
String sql = "select pacod from sys_org_user where id=?";
String sql = "select pacod from sys_user where id=?";
return jdbcHelper.getTp().queryForObject(sql, String.class, id);
}
public IdCatagTierVo findCatagTierVo(String id) {
String sql = "select id,catag,tier from sys_org_user where id = ?";
String sql = "select id,catag,tier from sys_user where id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(IdCatagTierVo.class), id);
}
public void updateLogin(MonLoginLog log) {
String sql = "update sys_org_user set loip = ? , lotim = ? where usnam = ?";
String sql = "update sys_user set loip = ? , lotim = ? where usnam = ?";
jdbcHelper.update(sql, log.getLoip(), log.getLotim(), log.getUsnam());
}
//获取组织架构可用集
public String findOrgs(String id) {
String tierSql = "select tier from sys_org_user where id = ?";
String tierSql = "select tier from sys_user where id = ?";
String tier = jdbcHelper.findString(tierSql, id);
StringBuilder orgs = new StringBuilder();
@@ -79,23 +79,23 @@ public class SysOrgUserDao {
//获取组织架构岗位id集合
private List<String> findPostList(String uid) {
String sql = "select pid as id from sys_org_post_org where oid=?";
String sql = "select pid as id from sys_post_org where oid=?";
return jdbcHelper.findSlist(sql, uid);
}
//获取组织架构群组id集合
private List<String> findGroupList(String orgs) {
String sql = "select DISTINCT gid as id from sys_org_group_org where oid in (" + orgs + ")";
String sql = "select DISTINCT gid as id from sys_group_org where oid in (" + orgs + ")";
return jdbcHelper.findSlist(sql);
}
public SysOrgUser findById(String id) {
String sql = "select t.*,o.name depna from sys_org_user t left join sys_org o on o.id=t.depid where t.id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgUser.class), id);
public SysUser findById(String id) {
String sql = "select t.*,o.name depna from sys_user t left join sys_org o on o.id=t.depid where t.id = ?";
return jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysUser.class), id);
}
public void insert(SysOrgUser user) {
Isqler sqler = new Isqler("sys_org_user");
public void insert(SysUser user) {
Isqler sqler = new Isqler("sys_user");
sqler.add("id", user.getId());
sqler.add("name", user.getName());
sqler.add("depid", user.getDepid());
@@ -122,8 +122,8 @@ public class SysOrgUserDao {
jdbcHelper.getTp().update(sqler.getSql(), sqler.getParams());
}
public void update(SysOrgUser user) {
Usqler sqler = new Usqler("sys_org_user");
public void update(SysUser user) {
Usqler sqler = new Usqler("sys_user");
sqler.addWhere("id=?", user.getId());
sqler.add("name", user.getName());
sqler.add("depid", user.getDepid());
@@ -147,31 +147,31 @@ public class SysOrgUserDao {
}
public void deleteById(String id) {
String sql = "delete from sys_org_user where id=?";
String sql = "delete from sys_user where id=?";
jdbcHelper.getTp().update(sql, id);
}
public boolean existsByMonum(String monum) {
String sql = "select count(1) from sys_org_user where monum=?";
String sql = "select count(1) from sys_user where monum=?";
return jdbcHelper.getTp().queryForObject(sql, Integer.class, monum) > 0;
}
public SysOrgUser findByUsnam(String username) {
String sql = "select t.*,o.name depna from sys_org_user t left join sys_org o on o.id=t.depid where t.usnam = ?";
SysOrgUser user;
public SysUser findByUsnam(String username) {
String sql = "select t.*,o.name depna from sys_user t left join sys_org o on o.id=t.depid where t.usnam = ?";
SysUser user;
try {
user = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgUser.class), username);
user = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysUser.class), username);
}catch (Exception e) {
throw new ServiceException("对不起, 您的账号："+username+" 不存在");
}
return user;
}
public SysOrgUser findByMonum(String monum) {
String sql = "select t.*,o.name depna from sys_org_user t left join sys_org o on o.id=t.depid where t.monum = ?";
SysOrgUser user;
public SysUser findByMonum(String monum) {
String sql = "select t.*,o.name depna from sys_user t left join sys_org o on o.id=t.depid where t.monum = ?";
SysUser user;
try {
user = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysOrgUser.class), monum);
user = jdbcHelper.getTp().queryForObject(sql, new BeanPropertyRowMapper<>(SysUser.class), monum);
}catch (Exception e) {
throw new ServiceException("对不起, 您的账号："+monum+" 不存在");
}
@@ -181,7 +181,7 @@ public class SysOrgUserDao {
private final JdbcHelper jdbcHelper;
public void updateAvatar(String id, String avatar) {
String sql = "update sys_org_user set avatar = ? where id = ?";
String sql = "update sys_user set avatar = ? where id = ?";
jdbcHelper.update(sql, avatar, id);
}
}
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/SysOrgUserService.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/SysUserService.java
+13 -13
View File
@@ -1,13 +1,13 @@
package vben.base.sys.org.user;
package vben.base.sys.user;
import cn.hutool.crypto.digest.BCrypt;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.root.OrgDao;
import vben.base.sys.org.user.bo.IdAvtagBo;
import vben.base.sys.org.user.vo.RegisterVo;
import vben.base.sys.org.Org;
import vben.base.sys.org.OrgDao;
import vben.base.sys.user.bo.IdAvtagBo;
import vben.base.sys.user.vo.RegisterVo;
import vben.common.core.exception.base.BaseException;
import vben.common.core.utils.DateUtils;
import vben.common.core.utils.IdUtils;
@@ -22,7 +22,7 @@ import java.util.Date;
@Service
@Transactional(rollbackFor = Exception.class)
@RequiredArgsConstructor
public class SysOrgUserService {
public class SysUserService {
public String findPassword(String id) {
return userDao.findPassword(id);
@@ -52,7 +52,7 @@ public class SysOrgUserService {
}
// String salt = RandomUtil.randomString(4);
// String chatNo = IdUtils.simpleUUID();
SysOrgUser user = new SysOrgUser()
SysUser user = new SysUser()
.setId(IdUtils.getSnowflakeNextIdStr())
.setName(nickName)
.setUsnam(nickName)
@@ -73,7 +73,7 @@ public class SysOrgUserService {
}
}
public void insert(SysOrgUser main) {
public void insert(SysUser main) {
if (main.getId() == null) {
main.setId("u" + IdUtils.getSnowflakeNextIdStr());
}
@@ -82,7 +82,7 @@ public class SysOrgUserService {
if (main.getDepid() == null) {
main.setTier("_" + main.getId() + "_");
} else {
String tier = jdbcHelper.findString("select tier from sys_org_dept where id=?", main.getDepid());
String tier = jdbcHelper.findString("select tier from sys_dept where id=?", main.getDepid());
main.setTier(tier + main.getId() + "_");
}
}
@@ -92,14 +92,14 @@ public class SysOrgUserService {
userDao.insert(main);
}
public void update(SysOrgUser main) {
public void update(SysUser main) {
main.setUptim(new Date());
main.setUpuid(LoginHelper.getUserId());
Org org = new Org(main.getId(), main.getName(), 2);
if (main.getDepid() == null) {
main.setTier("_" + main.getId() + "_");
} else {
String tier = jdbcHelper.findString("select tier from sys_org_dept where id=?", main.getDepid());
String tier = jdbcHelper.findString("select tier from sys_dept where id=?", main.getDepid());
main.setTier(tier + main.getId() + "_");
}
userDao.update(main);
@@ -117,13 +117,13 @@ public class SysOrgUserService {
}
@Transactional(readOnly = true)
public SysOrgUser findById(String id) {
public SysUser findById(String id) {
return userDao.findById(id);
}
private final JdbcHelper jdbcHelper;
private final SysOrgUserDao userDao;
private final SysUserDao userDao;
private final OrgDao orgDao;
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/bo/IdAvtagBo.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/bo/IdAvtagBo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.user.bo;
package vben.base.sys.user.bo;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/bo/IdPacodBo.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/bo/IdPacodBo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.user.bo;
package vben.base.sys.user.bo;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/vo/IdCatagTierVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/vo/IdCatagTierVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.user.vo;
package vben.base.sys.user.vo;
import lombok.Data;
vben-modules/vben-base/src/main/java/vben/base/sys/org/user/vo/RegisterVo.java → vben-modules/vben-base/src/main/java/vben/base/sys/user/vo/RegisterVo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package vben.base.sys.org.user.vo;
package vben.base.sys.user.vo;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
vben-modules/vben-base/src/main/java/vben/base/tool/oss/main/ToolOssMainApi.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class ToolOssMainApi {
public R<PageData> get(String name) {
Sqler sqler = new Sqler("t.name,t.id,t.type,t.crtim", "tool_oss_main");
sqler.addInnerJoin("f.fsize,f.service,f.path", "tool_oss_file f", "f.id=t.filid");
sqler.addLeftJoin("u.name cruna", "sys_org_user u", "u.id=t.cruid");
sqler.addLeftJoin("u.name cruna", "sys_user u", "u.id=t.cruid");
sqler.addLike("t.name", name);
sqler.addOrder("t.crtim desc");
return R.ok(service.findPageData(sqler));
vben-modules/vben-bpm/src/main/java/vben/bpm/org/node/BpmOrgNodeService.java
+7 -7
View File
@@ -209,16 +209,16 @@ public class BpmOrgNodeService {
List<SidOrnum> list2;
if(StrUtils.isNotBlank(dragDept.getPid())){
String sql = "select id,ornum from sys_org_role_node where ornum>? and pid=?";
String sql = "select id,ornum from sys_role_node where ornum>? and pid=?";
list2 = jdbcHelper.getTp().query(sql,new Object[]{dragDept.getOrnum(),dragDept.getPid()},
new BeanPropertyRowMapper<>(SidOrnum.class));
}else{
String sql = "select id,ornum from sys_org_role_node where ornum>? and treid=? and pid is null";
String sql = "select id,ornum from sys_role_node where ornum>? and treid=? and pid is null";
list2 = jdbcHelper.getTp().query(sql,new Object[]{dragDept.getOrnum(),dragDept.getTreid()},
new BeanPropertyRowMapper<>(SidOrnum.class));
}
String updateSql = "update sys_org_role_node set ornum=? where id=?";
String updateSql = "update sys_role_node set ornum=? where id=?";
List<Object[]> updateList = new ArrayList<>();
for (SidOrnum sidOrnum : list2) {
Object[] arr=new Object[2];
@@ -246,16 +246,16 @@ public class BpmOrgNodeService {
List<SidOrnum> list3;
if(StrUtils.isNotBlank(dropDept.getPid())){
String sql3 = "select id,ornum from sys_org_role_node where ornum>? and pid=?";
String sql3 = "select id,ornum from sys_role_node where ornum>? and pid=?";
list3 = jdbcHelper.getTp().query(sql3,new Object[]{dropDept.getOrnum(),dropDept.getPid()},
new BeanPropertyRowMapper<>(SidOrnum.class));
}else{
String sql3 = "select id,ornum from sys_org_role_node where ornum>? and treid=? and pid is null";
String sql3 = "select id,ornum from sys_role_node where ornum>? and treid=? and pid is null";
list3 = jdbcHelper.getTp().query(sql3,new Object[]{dropDept.getOrnum(),dropDept.getTreid()},
new BeanPropertyRowMapper<>(SidOrnum.class));
}
String updateSql3 = "update sys_org_role_node set ornum=? where id=?";
String updateSql3 = "update sys_role_node set ornum=? where id=?";
List<Object[]> updateList3 = new ArrayList<>();
for (SidOrnum sidOrnum : list3) {
Object[] arr=new Object[2];
@@ -265,7 +265,7 @@ public class BpmOrgNodeService {
}
jdbcHelper.batch(updateSql3, updateList3);
dropDept.setOrnum(dropDept.getOrnum()+1);
String updateSql4 = "update sys_org_role_node set ornum=? where id=?";
String updateSql4 = "update sys_role_node set ornum=? where id=?";
jdbcHelper.update(updateSql4, dropDept.getOrnum(), dropDept.getId());
}
else if ("after".equals(bo.getType()))
vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmOrgTreeService.java
+2 -2
View File
@@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import vben.common.core.utils.IdUtils;
import vben.common.jdbc.sqler.JdbcHelper;
import vben.bpm.org.role.BpmOrgRole;
@@ -71,7 +71,7 @@ public class BpmOrgTreeService {
if (map == null) {
sql = "select t.tier \"tier\",m.ornum \"ornum\" from bpm_org_tree_node t " +
"inner join bpm_org_role m on m.treid=t.treid " +
"inner join sys_org_user u on u.depid=t.memid where u.id=? and m.id=?";
"inner join sys_user u on u.depid=t.memid where u.id=? and m.id=?";
map = jdbcHelper.findMap(sql, useid, rolid);
if (map == null) {
return null;
vben-modules/vben-bpm/src/main/java/vben/bpm/org/tree/BpmUserService.java
+5 -5
View File
@@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import vben.common.core.utils.StrUtils;
import vben.common.jdbc.root.DbType;
import vben.common.jdbc.root.Db;
@@ -21,7 +21,7 @@ public class BpmUserService {
private final JdbcHelper jdbcHelper;
private final BpmOrgTreeService sysOrgRoleTreeService;
private final BpmOrgTreeService roleTreeService;
/**
* 计算目标节点处理人
@@ -47,7 +47,7 @@ public class BpmUserService {
String sql = "select cruid from bpm_proc_inst where id=?";
cruid = jdbcHelper.findString(sql, proid);
}
Org org = sysOrgRoleTreeService.calc(cruid, sysOrg.getId());
Org org = roleTreeService.calc(cruid, sysOrg.getId());
tamen = org.getName();
} else {
tamen = sysOrg.getName();
@@ -77,7 +77,7 @@ public class BpmUserService {
String sql = "select cruid from bpm_proc_inst where id=?";
cruid = jdbcHelper.findString(sql, proid);
}
Org org = sysOrgRoleTreeService.calc(cruid, sysOrg.getId());
Org org = roleTreeService.calc(cruid, sysOrg.getId());
tamen += org.getName() + ";";
} else {
tamen += sysOrg.getName() + ";";
@@ -90,7 +90,7 @@ public class BpmUserService {
public List<String> findPostIdList(String userId) {
String postSql = "select pid as id from sys_org_post_org where oid=?";
String postSql = "select pid as id from sys_post_org where oid=?";
return jdbcHelper.findSlist(postSql, userId);
}
}
vben-modules/vben-bpm/src/main/java/vben/bpm/root/BpmService.java
+1 -1
View File
@@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vben.base.sys.org.root.Org;
import vben.base.sys.org.Org;
import vben.common.core.exception.ServiceException;
import vben.common.core.utils.IdUtils;
import vben.common.core.utils.StrUtils;

Some files were not shown because too many files have changed in this diff Show More