!40 支持beetlsql3，多数据源

Merge pull request !40 from Andnnl/master

admin-console/pom.xml

@@ -20,6 +20,12 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>com.microsoft.sqlserver</groupId>
+			<artifactId>mssql-jdbc</artifactId>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
 </project>

admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-import java.util.Map;
-
-
 import com.ibeetl.admin.core.entity.CoreDict;
 import org.beetl.sql.core.page.PageRequest;
 import org.beetl.sql.core.page.PageResult;
@@ -12,12 +8,16 @@ import org.beetl.sql.mapper.annotation.Root;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * CoreDict Dao
  */
 @SqlResource("console.dict")
 public interface DictConsoleDao extends BaseMapper<CoreDict> {
-     PageResult<CoreDict> queryByCondition(PageRequest query, @Root Map params);
-	 @Update
-     void batchDelCoreDictByIds( List<Long> ids);
+    PageResult<CoreDict> queryByCondition(PageRequest query, @Root Map params);
+
+    @Update
+    void batchDelCoreDictByIds(List<Long> ids);
 }
\ No newline at end of file

admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
 
-
 import com.ibeetl.admin.core.entity.CoreMenu;
 import org.beetl.sql.core.page.PageRequest;
 import org.beetl.sql.core.page.PageResult;
