a_bazu
/
cloud-server-8
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: a_bazu:3bf6f0d929d6aff2bf5612d4d338ffdfd58437a2
Branches Tags
a_bazu:dev.wei
a_bazu:dev
a_bazu:dev.carData
a_bazu:xxy
a_bazu:dev.cargateway
a_bazu:dev.yang
a_bazu:master
a_bazu:psr
a_bazu:dev.xxy
a_bazu:dev.zhang
a_bazu:dev.peng
..
compare: a_bazu:aedee04643e2f6bff4933ba09dfee0230dbe80e6
Branches Tags
a_bazu:dev.wei
a_bazu:dev
a_bazu:dev.carData
a_bazu:xxy
a_bazu:dev.cargateway
a_bazu:dev.yang
a_bazu:master
a_bazu:psr
a_bazu:dev.xxy
a_bazu:dev.zhang
a_bazu:dev.peng

No commits in common. "3bf6f0d929d6aff2bf5612d4d338ffdfd58437a2" and "aedee04643e2f6bff4933ba09dfee0230dbe80e6" have entirely different histories.
3bf6f0d929 ... aedee04643

30 changed files with 11 additions and 723 deletions
Show Stats Expand all files Collapse all files

6
cloud-auth/src/main/java/com/muyu/auth/form/RegisterBody.java
View File

@ -30,10 +30,6 @@ public class RegisterBody extends LoginBody {
/**
* 手机号
*/
private String phonenumber;
/**
* 公司注册人名称
*/
private String nickName;
private String phoneNumber;
}

10
cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java
View File

@ -127,18 +127,10 @@ 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()) {

2
cloud-auth/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

7
cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java
View File

@ -87,6 +87,7 @@ public class SysUser extends BaseEntity {
* 企业ID
*/
private Integer firmId;
/**
* 所属数据库
*/
@ -144,12 +145,6 @@ public class SysUser extends BaseEntity {
*/
private Long roleId;
/**
* 公司名称
* @param userId
*/
private String firmName;
public SysUser (Long userId) {
this.userId = userId;
}

2
cloud-gateway/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

4
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml
View File

@ -54,9 +54,5 @@
<artifactId>fastjson</artifactId>
<version>1.2.83</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-system</artifactId>
</dependency>
</dependencies>
</project>

40
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Firm.java
View File

@ -1,40 +0,0 @@
package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* 企业名称
* @Author：weiran
* @Package：com.muyu.firmmanage.domain
* @Project：cloud-server-8
* @name：Firm
* @Date：2024/9/27 12:29
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
public class Firm {
/**
* 企业ID
*/
@TableId(value = "firm_id")
private Long firmId;
/**
* 企业名称
*/
@TableField(exist = false)
private String firmName;
/**
* 数据库名称
*/
private String databaseName;
}

119
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/SysUser.java
View File

@ -1,119 +0,0 @@
package com.muyu.domain;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
/**
* 用户信息
* @Author：weiran
* @Package：com.muyu.firmmanage.domain
* @Project：cloud-server-8
* @name：SysUser
* @Date：2024/9/28 22:37
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
@Tag(name = "用户信息")
@TableName("sys_user")
public class SysUser extends BaseEntity {
/**
* 用户ID
*/
@TableId(value = "user_id")
private Long userId;
/**
* 部门ID
*/
private Long deptId;
/**
* 用户账号
*/
private String userName;
/**
* 用户昵称
*/
private String nickName;
/**
* 用户类型（00系统用户）
*/
private String userType;
/**
* 用户邮箱
*/
private String email;
/**
* 手机号码
*/
private String phonenumber;
/**
* 用户性别（0男 1女 2未知）
*/
private Integer sex;
/**
* 头像地址
*/
private String avatar;
/**
* 密码
*/
private String password;
/**
* 帐号状态（0正常 1停用）
*/
private Integer status;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
/**
* 最后登录IP
*/
private String loginIp;
/**
* 最后登录时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loginDate;
/**
* 数据库名称
*/
private String databaseName;
/**
* 企业ID
*/
private Long firmId;
/**
* 企业名称
*/
@TableField(exist = false)
private String firmName;
}

37
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FirmListReq.java
View File

@ -1,37 +0,0 @@
package com.muyu.domain.req;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 公司信息请求对象
* @Author：weiran
* @Package：com.muyu.firmmanage.domain.req
* @Project：cloud-server-8
* @name：FirmListReq
* @Date：2024/9/27 19:19
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "公司信息请求对象",description = "公司信息请求对象")
public class FirmListReq {
/**
* 公司名称
*/
private String firmName;
/**
* 页码，从1开始
*/
private Integer pageNum=1;
/**
* 每页大小
*/
private Integer pageSize=10;
}

138
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FirmListResp.java
View File

@ -1,138 +0,0 @@
package com.muyu.domain.resp;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.domain.SysUser;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* 企业信息响应对象
* @Author：weiran
* @Package：com.muyu.firmmanage.domain.resp
* @Project：cloud-server-8
* @name：FirmListResp
* @Date：2024/9/27 19:33
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name="企业信息响应对象",description = "企业信息响应对象")
public class FirmListResp {
/**
* 用户ID
*/
private Long userId;
/**
* 部门ID
*/
private Long deptId;
/**
* 用户账号
*/
private String userName;
/**
* 用户昵称
*/
private String nickName;
/**
* 用户类型（00系统用户）
*/
private String userType;
/**
* 用户邮箱
*/
private String email;
/**
* 手机号码
*/
private String phonenumber;
/**
* 用户性别（0男 1女 2未知）
*/
private Integer sex;
/**
* 头像地址
*/
private String avatar;
/**
* 密码
*/
private String password;
/**
* 帐号状态（0正常 1停用）
*/
private Integer status;
/**
* 删除标志（0代表存在 2代表删除）
*/
private String delFlag;
/**
* 最后登录IP
*/
private String loginIp;
/**
* 最后登录时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date loginDate;
/**
* 数据库名称
*/
private String databaseName;
/**
* 企业ID
*/
private Long firmId;
/**
* 企业名称
*/
@TableField(exist = false)
private String firmName;
/**
* 数据库对象构建为返回结果对象
*/
public static FirmListResp firmListResp(SysUser sysUser){
return FirmListResp.builder()
.userId(sysUser.getUserId())
.deptId(sysUser.getDeptId())
.userName(sysUser.getUserName())
.nickName(sysUser.getNickName())
.userType((sysUser.getUserType()))
.email(sysUser.getEmail())
.phonenumber(sysUser.getPhonenumber())
.sex(sysUser.getSex())
.avatar(sysUser.getAvatar())
.password(sysUser.getPassword())
.status(sysUser.getStatus())
.delFlag(sysUser.getDelFlag())
.loginDate(sysUser.getLoginDate())
.databaseName(sysUser.getDatabaseName())
.firmId(sysUser.getFirmId())
.build();
}
}

