From 3bf6f0d929d6aff2bf5612d4d338ffdfd58437a2 Mon Sep 17 00:00:00 2001 From: WeiRan <2392355487@qq.com> Date: Sun, 29 Sep 2024 22:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/auth/form/RegisterBody.java | 6 ++++- .../muyu/auth/service/SysLoginService.java | 10 +++++++- cloud-auth/src/main/resources/bootstrap.yml | 2 +- .../muyu/common/system/domain/SysUser.java | 7 +++++- .../src/main/resources/bootstrap.yml | 2 +- .../com/muyu/server/service/FirmService.java | 3 ++- .../impl/CarInformationServiceImpl.java | 1 + .../service/impl/FaultRuleServiceImpl.java | 4 ++++ .../service/impl/FirmManageServiceImpl.java | 19 +++++++-------- .../server/service/impl/FirmServiceImpl.java | 6 ++--- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../com/muyu/system/mapper/SysUserMapper.java | 7 ++++++ .../muyu/system}/service/DataBaseCreator.java | 2 +- .../service/impl/DataBaseCreatorImpl.java | 22 ++++++++--------- .../service/impl/SysUserServiceImpl.java | 24 ++++++++++++++++--- .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/system/SysUserMapper.xml | 5 ++++ .../src/main/resources/bootstrap.yml | 2 +- 20 files changed, 90 insertions(+), 40 deletions(-) rename cloud-modules/{cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server => cloud-modules-system/src/main/java/com/muyu/system}/service/DataBaseCreator.java (89%) rename cloud-modules/{cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server => cloud-modules-system/src/main/java/com/muyu/system}/service/impl/DataBaseCreatorImpl.java (66%) diff --git a/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java b/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java index a3d1251..b9fa745 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java +++ b/cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java @@ -30,6 +30,10 @@ public class RegisterBody extends LoginBody { /** * 手机号 */ - private String phoneNumber; + private String phonenumber; + /** + * 公司注册人名称 + */ + private String nickName; } diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index e49b481..6233ff5 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -127,10 +127,18 @@ public class SysLoginService { // 注册用户信息 SysUser sysUser = new SysUser(); + //公司账号 sysUser.setUserName(registerBody.getUsername()); + //公司邮箱 sysUser.setEmail(registerBody.getEmail()); - sysUser.setPhonenumber(registerBody.getPhoneNumber()); + //公司号码 + sysUser.setPhonenumber(registerBody.getPhonenumber()); + //密码 sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword())); + //公司注册人名称 + sysUser.setNickName(registerBody.getNickName()); + //企业名称 + sysUser.setFirmName(registerBody.getFirmName()); Result registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); if (Result.FAIL == registerResult.getCode()) { diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 9a56e49..1cdb12c 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 7633bca..3efe4cc 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -87,7 +87,6 @@ public class SysUser extends BaseEntity { * 企业ID */ private Integer firmId; - /** * 所属数据库 */ @@ -145,6 +144,12 @@ public class SysUser extends BaseEntity { */ private Long roleId; + /** + * 公司名称 + * @param userId + */ + private String firmName; + public SysUser (Long userId) { this.userId = userId; } diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index a9335ac..7f67420 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmService.java index 2898850..3483947 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmService.java @@ -1,7 +1,8 @@ package com.muyu.server.service; + import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.firmmanage.domain.Firm; +import com.muyu.domain.Firm; /** * 公司业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java index 5bf9428..0e80867 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java @@ -152,4 +152,5 @@ public class CarInformationServiceImpl }); return carInformationResps; } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java index 58a4697..d379880 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java @@ -9,6 +9,7 @@ import com.muyu.server.mapper.CarFenceMapper; import com.muyu.server.mapper.CarInformationMapper; import com.muyu.server.mapper.FaultConditionMapper; import com.muyu.server.mapper.FaultRuleMapper; +import com.muyu.server.service.CarInformationService; import com.muyu.server.service.FaultRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,6 +30,8 @@ import java.util.List; @Service public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { + @Autowired + private CarInformationService carInformationService; @Autowired private CarInformationMapper carInformationMapper; @Autowired @@ -45,6 +48,7 @@ public class FaultRuleServiceImpl extends ServiceImpl faultConditionResps = faultConditionMapper.selectJoinList(FaultConditionResp.class, new MPJLambdaWrapper() diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java index 6878416..e4f3501 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java @@ -1,18 +1,17 @@ package com.muyu.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; -import com.muyu.firmmanage.domain.Firm; -import com.muyu.firmmanage.domain.SysUser; -import com.muyu.firmmanage.domain.req.FirmListReq; -import com.muyu.firmmanage.domain.resp.firmlist.FirmListResp; -import com.muyu.firmmanage.domain.resp.firmlist.FirmTotalListResp; -import com.muyu.firmmanage.mapper.FirmManageMapper; -import com.muyu.firmmanage.service.FirmManageService; -import com.muyu.firmmanage.service.FirmService; +import com.muyu.domain.Firm; +import com.muyu.domain.SysUser; +import com.muyu.domain.req.FirmListReq; +import com.muyu.domain.resp.FirmListResp; +import com.muyu.domain.resp.FirmTotalListResp; +import com.muyu.server.mapper.FirmManageMapper; +import com.muyu.server.service.FirmManageService; +import com.muyu.server.service.FirmService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmServiceImpl.java index 5a8da61..0ba35c7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmServiceImpl.java @@ -2,9 +2,9 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.firmmanage.domain.Firm; -import com.muyu.firmmanage.mapper.FirmMapper; -import com.muyu.firmmanage.service.FirmService; +import com.muyu.domain.Firm; +import com.muyu.server.mapper.FirmMapper; +import com.muyu.server.service.FirmService; import org.springframework.stereotype.Service; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index 574393e..0616949 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index 2863945..a02fcfb 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 5735ae2..4663d03 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index fa92973..6775a94 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -142,4 +142,11 @@ public interface SysUserMapper extends BaseMapper { List companyList(); + /** + * 添加公司名称 + * @param firmName + * @param datbaseName + * @return + */ + Integer insertFirm(@Param("firmName") String firmName, @Param("datbaseName") String datbaseName); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/DataBaseCreator.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/DataBaseCreator.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/DataBaseCreator.java rename to cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/DataBaseCreator.java index 5283a8d..47b2206 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/DataBaseCreator.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/DataBaseCreator.java @@ -1,4 +1,4 @@ -package com.muyu.server.service; +package com.muyu.system.service; import com.muyu.common.system.domain.SysUser; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/DataBaseCreatorImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/DataBaseCreatorImpl.java similarity index 66% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/DataBaseCreatorImpl.java rename to cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/DataBaseCreatorImpl.java index 2e8d6d7..850d44d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/DataBaseCreatorImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/DataBaseCreatorImpl.java @@ -1,8 +1,8 @@ -package com.muyu.server.service.impl; +package com.muyu.system.service.impl; import cn.hutool.core.util.RandomUtil; import com.muyu.common.system.domain.SysUser; -import com.muyu.server.service.DataBaseCreator; +import com.muyu.system.service.DataBaseCreator; import org.springframework.stereotype.Service; import java.sql.Connection; @@ -30,22 +30,20 @@ public class DataBaseCreatorImpl implements DataBaseCreator { try { Connection conn = DriverManager.getConnection(DB_URL, USER, PASS); Statement statement = conn.createStatement(); - String datbaseName="company"+RandomUtil.randomString(10000); + String datbaseName="company"+RandomUtil.randomNumbers(5); //创建数据库 - String sql="CREATE DATABASE IF NOT EXISTS "+datbaseName; - statement.execute(sql); - //使用数据库 - sql="USE "+datbaseName; - statement.execute(sql); - //创建表 - sql="CREATE TABLE user ("+ + String sqlCreateDatabase ="CREATE DATABASE IF NOT EXISTS "+datbaseName; + String sqlUseDatabase="USE "+datbaseName; + String sqlCreateTable="CREATE TABLE user ("+ "user_id INT AUTO_INCREMENT PRIMARY KEY,"+ "user_name VARCHAR(50) NOT NULL )"; - statement.execute(sql); + statement.execute(sqlCreateDatabase); + statement.execute(sqlUseDatabase); + statement.execute(sqlCreateTable); return datbaseName; }catch (Exception e){ e.printStackTrace(); + throw new RuntimeException("数据库创建失败"); } - return null; } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index bc70e84..fd58fb7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -14,6 +14,7 @@ import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; import com.muyu.system.mapper.*; +import com.muyu.system.service.DataBaseCreator; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; import jakarta.validation.Validator; @@ -50,6 +51,8 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysUserPostMapper userPostMapper; @Autowired private SysConfigService configService; + @Autowired + private DataBaseCreator baseCreator; /** * 根据条件分页查询用户列表 @@ -254,9 +257,24 @@ public class SysUserServiceImpl extends ServiceImpl impl */ @Override public boolean registerUser (SysUser user) { - - - return userMapper.insertUser(user) > 0; + //根据新注册的用户创建对应数据库 + String datbaseName = baseCreator.createDatbase(user); + //添加公司名称 + userMapper.insertFirm(user.getFirmName(),datbaseName); + Integer firmId = user.getFirmId(); + user.setFirmId(firmId); + //添加用户表 + int i = userMapper.insertUser(user); + List userList = userMapper.selectUserList(user); + Long userId = userList.get(0).getUserId(); + ArrayList list = new ArrayList<>(); + //将用户和角色进行关联 + SysUserRole userRole = new SysUserRole(); + userRole.setUserId(userId); + userRole.setRoleId(2L); + list.add(userRole); + userRoleMapper.batchUserRole(list); + return i > 0; } /** diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index a0052fd..91799f9 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml index 6ea2ddd..16baeea 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -222,6 +222,11 @@ sysdate() ) + + INSERT INTO `eight`.`firm` + (`firm_id`, `firm_name`, `database_name`) VALUES + (0, #{firmName}, #{datbaseName}); + update sys_user diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index 10e7fb8..ae51cac 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 127.0.0.1:8848 + addr: 159.75.188.178:8848 user-name: nacos password: nacos namespace: eight