From 56f8ce696799ecee7aac0fa18aa29353c2df2f9c Mon Sep 17 00:00:00 2001 From: Wang YiHang <3060234389@qq.com> Date: Mon, 30 Sep 2024 09:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RailController.java | 4 -- .../system/controller/SysFirmController.java | 53 +++++++++++++------ .../system/controller/SysMenuController.java | 5 ++ .../muyu/system/domain/req/SysFirmReq.java | 10 ++++ .../muyu/system/service/SysMenuService.java | 2 + .../service/impl/SysMenuServiceImpl.java | 6 +++ 6 files changed, 59 insertions(+), 21 deletions(-) delete mode 100644 cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java deleted file mode 100644 index 5e88e4c..0000000 --- a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/RailController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.muyu.openbusiness.controller; - -public class RailController { -} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java index 8fc9699..8c0aff6 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java @@ -9,7 +9,10 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysEnt; import com.muyu.common.system.domain.SysRole; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.system.domain.SysFirm; +import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.req.SysFirmReq; import com.muyu.system.service.ISysFirmService; import com.muyu.system.service.SysEntService; @@ -22,6 +25,7 @@ import javax.xml.stream.events.StartDocument; import java.sql.*; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -43,6 +47,8 @@ public class SysFirmController extends BaseController private SysRoleController sysRoleController; @Resource private SysMenuController sysMenuController; + @Resource + private RemoteUserService remoteUserService; private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$"; @@ -83,7 +89,7 @@ public class SysFirmController extends BaseController /** * 新增企业基础信息 */ - //@RequiresPermissions("firm:firmInfo:add") + @RequiresPermissions("firm:firmInfo:add") @PostMapping public Result add(@Validated @RequestBody SysFirmReq sysFirm) { String firmName = sysFirm.getFirmName(); @@ -108,7 +114,34 @@ public class SysFirmController extends BaseController // 设置创建者和状态 sysFirm.setCreateBy(SecurityUtils.getUsername()); - sysFirm.setState("Business"); + + SysUser sysUser = new SysUser(); + sysUser.setFirmCode(firmCode); + sysUser.setUserName(sysFirm.getUserName()); + sysUser.setPassword(sysFirm.getPassword()); + + +// +// SysRole role = new SysRole(); +// +// role.setFirmCode(firmCode); +// role.setRoleName("超级管理员"); +// role.setRoleKey("admin"); +// role.setRoleSort(1); +// role.setDataScope("1"); +// role.setMenuCheckStrictly(true); +// role.setDeptCheckStrictly(true); +// role.setStatus("0"); +// role.setDelFlag("0"); +// List list = sysMenuController.list(); +// Long[] menuIds = list.stream() +// .map(SysMenu::getMenuId) +// .filter(Objects::nonNull) // 过滤掉 null 值 +// .toArray(Long[]::new); +// role.setCreateBy(SecurityUtils.getUsername()); +// role.setMenuIds(menuIds); +// +// sysRoleController.add(role); // 创建数据库和表 try { @@ -127,26 +160,12 @@ public class SysFirmController extends BaseController sysEnt.setPort(3306); sysEntService.save(sysEnt); - SysRole role = new SysRole(); - role.setFirmCode(firmCode); - role.setRoleName("超级管理员"); - role.setRoleKey("admin"); - role.setRoleSort(1); - role.setDataScope("1"); - role.setMenuCheckStrictly(true); - role.setDeptCheckStrictly(true); - role.setStatus("0"); - role.setDelFlag("0"); - role.setCreateBy(SecurityUtils.getUsername()); - - //role.setMenuIds(); - - sysRoleController.add(role); return toAjax(sysFirmService.save((SysFirm) sysFirm)); } + // private boolean isValidFirmCreditCode(String firmCreditCode) { Pattern pattern = Pattern.compile(FIRM_CREDIT_CODE); Matcher matcher = pattern.matcher(firmCreditCode); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 2149ace..f4f1b36 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -28,6 +28,11 @@ public class SysMenuController extends BaseController { @Resource private SysMenuService menuService; + public List list () { + List menus = menuService.selectMenuList(); + return menus; + } + /** * 获取菜单列表 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java index dea5b63..a704185 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java @@ -1,5 +1,6 @@ package com.muyu.system.domain.req; +import com.muyu.common.core.annotation.Excel; import com.muyu.system.domain.SysFirm; import lombok.*; import lombok.experimental.SuperBuilder; @@ -13,6 +14,15 @@ import lombok.experimental.SuperBuilder; public class SysFirmReq extends SysFirm { private String tableName; + /** + * 用户账号 + */ + @Excel(name = "登录名称") + private String userName; + /** + * 密码 + */ + private String password; } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..1e06a13 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -33,6 +33,8 @@ public interface SysMenuService extends IService { */ public List selectMenuList (SysMenu menu, Long userId); + public List selectMenuList (); + /** * 根据用户ID查询权限 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 0a17000..884a086 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; @@ -71,6 +72,11 @@ public class SysMenuServiceImpl extends ServiceImpl impl return menuList; } + @Override + public List selectMenuList() { + return this.list(); + } + /** * 根据用户ID查询权限 *