BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 62dc600c518a5c08051fc1025e827e5665e99f87

Authored by YunaiV
1 parent 26a094a7

reactor：完善多租户的配置类

Inline Side-by-side
Showing 3 changed files with 19 additions and 24 deletions
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/TenantProperties.java
  View file @62dc600
... ... @@ -3,6 +3,7 @@ package cn.iocoder.yudao.framework.tenant.config;
3 3 import lombok.Data;
4 4 import org.springframework.boot.context.properties.ConfigurationProperties;
5 5  
  6 +import java.util.Collections;
6 7 import java.util.Set;
7 8  
8 9 /**
... ... @@ -29,13 +30,13 @@ public class TenantProperties {
29 30 *
30 31 * 默认情况下，每个请求需要带上 tenant-id 的请求头。但是，部分请求是无需带上的，例如说短信回调、支付回调等 Open API！
31 32 */
32   - private Set<String> ignoreUrls;
  33 + private Set<String> ignoreUrls = Collections.emptySet();
33 34  
34 35 /**
35 36 * 需要忽略多租户的表
36 37 *
37 38 * 即默认所有表都开启多租户的功能，所以记得添加对应的 tenant_id 字段哟
38 39 */
39   - private Set<String> ignoreTables;
  40 + private Set<String> ignoreTables = Collections.emptySet();
40 41  
41 42 }
... ...
yudao-module-bpm/yudao-module-bpm-biz/pom.xml
  View file @62dc600
... ... @@ -26,11 +26,6 @@
26 26 <artifactId>yudao-module-system-api</artifactId>
27 27 <version>${revision}</version>
28 28 </dependency>
29   - <dependency>
30   - <groupId>cn.iocoder.boot</groupId>
31   - <artifactId>yudao-module-system-biz</artifactId>
32   - <version>${revision}</version>
33   - </dependency>
34 29  
35 30 <!-- 业务组件 -->
36 31 <dependency>
... ...
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
  View file @62dc600
1 1 package cn.iocoder.yudao.module.bpm.dal.mysql.task;
2 2  
3   -import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
4   -import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
5 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7   -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
8   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
  7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
9 8 import org.apache.ibatis.annotations.Mapper;
10 9  
11 10 @Mapper
12 11 public interface BpmProcessInstanceExtMapper extends BaseMapperX<BpmProcessInstanceExtDO> {
13 12  
14 13 default PageResult<BpmProcessInstanceExtDO> selectPage(Long userId, BpmProcessInstanceMyPageReqVO reqVO) {
15   - return selectPage(reqVO, new QueryWrapperX<BpmProcessInstanceExtDO>()
16   - .eqIfPresent("start_user_id", userId)
17   - .likeIfPresent("name", reqVO.getName())
18   - .eqIfPresent("process_definition_id", reqVO.getProcessDefinitionId())
19   - .eqIfPresent("category", reqVO.getCategory())
20   - .eqIfPresent("status", reqVO.getStatus())
21   - .eqIfPresent("result", reqVO.getResult())
22   - .betweenIfPresent("create_time", reqVO.getCreateTime())
23   - .orderByDesc("id"));
  14 + return selectPage(reqVO, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
  15 + .eqIfPresent(BpmProcessInstanceExtDO::getStartUserId, userId)
  16 + .likeIfPresent(BpmProcessInstanceExtDO::getName, reqVO.getName())
  17 + .eqIfPresent(BpmProcessInstanceExtDO::getProcessDefinitionId, reqVO.getProcessDefinitionId())
  18 + .eqIfPresent(BpmProcessInstanceExtDO::getCategory, reqVO.getCategory())
  19 + .eqIfPresent(BpmProcessInstanceExtDO::getStatus, reqVO.getStatus())
  20 + .eqIfPresent(BpmProcessInstanceExtDO::getResult, reqVO.getResult())
  21 + .betweenIfPresent(BpmProcessInstanceExtDO::getCreateTime, reqVO.getCreateTime())
  22 + .orderByDesc(BpmProcessInstanceExtDO::getId));
24 23 }
25 24  
26   - default BpmProcessInstanceExtDO selectByProcessInstanceId(String processDefinitionId) {
27   - return selectOne("process_instance_id", processDefinitionId);
  25 + default BpmProcessInstanceExtDO selectByProcessInstanceId(String processInstanceId) {
  26 + return selectOne(BpmProcessInstanceExtDO::getProcessInstanceId, processInstanceId);
28 27 }
29 28  
30 29 default void updateByProcessInstanceId(BpmProcessInstanceExtDO updateObj) {
31   - update(updateObj, new QueryWrapper<BpmProcessInstanceExtDO>()
32   - .eq("process_instance_id", updateObj.getProcessInstanceId()));
  30 + update(updateObj, new LambdaQueryWrapperX<BpmProcessInstanceExtDO>()
  31 + .eq(BpmProcessInstanceExtDO::getProcessInstanceId, updateObj.getProcessInstanceId()));
33 32 }
34 33  
35 34 }
... ...