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

feax:()添加企业的时候添加一个单独的库和表

dev.entOperation
crj 2024-09-30 16:41:06 +08:00
parent 517c18f215
commit 0c7795ea71
11 changed files with 99 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ public class SysLoginService {
if (Result.FAIL == registerResult.getCode()) {
throw new ServiceException(registerResult.getMsg());
}
recordLogService.recordLogininfor(username,Constants.REGISTER,"注册成功");
}
}

8
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java
View File

@ -91,8 +91,8 @@ public class ManyDataSource implements ApplicationRunner {
@Bean
public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) {
List<EntInfo> entInfoList = dataSourceInfoList();
if(StringUtils.isEmpty(entInfoList)){
throw new SaaSException("数据源信息列表为空或为null");
if (StringUtils.isNotEmpty(entInfoList)) {
throw new SaaSException("数据元信息列表为空或为null");
}
Map<Object,Object> dataSourceMap = dataSourceInfoList().stream()
.map(entInfo -> DataSourceInfo.hostAndPortBuild(
@ -100,12 +100,10 @@ public class ManyDataSource implements ApplicationRunner {
entInfo.getIp(),
entInfo.getPort()
)
)
.collect(Collectors.toMap(
).collect(Collectors.toMap(
dataSourceInfo -> dataSourceInfo.getKey(),
dataSourceInfo -> druidDataSourceFactory.create(dataSourceInfo)
));
//设置动态数据源
DynamicDataSource dynamicDataSource = new DynamicDataSource();
dynamicDataSource.setTargetDataSources(dataSourceMap);

5
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java
View File

@ -1,8 +1,9 @@
package com.muyu.cloud.common.many.datasource.constents;
/**
* @Author: zi run
* @Date 2024/9/20 14:52
* 数据源常量
* @Author chenruijia
* @Date 2024/9/29 17:52
* @Description 数据源常量
*/
public class DatasourceContent {

1
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java
View File

@ -8,6 +8,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 数据源实体类
* @Author: zi run
* @Date 2024/9/20 14:52
* @Description 数据源实体类

1
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java
View File

@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
import java.sql.SQLException;
/**
* Druid工厂
* @Author: zi run
* @Date 2024/9/20 14:52
* @Description Druid工厂

1
cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java
View File

@ -4,6 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.util.Assert;
/**
* 数据源切换处理
* @Author: zi run
* @Date 2024/9/20 14:52
* @Description 数据源切换处理

7
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java
View File

@ -37,7 +37,6 @@ public class SysCarFault extends BaseEntity {
* 车辆故障编码
*/
@Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码")
@Excel
private String faultCode;
/**
* 车辆故障类型ID
@ -53,31 +52,26 @@ public class SysCarFault extends BaseEntity {
* 故障VIN编码
*/
@Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码")
@Excel
private String carVin;
/**
* 车辆故障标签
*/
@Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签")
@Excel
private String faultLabel;
/**
* 车辆故障位
*/
@Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位")
@Excel
private String faultBit;
/**
* 车辆故障值
*/
@Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值")
@Excel
private String faultValue;
/**
* 故障级别
*/
@Schema(defaultValue = "故障级别",type = "String",description = "故障级别")
@Excel
private String faultWarn;
/**
* 报警状态（Y.是，N.否）
@ -88,7 +82,6 @@ public class SysCarFault extends BaseEntity {
* 故障描述信息
*/
@Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息")
@Excel
private String faultDesc;
/**
* 启用状态(1.待处理 2.处理中 3.已处理 4.忽略)

8
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
View File

@ -83,6 +83,14 @@
<artifactId>cloud-modules-enterprise-common</artifactId>
</dependency>
<!-- MySQL连接支持 -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join</artifactId>

2
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java
View File

@ -40,7 +40,7 @@ public class SysCarFaultController extends BaseController
* 查询车辆故障列表
*/
@RequestMapping(value = "/list", method = RequestMethod.GET)
public Result<List<SysCarFault>> list(@RequestBody SysCarFault sysCarFault)
public Result<List<SysCarFault>> list(SysCarFault sysCarFault)
{
List<SysCarFault> list = sysCarFaultService.selectSysCarFaultList(sysCarFault);
return success(list);

12
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java
View File

@ -28,7 +28,7 @@ import java.util.List;
@RestController
@RequiredArgsConstructor
@RequestMapping(value = "/ent")
@Tag(name = "SysEntController",description = "企业管理")
@Tag(name = "企业信息",description = "企业管理")
public class SysEntController extends BaseController {
/**
@ -66,7 +66,7 @@ public class SysEntController extends BaseController {
* @param entId 企业ID
* @return 响应结果
*/
@GetMapping(value = "/{entId}")
@GetMapping(value = "/getById/{entId}")
@Operation(summary = "根据ID获取企业信息", description = "根据企业唯一标识获取单体企业信息")
public Result<EntResp> getById(
@Schema(title = "企业ID", type = "Long", defaultValue = "1", description = "企业唯一标识")
@ -79,7 +79,7 @@ public class SysEntController extends BaseController {
* @param entAddReq 企业添加请求对象
* @return 响应结果
*/
@PostMapping
@PostMapping(value = "/save")
@Operation(summary = "添加企业信息", description = "将企业信息添加到系统中")
public Result<String> save(@Validated @RequestBody EntAddReq entAddReq) {
sysEntService.save(EntAddReq.addBuild(entAddReq));
@ -92,7 +92,7 @@ public class SysEntController extends BaseController {
* @param entUpdateReq 企业修改请求对象
* @return 响应结果
*/
@PutMapping(value = "/{entId}")
@PutMapping(value = "/update/{entId}")
@Operation(summary = "修改企业信息",description = "根据企业唯一标识修改企业信息")
public Result<String> update(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识")
@NotNull(message = "企业ID不能为空") @PathVariable(value = "entId") Long entId,
@ -106,13 +106,11 @@ public class SysEntController extends BaseController {
* @param entId 企业ID
* @return
*/
@RequestMapping(value = "/entId",method = RequestMethod.DELETE)
@RequestMapping(value = "/remove/{entId}",method = RequestMethod.DELETE)
@Operation(summary = "删除企业信息",description = "根据企业唯一标识删除企业记录")
public Result<String> remove(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识")
@NotNull(message = "企业ID不能为空") @PathVariable(value = "entId")Long entId){
sysEntService.removeById(entId);
return Result.success(null,Constants.SUCCESS_MESSAGE);
}
// @RequestMapping(value = "findId",)
}

72
cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
View File

@ -16,6 +16,7 @@ import com.muyu.system.domain.resp.AuthRoleResp;
import com.muyu.system.domain.resp.UserDetailInfoResp;
import com.muyu.system.domain.resp.UserInfoResp;
import com.muyu.system.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -23,6 +24,11 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@ -32,6 +38,7 @@ import java.util.stream.Collectors;
*
* @author muyu
*/
@Slf4j
@RestController
@RequestMapping("/user")
public class SysUserController extends BaseController {
@ -119,11 +126,17 @@ public class SysUserController extends BaseController {
@InnerAuth
@PostMapping("/register")
public Result<Boolean> register (@RequestBody RegisterBody registerBody) {
// String username = registerBody.getUsername();
String username = registerBody.getUsername();
SysUser sysUser = new SysUser();
sysUser.setUserName(username);
if (!userService.checkUserNameUnique(sysUser)) {
return Result.error("保存用户'" + username + "'失败，注册账号已存在");
}
if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
return Result.error("当前系统没有开启注册功能！");
}
SysUser sysUser = SysUser.builder().userName(username).build();
// SysUser sysUser = SysUser.builder().userName(username).build();
if (!userService.checkUserNameUnique(sysUser)) {
return Result.error("保存用户'" + username + "'失败，注册账号已存在");
}
@ -151,7 +164,64 @@ public class SysUserController extends BaseController {
sysUser.setDeptId(sysDept.getDeptId());
sysUser.setNickName(registerBody.getUsername());
sysUser.setPassword(SecurityUtils.encryptPassword(registerBody.getPassword()));
sysUser.setNickName("注册");
boolean b = userService.registerUser(sysUser);
if (b == true) {
//数据库驱动
String mysqlDriver = "com.mysql.jdbc.Driver";
//数据库地址
String url = "jdbc:mysql://106.15.136.7:3306/";
//数据库用户名
String name = "root";
//数据库密码
String password = "Six@211206";
Collection collection = null;
Collection stmt = null;
//创建数据库SQL
try {
Class.forName(mysqlDriver);
} catch (ClassNotFoundException e) {
throw new RuntimeException(e);
}
String databaseSQL = "create database "+username ;
//添加企业信息
String tableSQL = "create table sys_ent (id int auto_increment primary key comment '主键id'," +
"name varchar(16) comment '企业名称'," +
"leader varchar(16) comment '负责人'," +
"phone varchar(11) comment '联系电话'," +
"email varchar(32) comment '邮箱'," +
"ent_code varchar(64) comment '企业编码'," +
"ent_status varchar(64) comment '企业状态'," +
"create_by varchar(32) comment '创建人'," +
"update_by varchar(32) comment '创建时间'," +
"create_time datetime comment '修改人'," +
"update_time datetime comment '修改时间'," +
"remark varchar(32) comment '备注')";
//连接数据库
try {
Connection connection = DriverManager.getConnection(url, name, password);
//用于执行编译sql语句的对象
Statement connStatement = connection.createStatement();
if (connection != null) {
//执行建库语句
connStatement.executeUpdate(databaseSQL);
log.info("创建数据库成功");
//连接新建数据库
Connection connection1 = DriverManager.getConnection(url + username, name, password);
if (connection1 != null) {
log.info("连接数据库成功"+username);
Statement statement = connection1.createStatement();
//执行建表语句
statement.executeUpdate(tableSQL);
log.info("创建表成功");
return Result.success();
}
}
} catch (SQLException e) {
throw new RuntimeException(e);
}
}
return Result.success(userService.registerUser(sysUser));
}