36
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FirmTotalListResp.java
View File

@ -1,36 +0,0 @@
package com.muyu.domain.resp;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* 公司数据总数响应对象
* @Author：weiran
* @Package：com.muyu.firmmanage.domain.resp.firmlist
* @Project：cloud-server-8
* @name：FirmTotalListResp
* @Date：2024/9/27 19:42
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "公司数据总数列表",description = "数据总数响应")
public class FirmTotalListResp {
private List<FirmListResp> firmListRespList;
private long total;
public static FirmTotalListResp firmTotalListResp(List<FirmListResp> firmListRespList,long toal){
FirmTotalListResp firmTotalListResp = new FirmTotalListResp();
firmTotalListResp.setFirmListRespList(firmListRespList);
firmTotalListResp.setTotal(toal);
return firmTotalListResp;
}
}

47
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FirmManageController.java
View File

@ -1,47 +0,0 @@
package com.muyu.server.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.domain.req.FirmListReq;
import com.muyu.domain.resp.FirmTotalListResp;
import com.muyu.server.service.FirmManageService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 企业信息控制层
* @Author：weiran
* @Package：com.muyu.firmmanage.controller
* @Project：cloud-server-8
* @name：FirmManageController
* @Date：2024/9/27 12:27
*/
@RestController
@RequestMapping("/firmmanage")
@Tag(name = "公司相关事务",description = "公司相关事务操作")
public class FirmManageController {
@Autowired
private FirmManageService firmManageService;
/**
* 公司列表信息展示
* @param firmListReq
* @return
*/
@PostMapping("/firmmessageList")
@Operation(summary = "公司信息列表展示",description = "展示公司信息的列表")
public Result firmmessageList(@Validated @RequestBody FirmListReq firmListReq){
FirmTotalListResp firmTotalListResp = firmManageService.firmmessageList(firmListReq);
return Result.success(firmTotalListResp);
}
}

23
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FirmManageMapper.java
View File

@ -1,23 +0,0 @@
package com.muyu.server.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.muyu.domain.Firm;
import com.muyu.domain.SysUser;
import com.muyu.domain.req.FirmListReq;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 公司+员工持久层
* @Author：weiran
* @Package：com.muyu.firmmanage.mapper
* @Project：cloud-server-8
* @name：FirmManageMapper
* @Date：2024/9/27 12:28
*/
@Mapper
public interface FirmManageMapper extends MPJBaseMapper<SysUser> {
List<Firm> firmmessageList(FirmListReq firmListReq);
}

