创建数据库
parent
0f9e2f4624
commit
56f8ce6967
|
|
@ -1,4 +0,0 @@
|
|||
package com.muyu.openbusiness.controller;
|
||||
|
||||
public class RailController {
|
||||
}
|
||||
|
|
@ -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<Integer> 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<SysMenu> 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);
|
||||
|
|
|
|||
|
|
@ -28,6 +28,11 @@ public class SysMenuController extends BaseController {
|
|||
@Resource
|
||||
private SysMenuService menuService;
|
||||
|
||||
public List<SysMenu> list () {
|
||||
List<SysMenu> menus = menuService.selectMenuList();
|
||||
return menus;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取菜单列表
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,8 @@ public interface SysMenuService extends IService<SysMenu> {
|
|||
*/
|
||||
public List<SysMenu> selectMenuList (SysMenu menu, Long userId);
|
||||
|
||||
public List<SysMenu> selectMenuList ();
|
||||
|
||||
/**
|
||||
* 根据用户ID查询权限
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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<SysMenuMapper, SysMenu> impl
|
|||
return menuList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysMenu> selectMenuList() {
|
||||
return this.list();
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据用户ID查询权限
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in New Issue