@@ -16,6 +15,7 @@ public interface MenuConsoleDao extends BaseMapper<CoreMenu> {
 
     /**
      * 根据条件分页查询
+     *
      * @param query 查询条件
      */
     PageResult<CoreMenu> queryByCondition(PageRequest query, @Root Map params);

admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-import java.util.Map;
-
-
-import org.beetl.sql.core.engine.PageQuery;
-
 import com.ibeetl.admin.core.entity.CoreOrg;
 import com.ibeetl.admin.core.entity.CoreUser;
 import org.beetl.sql.core.page.PageRequest;
@@ -14,10 +8,13 @@ import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.Root;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
+import java.util.Map;
+
 @SqlResource("console.org")
 public interface OrgConsoleDao extends BaseMapper<CoreOrg> {
 
     PageResult<CoreOrg> queryByCondition(PageRequest query, @Root Map params);
-	PageResult<CoreUser> queryUserByCondition(PageRequest<CoreUser> query,@Root Map params);
+
+    PageResult<CoreUser> queryUserByCondition(PageRequest<CoreUser> query, @Root Map params);
 
 }

admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-import java.util.Map;
-
-
-import com.ibeetl.admin.console.web.query.RoleUserQuery;
 import com.ibeetl.admin.core.entity.CoreRole;
 import com.ibeetl.admin.core.entity.CoreUser;
 import org.beetl.sql.core.page.PageRequest;
@@ -14,32 +9,38 @@ import org.beetl.sql.mapper.annotation.Root;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import java.util.List;
+import java.util.Map;
+
 @SqlResource("console.role")
 public interface RoleConsoleDao extends BaseMapper<CoreRole> {
 
     /**
      * 根据条件分页查询
+     *
      * @param query 查询条件
      */
     PageResult<CoreRole> queryByCondition(PageRequest query, Map params);
 
     /**
      * 批量删除角色
+     *
      * @param ids 角色id
      */
     @Update
     void batchDelByIds(List<Long> ids);
-	@Update
+
+    @Update
     void batchDeleteRoleFunction(List<Long> ids);
-	@Update
+
+    @Update
     void batchDeleteRoleMenu(List<Long> ids);
-	@Update
+
+    @Update
     void batchDeleteUserRole(List<Long> ids);
 
 
-	PageResult<CoreUser> queryUser(PageRequest query, @Root Map params);
-    
+    PageResult<CoreUser> queryUser(PageRequest query, @Root Map params);
 
 
-   
 }

admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
-import java.util.List;
-
 import com.ibeetl.admin.console.web.dto.RoleDataAccessFunction;
 import com.ibeetl.admin.core.entity.CoreRoleFunction;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 import org.beetl.sql.mapper.annotation.Update;
 
+import java.util.List;
+
 @SqlResource("console.roleFunction")
 public interface RoleFunctionConsoleDao extends BaseMapper<CoreRoleFunction> {
 
-	@Update
+    @Update
     void deleteRoleFunction(List<Long> ids);
 
     List<Long> getFunctionIdByRole(Long roleId);

admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java

 package com.ibeetl.admin.console.dao;
 
 
-
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.entity.CoreUserRole;
 import com.ibeetl.admin.core.util.enums.GeneralStateEnum;
@@ -19,12 +18,14 @@ import java.util.Map;
 public interface UserConsoleDao extends BaseMapper<CoreUser> {
 
     PageResult<CoreUser> queryByCondition(PageRequest<CoreUser> query, @Root Map params);
-	@Update
-    void batchDelUserByIds( List<Long> ids);
-	@Update
+
+    @Update
+    void batchDelUserByIds(List<Long> ids);
+
+    @Update
     void batchUpdateUserState(List<Long> ids, GeneralStateEnum state);
-    
-    List<CoreUserRole> queryUserRole( Long id,Long orgId,Long roleId);
+
+    List<CoreUserRole> queryUserRole(Long id, Long orgId, Long roleId);
 
 }
 

admin-console/src/main/java/com/ibeetl/admin/console/service/RoleConsoleService.java

@@ -12,6 +12,7 @@ import org.beetl.sql.core.page.PageResult;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,6 +34,7 @@ public class RoleConsoleService extends CoreBaseService<CoreRole> {
     private RoleConsoleDao roleDao;
     
     @Autowired
+    @Qualifier("coreSqlManager")
     private SQLManager sqlManager;
 
     @Autowired

admin-console/src/main/resources/application.properties

-spring.datasource.baseDataSource.url=jdbc:mysql://127.0.0.1:3306/starter?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true
-spring.datasource.baseDataSource.username=root
-spring.datasource.baseDataSource.password=12345678
-spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver
-
-# 配置了一个数据源，如果需要多数据源，参考beetlsql springboot集成文档
-beetlsql.sqlManagers=coreSqlManager
-beetlsql.coreSqlManager.ds=baseDataSource
-beetlsql.coreSqlManager.basePackage=com.ibeetl.admin.core.dao,com.ibeetl.admin.console.dao
-beetlsql.coreSqlManager.daoSuffix=Dao
-beetlsql.coreSqlManager.dbStyle=org.beetl.sql.core.db.MySqlStyle
+#spring.datasource.baseDataSource.url=jdbc:mysql://127.0.0.1:3306/starter?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&useInformationSchema=true
+#spring.datasource.baseDataSource.username=root
+#spring.datasource.baseDataSource.password=12345678
+#spring.datasource.baseDataSource.driver-class-name=com.mysql.cj.jdbc.Driver
+#
+## 配置了一个数据源，如果需要多数据源，参考beetlsql springboot集成文档
+#beetlsql.sqlManagers=coreSqlManager
+#beetlsql.coreSqlManager.ds=baseDataSource
+#beetlsql.coreSqlManager.basePackage=com.ibeetl.admin.core.dao,com.ibeetl.admin.console.dao
+#beetlsql.coreSqlManager.daoSuffix=Dao
+#beetlsql.coreSqlManager.dbStyle=org.beetl.sql.core.db.MySqlStyle
 
 
+spring.datasource.baseDataSource.url=jdbc:sqlserver://192.168.4.241:1433;DatabaseName=SMS_ZLFS
+spring.datasource.baseDataSource.username=sa
+spring.datasource.baseDataSource.password=jy@88250860
+spring.datasource.baseDataSource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
+
+beetlsql.ds.baseDataSource.basePackage=com
+beetlsql.ds.baseDataSource.dbStyle=org.beetl.sql.core.db.SqlServer2012Style
+#beetlsql.basePackage=com.ibeetl,com.xxx.yourpackage
+#有一个数据源命名为baseDataSource,你可以添加多数据源
+beetlsql.mutiple.datasource=baseDataSource
+#beetlsql.sqlManagers=coreSqlManager
+#beetlsql.coreSqlManager.ds=baseDataSource
+
 # 1，1 是管理员密码，相当于启动后就登录，方便测试，系统需要取消这俩个配置
 user.id=1
 user.orgId=1

admin-console/src/main/resources/sql/console/user.md

@@ -37,6 +37,9 @@ queryByCondition
         and  u.create_time< #nextDay(createDateMax)#
     @}
     
+    @pageIgnoreTag(){
+        order by id
+    @}
     
 
 batchDelUserByIds
@@ -67,3 +70,5 @@ queryUserRole
     @if(isNotEmpty(roleId)){
     	and role.id=#roleId#
     @}
+    
+

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java

@@ -6,10 +6,10 @@ import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
 /*
-* 
-* gen by starter mapper 2017-08-01
-*/
+ *
+ * gen by starter mapper 2017-08-01
+ */
 @SqlResource("core.coreAudit")
 public interface CoreAuditDao extends BaseMapper<CoreAudit> {
-	
+
 }
\ No newline at end of file

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java

 package com.ibeetl.admin.core.dao;
 
-import java.util.List;
-import java.util.Map;
-
+import com.ibeetl.admin.core.entity.CoreDict;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
-import com.ibeetl.admin.core.entity.CoreDict;
-import org.beetl.sql.mapper.annotation.Update;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 字典DAO接口
@@ -17,6 +15,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
 
     /**
      * 查询某个类型下的字典集合
+     *
      * @param type 字典类型
      * @return
      */
@@ -24,15 +23,16 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
 
     /**
      * 查询字段类型列表
+     *
      * @param delFlag 删除标记
      * @return
      */
     List<Map<String, String>> findTypeList(int delFlag);
 
-  
 
     /**
      * 根据父节点Id查询子节点数据
+     *
      * @param id 父节点id
      * @return
      */

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java

 package com.ibeetl.admin.core.dao;
 
+import com.ibeetl.admin.core.entity.CoreFile;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.Sql;
-
-import com.ibeetl.admin.core.entity.CoreFile;
 import org.beetl.sql.mapper.annotation.Update;
 
-public interface  CoreFileDao extends BaseMapper<CoreFile> {
+public interface CoreFileDao extends BaseMapper<CoreFile> {
     @Sql("update core_file set biz_type=?,biz_id=? where file_batch_id=?")
-	@Update
-	void updateBatchIdInfo( String bizType, String bizId,String fileBatchId);
+    @Update
+    void updateBatchIdInfo(String bizType, String bizId, String fileBatchId);
 }

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java

 package com.ibeetl.admin.core.dao;
 
+import com.ibeetl.admin.core.entity.CoreFunction;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.Sql;
-
-import com.ibeetl.admin.core.entity.CoreFunction;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
 @SqlResource("core.coreFunction")

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java

 package com.ibeetl.admin.core.dao;
 
 
-
 import com.ibeetl.admin.core.entity.CoreMenu;
 import org.beetl.sql.core.page.PageRequest;
 import org.beetl.sql.mapper.BaseMapper;
@@ -13,10 +12,11 @@ import java.util.List;
 @SqlResource("core.coreMenu")
 public interface CoreMenuDao extends BaseMapper<CoreMenu> {
 
-	void queryByCondtion(PageRequest query);
-	@Update
-	void clearMenuFunction(List<Long> functionIds);
+    void queryByCondtion(PageRequest query);
+
+    @Update
+    void clearMenuFunction(List<Long> functionIds);
 
-	List<CoreMenu> allMenuWithURL();
+    List<CoreMenu> allMenuWithURL();
 
 }

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java

 package com.ibeetl.admin.core.dao;
 
-import java.util.List;
-
-
-import org.beetl.sql.core.page.PageRequest;
+import com.ibeetl.admin.core.entity.CoreOrg;
 import org.beetl.sql.mapper.BaseMapper;
 import org.beetl.sql.mapper.annotation.Sql;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
-import com.ibeetl.admin.core.entity.CoreOrg;
+import java.util.List;
 
 @SqlResource("core.coreOrg")
 public interface CoreOrgDao extends BaseMapper<CoreOrg> {
 
     List<CoreOrg> queryOrgByUser(Long userId);
 
- 
+
     List<String> queryAllOrgCode(List<Long> orgIds);
-    
+
     @Sql("select * from core_org where parent_org_id is null")
     CoreOrg getRoot();
 
-  
+
 }

admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java

 package com.ibeetl.admin.core.dao;
 
-import org.beetl.sql.core.page.PageRequest;
+import com.ibeetl.admin.core.entity.CoreRole;
 import org.beetl.sql.mapper.BaseMapper;
-import org.beetl.sql.mapper.annotation.Sql;
 import org.beetl.sql.mapper.annotation.SqlResource;
 
-import com.ibeetl.admin.core.entity.CoreRole;
-
 
 @SqlResource("core.coreRole")
 public interface CoreRoleDao extends BaseMapper<CoreRole> {