17
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FirmMapper.java
View File

@ -1,17 +0,0 @@
package com.muyu.server.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.muyu.domain.Firm;
import org.apache.ibatis.annotations.Mapper;
/**
* 公司表持久层
* @Author：weiran
* @Package：com.muyu.firmmanage.mapper
* @Project：cloud-server-8
* @name：FirmMapper
* @Date：2024/9/29 16:56
*/
@Mapper
public interface FirmMapper extends MPJBaseMapper<Firm> {
}

26
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmManageService.java
View File

@ -1,26 +0,0 @@
package com.muyu.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.SysUser;
import com.muyu.domain.req.FirmListReq;
import com.muyu.domain.resp.FirmTotalListResp;
import java.util.List;
/**
* 公司+员工业务层
* @Author：weiran
* @Package：com.muyu.firmmanage.service
* @Project：cloud-server-8
* @name：FirmManageService
* @Date：2024/9/27 12:28
*/
public interface FirmManageService extends IService<SysUser> {
/**
* 公司列表信息展示
* @param firmListReq
* @return
*/
FirmTotalListResp firmmessageList(FirmListReq firmListReq);
}

21
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FirmService.java
View File

@ -1,21 +0,0 @@
package com.muyu.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.domain.Firm;
/**
* 公司业务层
* @Author：weiran
* @Package：com.muyu.firmmanage.service
* @Project：cloud-server-8
* @name：FirmService
* @Date：2024/9/29 16:57
*/
public interface FirmService extends IService<Firm> {
/**
* 查询公司数目
* @return
*/
long findcount();
}

1
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java
View File

@ -152,5 +152,4 @@ public class CarInformationServiceImpl
});
return carInformationResps;
}
}

4
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java
View File

