73fb4671 by xiaojie

【数据资产】

1、增加企业认证创建会员类型
1 parent 83943d36
...@@ -121,14 +121,14 @@ public class TdsConnectorIdentityController { ...@@ -121,14 +121,14 @@ public class TdsConnectorIdentityController {
121 @GetMapping("/get-effective-connector") 121 @GetMapping("/get-effective-connector")
122 @SystemLog(value = "连接器身份信息-查询有效的连接器信息") 122 @SystemLog(value = "连接器身份信息-查询有效的连接器信息")
123 public CommonRes<TdsConnectorIdentityRSVO> getEffectiveConnector() { 123 public CommonRes<TdsConnectorIdentityRSVO> getEffectiveConnector() {
124 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.getEffectiveConnector(); 124 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.getEffectiveConnector(null);
125 return CommonRes.success(vo); 125 return CommonRes.success(vo);
126 } 126 }
127 127
128 @GetMapping("/get-connector-identity") 128 @GetMapping("/get-connector-identity")
129 @SystemLog(value = "连接器身份信息-查询有效的连接器信息") 129 @SystemLog(value = "连接器身份信息-查询有效的连接器信息")
130 public CommonRes<String> getConnector() { 130 public CommonRes<String> getConnector(@RequestParam String tenantGuid) {
131 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.getEffectiveConnector(); 131 TdsConnectorIdentityRSVO vo = tdsConnectorIdentityService.getEffectiveConnector(tenantGuid);
132 if(ObjectUtils.isEmpty(vo)){ 132 if(ObjectUtils.isEmpty(vo)){
133 return CommonRes.success(""); 133 return CommonRes.success("");
134 } 134 }
......
...@@ -85,7 +85,7 @@ public interface TdsConnectorIdentityService { ...@@ -85,7 +85,7 @@ public interface TdsConnectorIdentityService {
85 * 查询有效的连接器信息 85 * 查询有效的连接器信息
86 * @return 86 * @return
87 */ 87 */
88 TdsConnectorIdentityRSVO getEffectiveConnector(); 88 TdsConnectorIdentityRSVO getEffectiveConnector(String tenantGuid);
89 89
90 /** 90 /**
91 * 查询连接器信息 91 * 查询连接器信息
......
...@@ -21,7 +21,6 @@ import com.csbr.qingcloud.portal.domain.vo.*; ...@@ -21,7 +21,6 @@ import com.csbr.qingcloud.portal.domain.vo.*;
21 import com.csbr.qingcloud.portal.service.DataPortService; 21 import com.csbr.qingcloud.portal.service.DataPortService;
22 import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService; 22 import com.csbr.qingcloud.portal.service.TdsConnectorAdditionalService;
23 import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService; 23 import com.csbr.qingcloud.portal.service.TdsConnectorVerifiableService;
24 import com.csbr.qingcloud.portal.util.IdentificationCodeUtil;
25 import csbr.cloud.entity.domain.base.vo.PageListVO; 24 import csbr.cloud.entity.domain.base.vo.PageListVO;
26 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity; 25 import com.csbr.qingcloud.portal.mybatis.entity.MfTdsConnectorIdentity;
27 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService; 26 import com.csbr.qingcloud.portal.mybatis.service.MfTdsConnectorIdentityService;
...@@ -359,10 +358,14 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements ...@@ -359,10 +358,14 @@ public class TdsConnectorIdentityServiceImpl extends FlowAbstractImpl implements
359 } 358 }
360 359
361 @Override 360 @Override
362 public TdsConnectorIdentityRSVO getEffectiveConnector() { 361 public TdsConnectorIdentityRSVO getEffectiveConnector(String tenantGuid) {
363 LambdaQueryWrapper<MfTdsConnectorIdentity> queryWrapper = Wrappers.lambdaQuery(); 362 LambdaQueryWrapper<MfTdsConnectorIdentity> queryWrapper = Wrappers.lambdaQuery();
364 queryWrapper.eq(MfTdsConnectorIdentity::getIsChangeData,"N"); 363 queryWrapper.eq(MfTdsConnectorIdentity::getIsChangeData,"N");
365 queryWrapper.eq(MfTdsConnectorIdentity::getBizApproveState,ApprovalStateEnum.PASSED.getValue()); 364 queryWrapper.eq(MfTdsConnectorIdentity::getBizApproveState,ApprovalStateEnum.PASSED.getValue());
365 if (StringUtils.isNotEmpty(tenantGuid)) {
366 mfTdsConnectorIdentityService.csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
367 queryWrapper.eq(MfTdsConnectorIdentity::getTenantGuid, tenantGuid);
368 }
366 List<MfTdsConnectorIdentity> list = mfTdsConnectorIdentityService.list(queryWrapper); 369 List<MfTdsConnectorIdentity> list = mfTdsConnectorIdentityService.list(queryWrapper);
367 if(ObjectUtils.isNotEmpty(list)){ 370 if(ObjectUtils.isNotEmpty(list)){
368 return convertToVO(list.get(0)); 371 return convertToVO(list.get(0));
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!