diff --git a/pom.xml b/pom.xml index cdde03f4..a1687bfc 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} - RuoYi-Cloud-Plus + hwbm-cloud https://gitee.com/dromara/RuoYi-Cloud-Plus - Dromara RuoYi-Cloud-Plus微服务系统 + 海威经营管理系统 2.5.0 @@ -56,6 +56,8 @@ 1.8.1 2.3.4 + + 1.5.4 3.14.0 diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml index 8b5f0b9e..eef7cf34 100644 --- a/ruoyi-api/pom.xml +++ b/ruoyi-api/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 89085a0d..f3cc76e7 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 29222e0b..6622dd2e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml index 77a88301..0eb54264 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml @@ -50,6 +50,12 @@ ${dynamic-ds.version} + + com.github.yulichang + mybatis-plus-join-boot-starter + ${mybatis-pj.version} + + com.mysql diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java index 7964a37a..8245e018 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java @@ -4,11 +4,11 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; import org.dromara.common.core.utils.MapstructUtils; @@ -30,7 +30,7 @@ import java.util.stream.Collectors; * @since 2021-05-13 */ @SuppressWarnings("unchecked") -public interface BaseMapperPlus extends BaseMapper { +public interface BaseMapperPlus extends MPJBaseMapper { Log log = LogFactory.getLog(BaseMapperPlus.class); diff --git a/ruoyi-example/pom.xml b/ruoyi-example/pom.xml index 1670137e..2585c0a5 100644 --- a/ruoyi-example/pom.xml +++ b/ruoyi-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index de58ac0b..208a8996 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index c9063627..0088af3d 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 @@ -14,6 +14,7 @@ ruoyi-job ruoyi-resource ruoyi-workflow + ruoyi-oa ruoyi-modules diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm index 870b4e1e..811692c3 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm @@ -113,4 +113,14 @@ public class ${ClassName}Controller extends BaseController { @PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) { return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true)); } + + /** + * 下拉框查询${functionName}列表 + */ + @GetMapping("/get${ClassName}List") + public R> get${ClassName}List(${ClassName}Bo bo) { + List<${ClassName}Vo> list = ${className}Service.queryList(bo); + return R.ok(list); + } + } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm index 205fb730..a1b1b987 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm @@ -50,7 +50,7 @@ public class ${ClassName} extends ${Entity} { @Version #end #if($column.isPk==1) - @TableId(value = "$column.columnName") + @TableId(value = "$column.columnName", type = IdType.AUTO) #end private $column.javaType $column.javaField; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm index 0922401e..8f5972c3 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm @@ -1,5 +1,10 @@ package ${packageName}.mapper; +import java.util.List; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -12,4 +17,21 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; */ public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> { + /** + * 查询${functionName}列表 + * + * @param page 分页 + * @param queryWrapper 条件 + * @return ${functionName}集合 + */ + public Page<${ClassName}Vo> selectCustom${ClassName}VoList(@Param("page") Page<${ClassName}Vo> page, @Param(Constants.WRAPPER) MPJLambdaWrapper<${ClassName}> queryWrapper); + + /** + * 查询${functionName}列表 + * + * @param queryWrapper 条件 + * @return ${functionName}集合 + */ + public List<${ClassName}Vo> selectCustom${ClassName}VoList(@Param(Constants.WRAPPER) MPJLambdaWrapper<${ClassName}> queryWrapper); + } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm index be6c3bf7..1d85add7 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm @@ -2,15 +2,15 @@ package ${packageName}.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; -#if($table.crud) -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -#end -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + #if($table.crud) + import org.dromara.common.mybatis.core.page.TableDataInfo; + import org.dromara.common.mybatis.core.page.PageQuery; + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + #end +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.domain.vo.${ClassName}Vo; @@ -28,7 +28,6 @@ import java.util.Collection; * @author ${author} * @date ${datetime} */ -@Slf4j @RequiredArgsConstructor @Service public class ${ClassName}ServiceImpl implements I${ClassName}Service { @@ -46,21 +45,21 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { return baseMapper.selectVoById(${pkColumn.javaField}); } -#if($table.crud) - /** - * 分页查询${functionName}列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return ${functionName}分页列表 - */ - @Override - public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { - LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); - Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } -#end + #if($table.crud) + /** + * 分页查询${functionName}列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return ${functionName}分页列表 + */ + @Override + public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { + MPJLambdaWrapper<${ClassName}> lqw = buildQueryWrapper(bo); + Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + #end /** * 查询符合条件的${functionName}列表 @@ -70,38 +69,39 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public List<${ClassName}Vo> queryList(${ClassName}Bo bo) { - LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); + MPJLambdaWrapper<${ClassName}> lqw = buildQueryWrapper(bo); return baseMapper.selectVoList(lqw); } - private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { + private MPJLambdaWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) { Map params = bo.getParams(); - LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery(); -#foreach($column in $columns) -#if($column.query) -#set($queryType=$column.queryType) -#set($javaField=$column.javaField) -#set($javaType=$column.javaType) -#set($columnName=$column.columnName) -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#set($mpMethod=$column.queryType.toLowerCase()) -#if($queryType != 'BETWEEN') -#if($javaType == 'String') -#set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') -#else -#set($condition='bo.get'+$AttrName+'() != null') -#end - lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()); -#else - lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null, - ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")); -#end -#end -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#if($column.isPk==1) - lqw.orderByAsc(${ClassName}::get$AttrName); -#end -#end + MPJLambdaWrapper<${ClassName}> lqw = JoinWrappers.lambda(${ClassName}.class) + .selectAll(${ClassName}.class) + #foreach($column in $columns) + #if($column.query) + #set($queryType=$column.queryType) + #set($javaField=$column.javaField) + #set($javaType=$column.javaType) + #set($columnName=$column.columnName) + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #set($mpMethod=$column.queryType.toLowerCase()) + #if($queryType != 'BETWEEN') + #if($javaType == 'String') + #set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())') + #else + #set($condition='bo.get'+$AttrName+'() != null') + #end + .$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName()) + #else + .between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null, + ${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName")) + #end + #end + #end + #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) + #if($column.isPk==1) + .orderByAsc(${ClassName}::get$AttrName); + #end return lqw; } @@ -116,7 +116,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; -#set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) + #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) if (flag) { bo.set$pk(add.get$pk()); } diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm index 3aa4a5f6..e09d8417 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm @@ -61,3 +61,16 @@ export const del${BusinessName} = (${pkColumn.javaField}: string | number | Arra method: 'delete' }); }; + +/** + * 下拉框查询${functionName}列表 + * @param query + * @returns {*} + */ +export function get${ClassName}List (query) { + return request({ + url: '/${moduleName}/${businessName}/get${ClassName}List', + method: 'get', + params: query + }); +}; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm index 42a827fe..9cbbdf3d 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm @@ -1,459 +1,472 @@ diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm index 35a56f55..4b8591c2 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm @@ -3,5 +3,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml index f5894c1e..523ad6d8 100644 --- a/ruoyi-visual/pom.xml +++ b/ruoyi-visual/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + hwbm-cloud ${revision} 4.0.0 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index 9cc5f0dd..a93e839b 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -40,9 +40,9 @@ spring.sql.init.platform=mysql db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true +db.url.0=jdbc:mysql://1.13.177.47:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=root +db.password.0=Haiwei123456 ### the maximum retry times for push nacos.config.push.maxRetryTime=50