@ -9,7 +9,6 @@ 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;
@ -30,8 +29,6 @@ import java.util.List;
@Service
public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultRule> implements FaultRuleService {
@Autowired
private CarInformationService carInformationService;
@Autowired
private CarInformationMapper carInformationMapper;
@Autowired
@ -48,7 +45,6 @@ public class FaultRuleServiceImpl extends ServiceImpl<FaultRuleMapper, CarFaultR
//根据车辆VIN判断它属于什么类型的车辆
CarInformation carInformation = carInformationMapper.selectById(carFaultRule.getVin());
Integer carInformationType = carInformation.getCarInformationType();
// carInformationService.selectTypeByVIN(carFaultRule.getVin());
//根据车辆类型，查询表获取对应的类型的故障规则
List<FaultConditionResp> faultConditionResps = faultConditionMapper.selectJoinList(FaultConditionResp.class, new MPJLambdaWrapper<FaultCondition>()

53
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmManageServiceImpl.java
View File

@ -1,53 +0,0 @@
package com.muyu.server.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.muyu.common.core.utils.StringUtils;
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;
import java.util.List;
/**
* 公司+员工业务实现层
* @Author：weiran
* @Package：com.muyu.firmmanage.service.impl
* @Project：cloud-server-8
* @name：FirmManageServiceImpl
* @Date：2024/9/27 12:28
*/
@Service
public class FirmManageServiceImpl extends ServiceImpl<FirmManageMapper, SysUser> implements FirmManageService {
@Autowired
private FirmManageMapper firmManageMapper;
@Autowired
private FirmService firmService;
/**
* 公司列表信息展示
* @param firmListReq
* @return
*/
@Override
public FirmTotalListResp firmmessageList(FirmListReq firmListReq) {
long findcount = firmService.findcount();
MPJLambdaWrapper<SysUser> wrapper = new MPJLambdaWrapper<>();
wrapper.selectAll(SysUser.class)
.selectAll(Firm.class)
.leftJoin(Firm.class,Firm::getFirmId,SysUser::getFirmId)
.eq(StringUtils.isNotEmpty(firmListReq.getFirmName()),
Firm::getFirmName, firmListReq.getFirmName());
wrapper.last("LIMIT "+((firmListReq.getPageNum()-1)*firmListReq.getPageSize())+","+firmListReq.getPageSize());
List<FirmListResp> firmListResps = firmManageMapper.selectJoinList(FirmListResp.class, wrapper);
return FirmTotalListResp.firmTotalListResp(firmListResps,findcount);
}
}

32
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FirmServiceImpl.java
View File

@ -1,32 +0,0 @@
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.domain.Firm;
import com.muyu.server.mapper.FirmMapper;
import com.muyu.server.service.FirmService;
import org.springframework.stereotype.Service;
/**
* 公司业务实现层
* @Author：weiran
* @Package：com.muyu.firmmanage.service.impl
* @Project：cloud-server-8
* @name：FirmServiceImpl
* @Date：2024/9/29 16:57
*/
@Service
public class FirmServiceImpl extends ServiceImpl<FirmMapper, Firm> implements FirmService {
/**
* 查询公司数目
* @return
*/
@Override
public long findcount() {
LambdaQueryWrapper<Firm> queryWrapper = new LambdaQueryWrapper<>();
long count = this.count(queryWrapper);
return count;
}
}

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

2
cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

2
cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

7
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java
View File

@ -142,11 +142,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
List<SysUser> companyList();
/**
* 添加公司名称
* @param firmName
* @param datbaseName
* @return
*/
Integer insertFirm(@Param("firmName") String firmName, @Param("datbaseName") String datbaseName);
}

16
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/DataBaseCreator.java
View File

@ -1,16 +0,0 @@
package com.muyu.system.service;
import com.muyu.common.system.domain.SysUser;
/**
* @Author：weiran
* @Package：com.muyu.system.service
* @Project：cloud-server-8
* @name：DataBaseCreator
* @Date：2024/9/26 20:40
*/
public interface DataBaseCreator {
String createDatbase(SysUser user);
}

49
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/DataBaseCreatorImpl.java
View File

@ -1,49 +0,0 @@
package com.muyu.system.service.impl;
import cn.hutool.core.util.RandomUtil;
import com.muyu.common.system.domain.SysUser;
import com.muyu.system.service.DataBaseCreator;
import org.springframework.stereotype.Service;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
/**
* @Author：weiran
* @Package：com.muyu.system.service.impl
* @Project：cloud-server-8
* @name：DataBaseCreatorImpl
* @Date：2024/9/26 20:40
*/
@Service
public class DataBaseCreatorImpl implements DataBaseCreator {
private static final String DB_URL="jdbc:mysql://159.75.188.178:3306?useSSL=false";
private static final String USER="root";
private static final String PASS="bwie-8666";
@Override
public String createDatbase(SysUser user) {
try {
Connection conn = DriverManager.getConnection(DB_URL, USER, PASS);
Statement statement = conn.createStatement();
String datbaseName="company"+RandomUtil.randomNumbers(5);
//创建数据库
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(sqlCreateDatabase);
statement.execute(sqlUseDatabase);
statement.execute(sqlCreateTable);
return datbaseName;
}catch (Exception e){
e.printStackTrace();
throw new RuntimeException("数据库创建失败");
}
}
}

22
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
View File

@ -14,7 +14,6 @@ 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;
@ -51,8 +50,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
private SysUserPostMapper userPostMapper;
@Autowired
private SysConfigService configService;
@Autowired
private DataBaseCreator baseCreator;
/**
* 根据条件分页查询用户列表
@ -257,24 +254,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*/
@Override
public boolean registerUser (SysUser user) {
//根据新注册的用户创建对应数据库
String datbaseName = baseCreator.createDatbase(user);
//添加公司名称
userMapper.insertFirm(user.getFirmName(),datbaseName);
Integer firmId = user.getFirmId();
user.setFirmId(firmId);
//添加用户表
int i = userMapper.insertUser(user);
List<SysUser> userList = userMapper.selectUserList(user);
Long userId = userList.get(0).getUserId();
ArrayList<SysUserRole> list = new ArrayList<>();
//将用户和角色进行关联
SysUserRole userRole = new SysUserRole();
userRole.setUserId(userId);
userRole.setRoleId(2L);
list.add(userRole);
userRoleMapper.batchUserRole(list);
return i > 0;
return userMapper.insertUser(user) > 0;
}
/**

2
cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight

5
cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -222,11 +222,6 @@
sysdate()
)
</insert>
<insert id="insertFirm" useGeneratedKeys="true" keyProperty="firmId">
INSERT INTO `eight`.`firm`
(`firm_id`, `firm_name`, `database_name`) VALUES
(0, #{firmName}, #{datbaseName});
</insert>
<update id="updateUser" parameterType="com.muyu.common.system.domain.SysUser">
update sys_user

2
cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml
View File

@ -4,7 +4,7 @@ server:
# nacos线上地址
nacos:
addr: 159.75.188.178:8848
addr: 127.0.0.1:8848
user-name: nacos
password: nacos
namespace: eight