diff --git a/admin-console/pom.xml b/admin-console/pom.xml index bab71d4e4245db7977a7da3b24991fc00aed7e4e..ce08685791458c710e77c9f63b8d68fc9b34c75c 100644 --- a/admin-console/pom.xml +++ b/admin-console/pom.xml @@ -20,6 +20,12 @@ mysql mysql-connector-java + + + com.microsoft.sqlserver + mssql-jdbc + runtime + diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java index 69864260ecee06bcebd51571395bbab00cc7e3ca..26d09716bc1dd21c16cda695e07551157bcf0c19 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/DictConsoleDao.java @@ -1,9 +1,5 @@ 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 { - PageResult queryByCondition(PageRequest query, @Root Map params); - @Update - void batchDelCoreDictByIds( List ids); + PageResult queryByCondition(PageRequest query, @Root Map params); + + @Update + void batchDelCoreDictByIds(List ids); } \ No newline at end of file diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java index 355d46808f550c747f44a049c27c0cbb1ef0102c..4e156e356ec612373e8fa42bc16809d8a6aeab46 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/MenuConsoleDao.java @@ -1,7 +1,6 @@ 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 { /** * 根据条件分页查询 + * * @param query 查询条件 */ PageResult queryByCondition(PageRequest query, @Root Map params); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java index 312e8f6363f933f8e79efd1554824f942d60bfdb..b833f600908b95912d4c3db24a146f5b14c1cb78 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/OrgConsoleDao.java @@ -1,11 +1,5 @@ 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 { PageResult queryByCondition(PageRequest query, @Root Map params); - PageResult queryUserByCondition(PageRequest query,@Root Map params); + + PageResult queryUserByCondition(PageRequest query, @Root Map params); } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java index 5465a773b96ef93b7993094212a69cb9b940665a..3da92e330692db3a3b5ed8fb7211c4fa752008ee 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleConsoleDao.java @@ -1,10 +1,5 @@ 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 { /** * 根据条件分页查询 + * * @param query 查询条件 */ PageResult queryByCondition(PageRequest query, Map params); /** * 批量删除角色 + * * @param ids 角色id */ @Update void batchDelByIds(List ids); - @Update + + @Update void batchDeleteRoleFunction(List ids); - @Update + + @Update void batchDeleteRoleMenu(List ids); - @Update + + @Update void batchDeleteUserRole(List ids); - PageResult queryUser(PageRequest query, @Root Map params); - + PageResult queryUser(PageRequest query, @Root Map params); - } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java index be02cd36f8b6e38c2ba89343b89249b4a9398f29..49cf5f201a4550e3317dd43aeb4c89956835e68b 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/RoleFunctionConsoleDao.java @@ -1,17 +1,17 @@ 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 { - @Update + @Update void deleteRoleFunction(List ids); List getFunctionIdByRole(Long roleId); diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java index 65e3c2811a4804231cb7c84b9ad1b30336b68204..35c3c46b9d64d8aa22bf2fcf598ad0cca2d8fd72 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java +++ b/admin-console/src/main/java/com/ibeetl/admin/console/dao/UserConsoleDao.java @@ -1,7 +1,6 @@ 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 { PageResult queryByCondition(PageRequest query, @Root Map params); - @Update - void batchDelUserByIds( List ids); - @Update + + @Update + void batchDelUserByIds(List ids); + + @Update void batchUpdateUserState(List ids, GeneralStateEnum state); - - List queryUserRole( Long id,Long orgId,Long roleId); + + List queryUserRole(Long id, Long orgId, Long roleId); } diff --git a/admin-console/src/main/java/com/ibeetl/admin/console/service/RoleConsoleService.java b/admin-console/src/main/java/com/ibeetl/admin/console/service/RoleConsoleService.java index f76f8adf9118dd0b36eb64a043a9e37bfd58728f..dc4a748740f22d67e176fae919791db53c99f0dd 100644 --- a/admin-console/src/main/java/com/ibeetl/admin/console/service/RoleConsoleService.java +++ b/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 { private RoleConsoleDao roleDao; @Autowired + @Qualifier("coreSqlManager") private SQLManager sqlManager; @Autowired diff --git a/admin-console/src/main/resources/application.properties b/admin-console/src/main/resources/application.properties index b3f6add31c4aea58d75bd2815b9251d87a4fd553..0d4c0bf030c80967bc506a272b2619319865812e 100644 --- a/admin-console/src/main/resources/application.properties +++ b/admin-console/src/main/resources/application.properties @@ -1,16 +1,29 @@ -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 diff --git a/admin-console/src/main/resources/excelTemplates/admin/dict/dict_collection_template.xls b/admin-console/src/main/resources/excelTemplates/admin/dict/dict_collection_template.xls index 91bba51f8f876053b026a1af25ddcff89d085e22..ac4545ad0d65875959405014149aa5c019a808b7 100644 Binary files a/admin-console/src/main/resources/excelTemplates/admin/dict/dict_collection_template.xls and b/admin-console/src/main/resources/excelTemplates/admin/dict/dict_collection_template.xls differ diff --git a/admin-console/src/main/resources/excelTemplates/admin/dict/dict_upload_template.xls b/admin-console/src/main/resources/excelTemplates/admin/dict/dict_upload_template.xls index 7c82c8f1bd3864c4ad6fa93e7fddb46970bd35d0..b52d56d01e1a000aa33cbdcdb6990ad5634d12ef 100644 Binary files a/admin-console/src/main/resources/excelTemplates/admin/dict/dict_upload_template.xls and b/admin-console/src/main/resources/excelTemplates/admin/dict/dict_upload_template.xls differ diff --git a/admin-console/src/main/resources/excelTemplates/admin/user/user_collection_template.xls b/admin-console/src/main/resources/excelTemplates/admin/user/user_collection_template.xls index 6311752984c1439d2171f880d96cf51c348f6027..d3dba2f37eec036899df71f6219b4ede84ea8d41 100644 Binary files a/admin-console/src/main/resources/excelTemplates/admin/user/user_collection_template.xls and b/admin-console/src/main/resources/excelTemplates/admin/user/user_collection_template.xls differ diff --git a/admin-console/src/main/resources/sql/console/user.md b/admin-console/src/main/resources/sql/console/user.md index adda6055dc9a03df3d90108ffd7ff0e26ea2b463..b2e315db8cd4dde3323d2573e15ad866eec06d8a 100644 --- a/admin-console/src/main/resources/sql/console/user.md +++ b/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# @} + + diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java index 906d4e1d27392b403875272d4f3565e1dee5c8df..4cb3cffb5d04e570f9671d0464311a15582278f9 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreAuditDao.java +++ b/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 { - + } \ No newline at end of file diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java index f637cfe604a4448992bb3ba7f80f06e8f3bdd8e9..1768e0293dbf5911fbafce3c6059dcad7377c3c9 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java @@ -1,13 +1,11 @@ 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 { /** * 查询某个类型下的字典集合 + * * @param type 字典类型 * @return */ @@ -24,15 +23,16 @@ public interface CoreDictDao extends BaseMapper { /** * 查询字段类型列表 + * * @param delFlag 删除标记 * @return */ List> findTypeList(int delFlag); - /** * 根据父节点Id查询子节点数据 + * * @param id 父节点id * @return */ diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java index 9d3642fb5183872d1fec1ac92255550481a40174..1607d53d6c1b7270f4aff30fc6bc36d3928bfe59 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFileDao.java @@ -1,13 +1,12 @@ 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 { +public interface CoreFileDao extends BaseMapper { @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); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java index f380028b88e1aaa83f0cf8323e37db5bc7c5ac3c..d93831a991dbde3eb5768a517215642b08d0a0d8 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreFunctionDao.java @@ -1,9 +1,8 @@ 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") diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java index bf0976e37b0415a83fb62f1fe2727d2a3bf99316..4553d0d9c059d649fefe2d2b3cff1a704c35274c 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreMenuDao.java @@ -1,7 +1,6 @@ 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 { - void queryByCondtion(PageRequest query); - @Update - void clearMenuFunction(List functionIds); + void queryByCondtion(PageRequest query); + + @Update + void clearMenuFunction(List functionIds); - List allMenuWithURL(); + List allMenuWithURL(); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java index 56e4b9774454d17d7367c56acf6e4da62a60c224..f677575b27954ccadc3d567d5645ca5f231075e6 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreOrgDao.java @@ -1,25 +1,22 @@ 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 { List queryOrgByUser(Long userId); - + List queryAllOrgCode(List orgIds); - + @Sql("select * from core_org where parent_org_id is null") CoreOrg getRoot(); - + } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java index 3f603a3833e16059eade4bf8a0283a8819996501..1fa0be0c6950cebe6ee2b7d64c8822cf98e1b3ba 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleDao.java @@ -1,12 +1,9 @@ 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 { diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java index fe5f58c9ce588dfad2f376f03164293fcd6d5f64..0cb1f59ea73aa3acafc75e28aed90b1d8dbfa7f0 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleFunctionDao.java @@ -11,11 +11,11 @@ import java.util.List; public interface CoreRoleFunctionDao extends BaseMapper { - List getRoleFunction( Long userId, Long orgId, - String code); + List getRoleFunction(Long userId, Long orgId, + String code); - List getRoleChildrenFunction(Long userId, Long orgId, - Long parentId); + List getRoleChildrenFunction(Long userId, Long orgId, + Long parentId); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java index f71e6bf6766302e00bddb074e49968ed59181ff1..17a736707b3b4bf8c426272b1026416637d86622 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreRoleMenuDao.java @@ -13,16 +13,18 @@ public interface CoreRoleMenuDao extends BaseMapper { /** * 根据用户ID，机构ID查询菜单 + * * @param userId 用户id * @param orgId 机构id * @return */ - List queryMenuByUser( Long userId, Long orgId); + List queryMenuByUser(Long userId, Long orgId); /** * 根据菜单id删除角色和菜单关系 + * * @param ids */ - @Update + @Update void deleteRoleMenu(List ids); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 73622345fe6dec6aacd1b27b970d1374a95fd64e..ad8b33f78518a58b9ba38ac737f48b96554ebbae 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -1,7 +1,6 @@ package com.ibeetl.admin.core.dao; - import com.ibeetl.admin.core.entity.CoreUser; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; @@ -13,10 +12,11 @@ public interface CoreUserDao extends BaseMapper { /** * 根据角色编码查询用户集合 + * * @param roleCode 角色编码 * @return */ - List getUserByRole( String roleCode); + List getUserByRole(String roleCode); } diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java index 79333ef830e92b501329d0f277c9ca51cc7d8f4a..a9cf0a7fb65909db09ca78a78041686366a7c782 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserRoleDao.java @@ -1,7 +1,6 @@ package com.ibeetl.admin.core.dao; - import com.ibeetl.admin.core.entity.CoreUserRole; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.SqlResource; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java index f437d77b322aa36f00b6a56801baf6c136d15d2e..c05e2d6880fbf3b8f1c7f8a54254304545eb6d9f 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreWorkflowDao.java @@ -9,6 +9,7 @@ import java.util.List; /** * 业务侧工作流的基本功能，工作流的一些功能将在业务侧完成，比如选人操作 + * * @author lijiazhi */ @SqlResource("core.workflow") @@ -16,6 +17,7 @@ public interface CoreWorkflowDao extends BaseMapper { /** * 根据角色id，机构id查询用户集合 + * * @param roleId 角色id * @param orgs 机构id * @return diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java index 9cd483b8de1f559b74bbdf646518873cd972b86c..9adad4cf93e7eeaedca6cabf1b86ec9613e7ee62 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreAudit.java @@ -14,7 +14,7 @@ import org.beetl.sql.annotation.entity.SeqID; public class CoreAudit extends BaseEntity { - @SeqID(name = "ORACLE_AUDIT_SEQ_NAME") + //@SeqID(name = "ORACLE_AUDIT_SEQ_NAME") @AutoID @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java index c9df90959845c10499ba01032da0726aa5b61666..fabc5b2653144c6a858888b7f62cecc47bcde587 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreDict.java @@ -19,7 +19,7 @@ import org.beetl.sql.annotation.entity.SeqID; public class CoreDict extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java index 00e9200c23ab9830eebe6e6bb6233f1f1f5aa264..8f899ac18b29577b765760fb29a7f82947c77c71 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFile.java @@ -13,7 +13,7 @@ import org.beetl.sql.annotation.entity.SeqID; */ public class CoreFile extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_FILE_SEQ_NAME) + //@SeqID(name = ORACLE_FILE_SEQ_NAME) @AutoID private Long id; // 文件名称 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java index d810aa5aba1d5f4a64c5c09f317745b29ea5bfcd..39833a71f1548f0423b65c81852074432eac9cc5 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreFunction.java @@ -17,7 +17,7 @@ import org.beetl.sql.annotation.entity.UpdateIgnore; public class CoreFunction extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java index 374cdb2a344cf0da8ae90f7b7c04a60d103863b7..7623c69e64b8c694e3a44e4ab2e66482758fcb88 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreMenu.java @@ -24,7 +24,7 @@ public class CoreMenu extends BaseEntity { public static final String TYPE_MENUITEM = "MENU_M"; @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java index 705d43b76d9ba28690fa4771068aa4fd3b70aa33..b9062edf4d103fc7dfdc7f694520f7fe9f19d8db 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreOrg.java @@ -27,7 +27,7 @@ public class CoreOrg extends BaseEntity { // 自增id @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID private Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java index 6c62761dc7ba96473b63fdb29d84f99476eff480..c4f558022207b1f7e7db5974d5a53d5ed95fa958 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRole.java @@ -19,7 +19,7 @@ import org.beetl.sql.annotation.entity.SeqID; public class CoreRole extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java index 7aff50f48167fcb799486874b5c442cfe3763d68..b33df172dc4b504cd69765d5529f5d2712dc9837 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleFunction.java @@ -17,7 +17,7 @@ import org.beetl.sql.annotation.entity.SeqID; */ public class CoreRoleFunction extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; // 删除标识 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java index f5aeae622945c5a5ba84b46d40605447bccbb641..c22dde0176fd2cc066c7a203f6e5d4d999039cbc 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreRoleMenu.java @@ -15,7 +15,7 @@ import org.beetl.sql.annotation.entity.SeqID; */ public class CoreRoleMenu extends BaseEntity { @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java index 8abc5b951f1236ad43aa8fa4e4e72b71ee9b7665..8322f4147465f3626b2e9f9371e28e0e2333d889 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java @@ -25,7 +25,7 @@ public class CoreUser extends BaseEntity { @NotNull(message = "ID不能为空", groups =ValidateConfig. UPDATE.class) - @SeqID(name = ORACLE_CORE_SEQ_NAME) + //@SeqID(name = ORACLE_CORE_SEQ_NAME) @AutoID protected Long id; // 删除标识 diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java index 85ed9d4283c6cea7f8be1404ad10448aae7c5849..c2d7ac04f867f88aab13030997a2924f75a3a3e8 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUserRole.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; public class CoreUserRole extends BaseEntity { - @SeqID(name = "ORACLE_CORE_SEQ_NAME") + //@SeqID(name = "ORACLE_CORE_SEQ_NAME") @AutoID private Long id; // 授权机构id diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java index 511b101b3d5237b69badaee829f1c39b4059d308..7125a53ad61da0ba883cdffa02a9d5750fdac57a 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreCodeGenService.java @@ -19,6 +19,7 @@ import org.beetl.sql.core.SQLManager; import org.beetl.sql.core.meta.MetadataManager; import org.beetl.sql.core.meta.SchemaMetadataManager; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.ibeetl.admin.core.entity.CoreFunction; @@ -34,6 +35,7 @@ import com.ibeetl.admin.core.gen.model.Entity; @Service public class CoreCodeGenService { @Autowired + @Qualifier("coreSqlManager") SQLManager sqlManager; @Autowired CorePlatformService platformService; diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index e79689ad2b315e2870d2526e1984cfb33ef1063a..4ed490c41420ca1da42cab665a27637a12e8b4c0 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -10,6 +10,7 @@ import org.beetl.sql.core.SQLManager; import org.beetl.sql.core.engine.SQLPlaceholderST; import org.beetl.sql.core.engine.template.BeetlTemplateEngine; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -97,6 +98,7 @@ public class CorePlatformService { CoreFunctionDao sysFunctionDao; @Autowired + @Qualifier("coreSqlManager") SQLManager sqlManager; @Autowired diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 052e4e2f217f0cf508b3981a9d7b56e1b277380a..42ca84f14bffa548e6527e3a4d29383b08ed80b1 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -4,6 +4,7 @@ import java.util.List; import org.beetl.sql.core.SQLManager; 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; @@ -30,7 +31,9 @@ public class CoreUserService { @Autowired PasswordEncryptService passwordEncryptService; - @Autowired SQLManager sqlManager; + @Autowired + @Qualifier("coreSqlManager") + SQLManager sqlManager; public UserLoginInfo login(String userName,String password){ CoreUser query = new CoreUser(); diff --git a/admin-core/src/main/resources/codeTemplate/java/controller.java b/admin-core/src/main/resources/codeTemplate/java/controller.java index acfebb60bd75fa02daa2eec29195bb18111be4d4..3d8e663677f58c9df95be819b4e036b141bc28b2 100644 --- a/admin-core/src/main/resources/codeTemplate/java/controller.java +++ b/admin-core/src/main/resources/codeTemplate/java/controller.java @@ -96,12 +96,17 @@ public class ${entity.name}Controller{ \@PostMapping(MODEL + "/list.json") \@Function("${basicfunctionCode}.query") \@ResponseBody - public JsonResult list(${entity.name}Query condtion) + public JsonResult> list(${entity.name}Query condition) + { + PageResult<${entity.name}> pageResult = ${service}.queryByCondition(condition); + return JsonResult.success(pageResult); + } +/* public JsonResult list(${entity.name}Query condtion) { PageQuery page = condtion.getPageQuery(); ${service}.queryByCondition(page); return JsonResult.success(page); - } + }*/ \@PostMapping(MODEL + "/add.json") \@Function("${basicfunctionCode}.add") @@ -151,20 +156,26 @@ public class ${entity.name}Controller{ \@PostMapping(MODEL + "/excel/export.json") \@Function("${basicfunctionCode}.export") \@ResponseBody - public JsonResult export(HttpServletResponse response,${entity.name}Query condtion) { + public JsonResult export(HttpServletResponse response,${entity.name}Query condition) { /** * 1)需要用你自己编写一个的excel模板 * 2)通常excel导出需要关联更多数据，因此${service}.queryByCondition方法经常不符合需求，需要重写一个为模板导出的查询 * 3)参考ConsoleDictController来实现模板导入导出 */ String excelTemplate ="excelTemplates/${target.urlBase}/${entity.code}/你的excel模板文件名字.xls"; - PageQuery<${entity.name}> page = condtion.getPageQuery(); +// PageQuery<${entity.name}> page = condtion.getPageQuery(); + //PageRequest<${entity.name}> page=condition.getPageRequest(); + condition.setPage(1); + condition.setLimit(Integer.MAX_VALUE); //取出全部符合条件的 - page.setPageSize(Integer.MAX_VALUE); - page.setPageNumber(1); - page.setTotalRow(Integer.MAX_VALUE); +// page.setPageSize(Integer.MAX_VALUE); +// page.setPageNumber(1); +// page.setTotalRow(Integer.MAX_VALUE); + //本次导出需要的数据 + PageResult<${entity.name}> pageResult = ${service}.queryByCondition(condition); //本次导出需要的数据 - List<${entity.name}> list =${service}.queryByCondition(page).getList(); + List<${entity.name}> list =pageResult.getList(); +// List<${entity.name}> list =${service}.queryByCondition(page).getList(); try(InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(excelTemplate)) { if(is==null) { throw new PlatformException("模板资源不存在："+excelTemplate); diff --git a/admin-core/src/main/resources/codeTemplate/java/dao.java b/admin-core/src/main/resources/codeTemplate/java/dao.java index 192407afbe38b6a94ebfe0d11eba7dc732d748c1..0cf83fb69bb48f92c2aa5f6ed5bc7e12439e87a3 100644 --- a/admin-core/src/main/resources/codeTemplate/java/dao.java +++ b/admin-core/src/main/resources/codeTemplate/java/dao.java @@ -1,6 +1,7 @@ package ${package}; import java.util.List; +import java.util.Map; import com.ibeetl.admin.core.entity.CoreUser; import org.beetl.sql.mapper.BaseMapper; @@ -9,6 +10,7 @@ import org.beetl.sql.core.page.PageRequest; import org.beetl.sql.core.page.PageResult; import org.beetl.sql.mapper.BaseMapper; import org.beetl.sql.mapper.annotation.Root; +import org.springframework.stereotype.Component; import ${basePackage}.entity.*; @@ -16,6 +18,7 @@ import ${basePackage}.entity.*; * ${entity.displayName} Dao */ \@SqlResource("${entity.system}.${entity.code}") +\@Component public interface ${entity.name}Dao extends BaseMapper<${entity.name}>{ public PageResult<${entity.name}> queryByCondition(PageRequest request,\@Root Map params); public void batchDel${entity.name}ByIds( List ids); diff --git a/admin-core/src/main/resources/codeTemplate/java/pojo.java b/admin-core/src/main/resources/codeTemplate/java/pojo.java index 5eb55df8b9e5ea4c4541fe487d9dc20f3655884a..da42a21a40495b2d8e108e9f7ae7ab7330b4ca8b 100644 --- a/admin-core/src/main/resources/codeTemplate/java/pojo.java +++ b/admin-core/src/main/resources/codeTemplate/java/pojo.java @@ -6,8 +6,13 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Null; -import org.beetl.sql.core.annotatoin.AutoID; -import org.beetl.sql.core.annotatoin.SeqID; + +import com.ibeetl.admin.core.entity.BaseEntity; +import com.ibeetl.admin.core.util.ValidateConfig; +import org.beetl.sql.annotation.entity.AutoID; +import org.beetl.sql.annotation.entity.SeqID; +import org.beetl.sql.annotation.entity.InsertIgnore; +import org.beetl.sql.annotation.entity.UpdateIgnore; import com.ibeetl.admin.core.util.ValidateConfig; @@ -17,9 +22,7 @@ import java.math.*; import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.core.annotatoin.InsertIgnore; -import org.beetl.sql.core.annotatoin.Version; -import org.beetl.sql.core.annotatoin.LogicDelete; + /* @@ -34,7 +37,7 @@ public class ${className} extends BaseEntity{ @} @if(attr.isId) { \@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) - \@SeqID(name = ORACLE_CORE_SEQ_NAME) +//\@SeqID(name = ORACLE_CORE_SEQ_NAME) \@AutoID @} @if(isNotEmpty(attr.dictType)) { diff --git a/admin-core/src/main/resources/codeTemplate/java/query.java b/admin-core/src/main/resources/codeTemplate/java/query.java index 71504d2262b45c963146e0f610d5910b44f43277..51a77c73f9e0876c3a850b5e0d687206fa10ca13 100644 --- a/admin-core/src/main/resources/codeTemplate/java/query.java +++ b/admin-core/src/main/resources/codeTemplate/java/query.java @@ -17,12 +17,16 @@ public class ${entity.name}Query extends PageParam { @} else if(attr.dateRange) { \@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_DATE_BETWEEN) private String ${attr.name}; + \@Query(name = "${attr.displayName}", display = false) private Date ${strutil.replace (attr.name,"Range","")}Start; + \@Query(name = "${attr.displayName}", display = false) private Date ${strutil.replace (attr.name,"Range","")}End; @} else if(attr.dateTimeRange) { \@Query(name = "${attr.displayName}", display = true,type=Query.TYPE_DATETIME_BETWEEN) private String ${attr.name}; + \@Query(name = "${attr.displayName}", display = false) private Date ${strutil.replace (attr.name,"Range","")}Start; + \@Query(name = "${attr.displayName}", display = false) private Date ${strutil.replace (attr.name,"Range","")}End; @} else { \@Query(name = "${attr.displayName}", display = true) @@ -31,6 +35,7 @@ public class ${entity.name}Query extends PageParam { @} @for(attr in attrs) { @if(attr.dateRange) { + public String get${upperFirst(attr.name)}(){ return ${attr.name}; } diff --git a/admin-core/src/main/resources/codeTemplate/java/service.java b/admin-core/src/main/resources/codeTemplate/java/service.java index c813ee9d06656609455fd5a5e3c2e753a2414c44..c5674edd70189b72d53c191ae5f3fdc4a49b76d7 100644 --- a/admin-core/src/main/resources/codeTemplate/java/service.java +++ b/admin-core/src/main/resources/codeTemplate/java/service.java @@ -3,7 +3,7 @@ package ${package}; import ${basePackage}.dao.${entity.name}Dao; import ${basePackage}.entity.${entity.name}; - +import ${basePackage}.web.query.${entity.name}Query; import com.ibeetl.admin.core.service.CoreBaseService; @@ -13,7 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; - +import java.util.Map; +import org.beetl.sql.core.page.PageRequest; +import org.beetl.sql.core.page.PageResult; @@ -29,8 +31,16 @@ public class ${entity.name}Service extends CoreBaseService<${entity.name}>{ \@Autowired private ${entity.name}Dao ${entity.code}Dao; - public PageQuery<${entity.name}>queryByCondition(PageQuery query){ - PageQuery ret = ${entity.code}Dao.queryByCondition(query); +// public PageQuery<${entity.name}>queryByCondition(PageQuery query){ +// PageQuery ret = ${entity.code}Dao.queryByCondition(query); +// queryListAfter(ret.getList()); +// return ret; +// } + + public PageResult<${entity.name}> queryByCondition(${entity.name}Query condition) { + PageRequest pageRequest = condition.getPageRequest(); + Map params = condition.getPageParam(); + PageResult ret = ${entity.code}Dao.queryByCondition(pageRequest, params); queryListAfter(ret.getList()); return ret; } diff --git a/pom.xml b/pom.xml index 694895cc4dc078f9d421e4e841e198bd739f2f02..30f18635759995e2fd3dc0a2b5496d66881ad041 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,23 @@ true + + + org.apache.maven.plugins + maven-source-plugin + 3.0.0 + + + + + compile + + + jar-no-fork + + + +