diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index 3b5b745..0b2f6f5 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -14,6 +14,8 @@ import com.muyu.common.security.auth.AuthUtil; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; @@ -38,6 +40,7 @@ import java.sql.Statement; */ @Log4j2 @RestController +@Tag(name = "auth",description = "auth") public class TokenController { @Autowired private TokenService tokenService; @@ -49,6 +52,7 @@ public class TokenController { private SysFirmService sysFirmService; @PostMapping("login") + @Operation(summary = "登录", description = "登录") public Result login (@RequestBody LoginBody form) { //查询企业是否存在 Firm firm = sysFirmService.findFirmByName(form.getFirmName()); @@ -62,6 +66,7 @@ public class TokenController { } @DeleteMapping("logout") + @Operation(summary = "退出", description = "退出") public Result logout (HttpServletRequest request) { String token = SecurityUtils.getToken(request); if (StringUtils.isNotEmpty(token)) { @@ -75,6 +80,7 @@ public class TokenController { } @PostMapping("refresh") + @Operation(summary = "刷新token", description = "刷新token") public Result refresh (HttpServletRequest request) { LoginUser loginUser = tokenService.getLoginUser(request); if (StringUtils.isNotNull(loginUser)) { @@ -86,6 +92,7 @@ public class TokenController { } @PostMapping("register") + @Operation(summary = "注册用户", description = "注册用户") public Result register (@RequestBody RegisterBody registerBody) { // 用户注册 sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); @@ -98,6 +105,7 @@ public class TokenController { * @return */ @PostMapping("/enterprise") + @Operation(summary = "企业入驻", description = "企业入驻") public Result enterprise( @RequestBody EnterpriseSettlement settlement){ String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; 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 7305c98..28cb748 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 @@ -1,6 +1,6 @@ package com.muyu.auth.service; -import com.muyu.auth.form.EnterpriseSettlement; + import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.SecurityConstants; @@ -13,7 +13,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.Enterprise; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; @@ -144,7 +144,7 @@ public class SysLoginService { if (fileName.length() < UserConstants.Firm_NAME_MIN_LENGTH || fileName.length() > UserConstants.Firm_NAME_MAX_LENGTH) { throw new ServiceException("企业名称长度必须在2到20个字符之间"); } - Enterprise settlement = new Enterprise(); + Business settlement = new Business(); settlement.setDatabaseName(databaseName); settlement.setFirmName(fileName); diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java index 3eba063..212d27c 100644 --- a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java @@ -13,11 +13,11 @@ import java.util.HashMap; import java.util.Map; /** -* kafka消费者配置类 -* @program: cloud-server -* @author: cuiyongxing -* @create: 2024-09-28 14:28 -**/ + * kafka消费者配置类 + * @program: cloud-server + * @author: cuiyongxing + * @create: 2024-09-28 14:28 + **/ @Configuration public class KafkaConsumerConfig { diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 04bf3b3..7245b4d 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -29,7 +29,8 @@ import java.util.List; import java.util.Map; /** - * @Author: DongZeLiang + * 多数据源 + * @author liuwu * @date: 2024/6/3 * @Description: 多数据源 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java index 6152cad..bb27584 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/constents/DatasourceContent.java @@ -1,7 +1,8 @@ package com.muyu.cloud.common.many.datasource.constents; /** - * @author DongZl + * 数据源常量 + * @author liuwu * @description: 数据源常量 * @Date 2023-8-1 上午 11:02 */ diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java index 73cc26e..6406cfc 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java @@ -8,7 +8,8 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @author DongZl + * 数据源实体类 + * @author liuwu * @description: 数据源实体类 * @Date 2023-8-1 上午 11:15 */ diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java index 7ceb782..30eee74 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Component; import java.sql.SQLException; /** - * @Author: DongZeLiang + * Druid工厂 + * @author liuwu * @date: 2024/6/3 * @Description: Druid工厂 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java index e53229a..5cafaa0 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/holder/DynamicDataSourceHolder.java @@ -6,7 +6,7 @@ import org.springframework.util.Assert; /** * 数据源切换处理 * - * @author Dongzl + * @author liuwu */ @Slf4j public class DynamicDataSourceHolder { diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java index 241ce32..042fe95 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/contents/SaaSConstant.java @@ -1,7 +1,8 @@ package com.muyu.cloud.common.saas.contents; /** - * @Author: DongZeLiang + * SAAS常量 + * @author liuwu * @date: 2024/6/3 * @Description: SAAS常量 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java index 5c1985a..db7e230 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/domain/model/EntInfo.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author: DongZeLiang + * @Author: liuwu * @date: 2024/6/3 * @Description: 企业信息 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java index b2b4cc7..60e5054 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/exception/SaaSException.java @@ -4,7 +4,8 @@ package com.muyu.cloud.common.saas.exception; import com.muyu.common.core.exception.ServiceException; /** - * @Author: DongZeLiang + * SaaS异常类 + * @author liuwu * @date: 2024/6/3 * @Description: SaaS异常类 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java index 0efef00..997fe6b 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java @@ -14,7 +14,8 @@ import org.springframework.web.servlet.AsyncHandlerInterceptor; /** - * @Author: DongZeLiang + * SAAS拦截器 + * @author liuwu * @date: 2024/6/3 * @Description: SAAS拦截器 * @Version: 1.0 diff --git a/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 70148cf..0000000 --- a/cloud-common/cloud-common-saas/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -com.muyu.cloud.common.saas.interceptor.WebMvcSaaSConfig -com.muyu.cloud.common.many.datasource.ManyDataSource -com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Enterprise.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Business.java similarity index 95% rename from cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Enterprise.java rename to cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Business.java index 2dcb360..1773299 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Enterprise.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/Business.java @@ -21,7 +21,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class Enterprise extends BaseEntity { +public class Business extends BaseEntity { private static final long serialVersionUID = 1L; /** diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index a558d0a..1154a72 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -3,9 +3,7 @@ package com.muyu.common.system.remote; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.constant.ServiceNameConstants; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.system.domain.Enterprise; -import com.muyu.common.system.domain.SysFirmUser; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; import com.muyu.common.system.domain.LoginUser; @@ -53,5 +51,5 @@ public interface RemoteUserService { * @return */ @PostMapping("/user/enterprise") - ResultsettlementEnterpriseInfo(@RequestBody Enterprise enterprise, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + ResultsettlementEnterpriseInfo(@RequestBody Business enterprise, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 720d62a..f725a4c 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -1,9 +1,7 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; -import com.muyu.common.system.domain.Enterprise; -import com.muyu.common.system.domain.SysFirmUser; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; @@ -43,7 +41,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory settlementEnterpriseInfo(Enterprise enterprise, String source) { + public Result settlementEnterpriseInfo(Business enterprise, String source) { return Result.error("入驻企业失败"); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 17170ac..f8ef4d5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -138,7 +138,7 @@ public class SysUserController extends BaseController { */ @InnerAuth @PostMapping("/enterprise") - public Result enterprise (@RequestBody Enterprise enterprise){ + public Result enterprise (@RequestBody Business enterprise){ return Result.success(userService.enterprise(enterprise)); } 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 d02260f..3dc6b0b 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 @@ -1,7 +1,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.common.system.domain.Enterprise; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.domain.SysUser; import org.apache.ibatis.annotations.Param; @@ -72,14 +72,14 @@ public interface SysUserMapper extends BaseMapper { * @param enterprise * @return */ - int enterprise(Enterprise enterprise); + int enterprise(Business enterprise); /** * 企业管理添加 * @param enterprise * @return */ - int enterPriseAdd(Enterprise enterprise); + int enterPriseAdd(Business enterprise); /** * 修改用户信息 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index 84c9065..7dc514c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -1,7 +1,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.common.system.domain.Enterprise; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.domain.SysUser; import java.util.List; @@ -134,7 +134,7 @@ public interface SysUserService extends IService { */ boolean registerUser(SysUser user); - boolean enterprise(Enterprise enterprise); + boolean enterprise(Business enterprise); /** * 修改用户信息 * 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 4e30574..bc4162a 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 @@ -8,7 +8,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.bean.BeanValidators; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.Enterprise; +import com.muyu.common.system.domain.Business; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysPost; @@ -264,7 +264,7 @@ public class SysUserServiceImpl extends ServiceImpl impl * @return */ @Override - public boolean enterprise(Enterprise enterprise){ + public boolean enterprise(Business enterprise){ userMapper.enterPriseAdd(enterprise); return userMapper.enterprise(enterprise) > 0; } diff --git a/cloud-modules/saas/saas-server/pom.xml b/cloud-modules/saas/saas-server/pom.xml index bb9544a..4286b11 100644 --- a/cloud-modules/saas/saas-server/pom.xml +++ b/cloud-modules/saas/saas-server/pom.xml @@ -42,6 +42,11 @@ 3.6.3 + + com.muyu + cloud-common-saas + + com.alibaba.cloud diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java index 39a5e55..fbe366d 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/EnterpriseController.java @@ -1,8 +1,12 @@ package com.muyu.server.controller; import cn.hutool.core.bean.BeanUtil; +import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; +import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.domain.Enterprise; +import com.muyu.common.system.domain.Business; +import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.util.PageUtils; import com.muyu.server.controller.form.DeleteEnterpriseByIds; import com.muyu.server.controller.form.InsertEnterprise; @@ -14,8 +18,15 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.support.EncodedResource; +import org.springframework.jdbc.datasource.init.ScriptUtils; import org.springframework.web.bind.annotation.*; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; import java.util.HashMap; import java.util.Map; @@ -35,6 +46,9 @@ public class EnterpriseController { @Autowired private EnterpriseService enterpriseService; + @Autowired + private RemoteUserService remoteUserService; + /** * 查询分页企业信息 @@ -72,6 +86,48 @@ public class EnterpriseController { enterprise.setEnterpriseFenceCount(form.getEnterpriseFenceCount()); int rows = enterpriseService.insert(enterprise); + if (rows == 0){ + return Result.error("新增失败"); + } + + Business business = new Business(); + business.setFirmName(form.getEnterpriseName()); + business.setDatabaseName(form.getEnterpriseDatabaseName()); + remoteUserService.settlementEnterpriseInfo(business, SecurityConstants.INNER); + + String createDatabaseUrl="jdbc:mysql://"+ DatasourceContent.IP+":"+DatasourceContent.PORT+"?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + String createDatabaseSql = "CREATE DATABASE IF NOT EXISTS " + form.getEnterpriseDatabaseName() + ";"; + try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD); + Statement stmt = adminConn.createStatement()) { + + boolean success = stmt.execute(createDatabaseSql); + if (success) { + log.info("数据库 {} 创建失败", form.getEnterpriseDatabaseName()); + + } else { + log.warn("数据库 {} 创建成功", form.getEnterpriseDatabaseName()); + + // 切换到新的数据库连接 + Connection connection = null; + try { + String url = "jdbc:mysql://47.101.53.251:3306/" + form.getEnterpriseDatabaseName() + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + String user = "root"; + String pwd = "Lw030106"; + String driverClassName = "com.mysql.cj.jdbc.Driver"; + Class.forName(driverClassName); + connection = DriverManager.getConnection(url, user, pwd); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + ClassPathResource rc = new ClassPathResource("static/saas.sql"); + EncodedResource er = new EncodedResource(rc, "utf-8"); + ScriptUtils.executeSqlScript(connection, er); + } + + } catch (SQLException e) { + e.printStackTrace(); + log.error("连接数据库时发生错误或创建数据库失败", e); + } return Result.success(rows); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java index 0b06241..5949f2e 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarFaultController.java @@ -85,7 +85,7 @@ public class SysCarFaultController extends BaseController @Validated @RequestBody SysCarFault sysCarFault) { //判断故障码是否重复 - SysCarFault selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode()); + List selectFaultByFaultCode = sysCarFaultService.selectFaultByFaultCode(sysCarFault.getFaultCode()); if (selectFaultByFaultCode!=null){ return error("新增车辆故障 ,故障码已存在"); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java index 8c0a9ee..ba1136c 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java @@ -5,6 +5,9 @@ import javax.annotation.Resource; import com.muyu.common.domain.WarnStrategy; import com.muyu.common.domain.req.WarnStrategyReq; import com.muyu.server.service.WarnStrategyService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.DeleteMapping; @@ -23,6 +26,8 @@ import com.muyu.common.core.domain.Result; */ @RestController @RequestMapping("/strategy") +@Log4j2 +@Tag(name = "预警策略管理",description = "预警策略管理") public class WarnStrategyController extends BaseController { @Resource @@ -32,6 +37,7 @@ public class WarnStrategyController extends BaseController * 查询预警策略列表 */ @PostMapping("/selectWarnStrategyList") + @Operation(summary = "预警策略列表",description = "预警策略列表") public Result selectWarnStrategyList(@RequestBody WarnStrategyReq warnStrategyReq) { return Result.success(warnStrategyService.selectWarnStrategyList(warnStrategyReq)); @@ -42,6 +48,7 @@ public class WarnStrategyController extends BaseController * 获取预警策略详细信息 */ @GetMapping( "selectById/{id}") + @Operation(summary = "预警策略详细信息",description = "预警策略详细信息") public Result selectById(@PathVariable("id") Long id) { return success(warnStrategyService.selectWarnStrategyById(id)); @@ -51,6 +58,7 @@ public class WarnStrategyController extends BaseController * 新增预警策略 */ @PostMapping("/addWarnStrategy") + @Operation(summary = "预警策略添加",description = "预警策略添加") public Result addWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.addWarnStrategy(warnStrategy); @@ -61,6 +69,7 @@ public class WarnStrategyController extends BaseController * 修改预警策略 */ @PostMapping("/updWarnStrategy") + @Operation(summary = "预警策略修改",description = "预警策略修改") public Result updWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.updWarnStrategy(warnStrategy); @@ -71,6 +80,7 @@ public class WarnStrategyController extends BaseController * 删除预警策略 */ @DeleteMapping("deleteWarnStrategy/{id}") + @Operation(summary = "预警策略删除",description = "预警策略删除") public Result deleteWarnStrategy(@PathVariable("id") Long id) { Integer i = warnStrategyService.deleteWarnStrategy(id); @@ -83,6 +93,7 @@ public class WarnStrategyController extends BaseController * 根据车辆类型ID查询策略 */ @GetMapping("/selectListByCarType/{carTypeId}") + @Operation(summary = "根据车辆类型ID查询策略",description = "根据车辆类型ID查询策略") public Result selectListByCarType(@PathVariable("carTypeId") Long carTypeId) { return Result.success(warnStrategyService.selectListByCarType(carTypeId)); } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java similarity index 90% rename from cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java rename to cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java index 786b50f..27779c3 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseDao.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/EnterpriseMapper.java @@ -9,14 +9,14 @@ import java.util.HashMap; import java.util.Map; /** - * 企业信息 Mapper接口 + * 企业信息Mapper接口 * @author yupnig * @package com.muyu.server.mapper - * @name EnterpriseDao + * @name EnterpriseMapper * @date 2024-09-29 14:31:06 */ @Mapper -public interface EnterpriseDao { +public interface EnterpriseMapper { // 查询分页信息 public ArrayList selectEnterprise(Map param); //查询企业记录总数 diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java index 2ef819c..a500004 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMapper.java @@ -17,16 +17,6 @@ import java.util.List; @Mapper public interface SysCarFaultMapper extends BaseMapper { - //根据添加的故障码进行查询 - @Select("select fault_code from sys_car_fault where fault_code=#{faultCode}") - SysCarFault selectFaultByFaultCode(String faultCode); - - /** - * 查询故障码信息 - * @param ids 故障码信息主键 - * @return 故障码信息 - */ - public List selectSysCarFaultIds(String[] ids); diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java index 5d4622a..9253762 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarFaultMessageMapper.java @@ -17,12 +17,8 @@ import java.util.List; @Mapper public interface SysCarFaultMessageMapper extends BaseMapper { - // 查询状态等于1的记录 - @Select("select * from sys_car_fault_message where status=1") - public ListlistStatusOnt( ); - //查询状态等于2的记录 - @Select("select * from sys_car_fault_message where status=2") - public ListlistStatusTwo( ); + + diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java index be0dcbd..70a990c 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java @@ -28,6 +28,6 @@ public interface SysCarMapper extends BaseMapper { SysCar findCarByVin(@Param("carVin") String carVin); - SysCar selectByCarVin(@Param("carVin") String carVin); + } diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java index f780e9f..85b6277 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/TemplateMapper.java @@ -19,6 +19,6 @@ import java.util.List; @Mapper public interface TemplateMapper extends BaseMapper