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..75a04e5 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; diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java deleted file mode 100644 index b297441..0000000 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/JDBCDemo.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.cloud.common.many.datasource; - -import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; -import lombok.extern.log4j.Log4j2; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; - -/** - * 测试添加数据源 - * @author 袁子龙 - * @package com.muyu.cloud.common.many.datasource - * @name JDBCDemo - * @date 2024/9/30 18:14 - */ -@Log4j2 -public class JDBCDemo { - public static void main(String[] args) { - String databaseName = "my_database"; - - String connectUrl = DatasourceContent.getDatasourceUrl("mysql"); - - 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 " + databaseName + ";"; - - try (Connection adminConn = DriverManager.getConnection(createDatabaseUrl, DatasourceContent.USER_NAME, DatasourceContent.PASSWORD); - Statement stmt = adminConn.createStatement()) { - - boolean success = stmt.execute(createDatabaseSql); - if (success) { - log.info("数据库 {} 创建成功", databaseName); - - } else { - log.warn("数据库 {} 创建失败，可能已存在或权限不足", databaseName); - } - - } catch (SQLException e) { - e.printStackTrace(); - log.error("连接数据库时发生错误或创建数据库失败", e); - } - } -} 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-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/service/impl/EnterpriseServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java index 5f98fb8..f46569d 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/EnterpriseServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.map.MapUtil; import com.muyu.cache.EnterpriseCacheService; import com.muyu.common.domain.Enterprise; import com.muyu.common.util.PageUtils; -import com.muyu.server.mapper.EnterpriseDao; +import com.muyu.server.mapper.EnterpriseMapper; import com.muyu.server.service.EnterpriseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +22,7 @@ import java.util.*; public class EnterpriseServiceImpl implements EnterpriseService { @Autowired - private EnterpriseDao enterpriseDao; + private EnterpriseMapper enterpriseDao; @Autowired private EnterpriseCacheService enterpriseCacheService; diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java index 46bc9f4..9082f18 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java @@ -13,9 +13,16 @@ import com.muyu.server.service.SysCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; + import java.util.List; +/** + * 车辆管理 服务层处理 + * @author sx + * @package com.muyu.server.service.impl + * @name SysCarServiceImpl + * @date 2024-09-29 14:31:06 + */ @DS("lizzDB") @Service public class SysCarServiceImpl extends ServiceImpl implements SysCarService { diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java index 091631d..25585de 100644 --- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java +++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java @@ -3,7 +3,6 @@ package com.muyu.server.service.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cache.SysCarCacheService; import com.muyu.common.domain.MessageTemplateType; import com.muyu.common.domain.SysCar; import com.muyu.common.domain.Template; @@ -21,7 +20,8 @@ import java.sql.*; import java.util.List; import java.util.concurrent.ExecutionException; /** - * @Author：liuxinyue + * 报文模版 服务层处理 + * @author liuxinyue * @Package：com.template.service.impl * @Project：cloud-server-c * @name：TemplateServiceImp @@ -31,8 +31,7 @@ import java.util.concurrent.ExecutionException; @Service public class TemplateServiceImpl extends ServiceImpl implements TemplateService { - @Autowired - private static TemplateMapper templateMapper; + @Autowired private SysCarService sysCarService; diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml index 511435b..cc25010 100644 --- a/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml +++ b/cloud-modules/saas/saas-server/src/main/resources/mapper/EnterpriseMapper.xml @@ -6,7 +6,7 @@ 1.在mybats的开发中namespace有特殊的意思，一定要是对应接口的全限定名 通过namespace可以简历mapper.xml和接口之间的关系(名字不重要，位置不重要) --> - + - + insert into tb_enterprise set enterprise_name = #{enterpriseName}, enterprise_car_count = #{enterpriseCarCount},