huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 07:41:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

reactor：完善多租户的配置类

Browse Source
This commit is contained in:
YunaiV 2022-07-27 09:08:56 +08:00
parent 26a094a710
commit 62dc600c51
3 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.tenant.config;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.Collections;
import java.util.Set; import java.util.Set;
/** /**
@ -29,13 +30,13 @@ public class TenantProperties {
* *
* 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！ * 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！
*/ */
private Set<String> ignoreUrls; private Set<String> ignoreUrls = Collections.emptySet();
/** /**
* 需要忽略多租户的表 * 需要忽略多租户的表
* *
* 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟 * 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟
*/ */
private Set<String> ignoreTables; private Set<String> ignoreTables = Collections.emptySet();
} }

5
yudao-module-bpm/yudao-module-bpm-biz/pom.xml
View File

@ -26,11 +26,6 @@
<artifactId>yudao-module-system-api</artifactId> <artifactId>yudao-module-system-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>cn.iocoder.boot</groupId>
<artifactId>yudao-module-system-biz</artifactId>
<version>${revision}</version>
</dependency>
<!-- 业务组件 --> <!-- 业务组件 -->
<dependency> <dependency>

33
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
View File

@ -1,35 +1,34 @@
package cn.iocoder.yudao.module.bpm.dal.mysql.task; package cn.iocoder.yudao.module.bpm.dal.mysql.task;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@Mapper @Mapper
public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInstanceExtDO> { public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInstanceExtDO> {
default PageResult<BpmProcessInstanceExtDO> selectPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) { default PageResult<BpmProcessInstanceExtDO> selectPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) {
return selectPage(reqVO, new QueryWrapperX<BpmProcessInstanceExtDO>() return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
.eqIfPresent("start_user_id", userId) .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId)
.likeIfPresent("name", reqVO.getName()) .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName())
.eqIfPresent("process_definition_id", reqVO.getProcessDefinitionId()) .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId())
.eqIfPresent("category", reqVO.getCategory()) .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory())
.eqIfPresent("status", reqVO.getStatus()) .eqIfPresent(BpmProcessInstanceExtDO::getStatus, reqVO.getStatus())
.eqIfPresent("result", reqVO.getResult()) .eqIfPresent(BpmProcessInstanceExtDO::getResult, reqVO.getResult())
.betweenIfPresent("create_time", reqVO.getCreateTime()) .betweenIfPresent(BpmProcessInstanceExtDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc("id")); .orderByDesc(BpmProcessInstanceExtDO::getId));
} }
default BpmProcessInstanceExtDO selectByProcessInstanceId(String processDefinitionId) { default BpmProcessInstanceExtDO selectByProcessInstanceId(String processInstanceId) {
return selectOne("process_instance_id", processDefinitionId); return selectOne(BpmProcessInstanceExtDO::getProcessInstanceId, processInstanceId);
} }
default void updateByProcessInstanceId(BpmProcessInstanceExtDO updateObj) { default void updateByProcessInstanceId(BpmProcessInstanceExtDO updateObj) {
update(updateObj, new QueryWrapper<BpmProcessInstanceExtDO>() update(updateObj, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
.eq("process_instance_id", updateObj.getProcessInstanceId())); .eq(BpmProcessInstanceExtDO::getProcessInstanceId, updateObj.getProcessInstanceId()));
} }
} }