Skip to content

Y
yd-user
Commit 645c8e9c by zhangxingmin
Options

push

parent dd960590
Showing with 158 additions and 2 deletions
yd-user-api/src/main/java/com/yd/user/api/controller/ApiRelTenantProjectController.java
......@@ -7,13 +7,17 @@ import com.yd.user.feign.client.reltenantproject.ApiRelTenantProjectFeignClient;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 租户-项目关系信息（租户管理-项目配置）
*
......@@ -67,4 +71,14 @@ public class ApiRelTenantProjectController implements ApiRelTenantProjectFeignCl
public Result<IPage<ApiRelTenantProjectSelectPageResponse>> selectProjectPage(ApiRelTenantProjectSelectPageRequest request) {
return apiRelTenantProjectService.selectProjectPage(request);
}
/**
* 根据条件查询租户和项目关系数据
* @param request
* @return
*/
@Override
public Result<List<QueryRelTenantProjectListResponse>> queryRelTenantProjectList(QueryRelTenantProjectListRequest request) {
return apiRelTenantProjectService.queryRelTenantProjectList(request);
}
}
yd-user-api/src/main/java/com/yd/user/api/service/ApiRelTenantProjectService.java
......@@ -5,8 +5,10 @@ import com.yd.common.result.Result;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import java.util.List;
......@@ -28,4 +30,5 @@ public interface ApiRelTenantProjectService {
Result delRelByTenantBizId(String tenantBizId);
Result<List<QueryRelTenantProjectListResponse>> queryRelTenantProjectList(QueryRelTenantProjectListRequest request);
}
yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiRelTenantProjectServiceImpl.java
......@@ -9,8 +9,10 @@ import com.yd.user.api.service.ApiRelTenantProjectService;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import com.yd.user.service.model.RelTenantProject;
import com.yd.user.service.service.IRelTenantProjectService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -139,5 +141,17 @@ public class ApiRelTenantProjectServiceImpl implements ApiRelTenantProjectServic
return Result.success();
}
/**
* 根据条件查询租户和项目关系数据
* @param request
* @return
*/
@Override
public Result<List<QueryRelTenantProjectListResponse>> queryRelTenantProjectList(QueryRelTenantProjectListRequest request) {
if (CollectionUtils.isEmpty(request.getProjectBizIdList())) {
return Result.success();
}
List<QueryRelTenantProjectListResponse> list = iRelTenantProjectService.queryRelTenantProjectList(request);
return Result.success(list);
}
}
yd-user-feign/src/main/java/com/yd/user/feign/client/reltenantproject/ApiRelTenantProjectFeignClient.java
......@@ -5,6 +5,8 @@ import com.yd.user.feign.fallback.reltenantproject.ApiRelTenantProjectFeignFallb
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
......@@ -12,11 +14,12 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 用户服务：租户-项目关系信息Feign客户端
*/
@FeignClient(name = "yd-user-api", fallbackFactory = ApiRelTenantProjectFeignFallbackFactory.class)
@FeignClient(name = "yd-user-api",path = "/user/api/relTenantProject",fallbackFactory = ApiRelTenantProjectFeignFallbackFactory.class)
public interface ApiRelTenantProjectFeignClient {
/**
......@@ -51,4 +54,12 @@ public interface ApiRelTenantProjectFeignClient {
*/
@PostMapping("/select/project/page")
Result selectProjectPage(@RequestBody ApiRelTenantProjectSelectPageRequest request);
/**
* 根据条件查询租户和项目关系数据
* @param request
* @return
*/
@PostMapping("/queryRelTenantProjectList")
Result<List<QueryRelTenantProjectListResponse>> queryRelTenantProjectList(@Validated @RequestBody QueryRelTenantProjectListRequest request);
}
yd-user-feign/src/main/java/com/yd/user/feign/fallback/reltenantproject/ApiRelTenantProjectFeignFallbackFactory.java
......@@ -5,10 +5,14 @@ import com.yd.user.feign.client.reltenantproject.ApiRelTenantProjectFeignClient;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListAddRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* 用户服务：租户-项目关系信息Feign降级处理
*/
......@@ -37,6 +41,11 @@ public class ApiRelTenantProjectFeignFallbackFactory implements FallbackFactory<
public Result selectProjectPage(ApiRelTenantProjectSelectPageRequest request) {
return null;
}
@Override
public Result<List<QueryRelTenantProjectListResponse>> queryRelTenantProjectList(QueryRelTenantProjectListRequest request) {
return null;
}
};
}
}
yd-user-feign/src/main/java/com/yd/user/feign/request/reltenantproject/QueryRelTenantProjectListRequest.java 0 → 100644
package com.yd.user.feign.request.reltenantproject;
import lombok.Data;
import java.util.List;
@Data
public class QueryRelTenantProjectListRequest {
/**
* 项目业务ID列表
*/
private List<String> projectBizIdList;
}
yd-user-feign/src/main/java/com/yd/user/feign/response/reltenantproject/QueryRelTenantProjectListResponse.java 0 → 100644
package com.yd.user.feign.response.reltenantproject;
import lombok.Data;
@Data
public class QueryRelTenantProjectListResponse {
//========租户信息start=========
/**
* 租户唯一标识(业务ID)
*/
private String tenantBizId;
/**
* 租户名称
*/
private String tenantName;
/**
* 租户编码(用于API标识)
*/
private String tenantCode;
//========租户信息end=========
//========租户项目关系信息start=========
private Long tenantProjectId;
//========租户项目关系信息end=========
//========项目信息start=========
/**
* 项目类型（PC、客户端）
*/
private String projectType;
/**
* 项目唯一标识(业务ID)
*/
private String projectBizId;
/**
* 项目名称
*/
private String projectName;
/**
* 项目编码(租户内唯一)
*/
private String projectCode;
//========项目信息end=========
}
yd-user-service/src/main/java/com/yd/user/service/dao/RelTenantProjectMapper.java
......@@ -4,13 +4,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.request.sysuser.ApiSysUserPageRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import com.yd.user.feign.response.sysuser.ApiSysUserPageResponse;
import com.yd.user.service.model.RelTenantProject;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 租户-项目关系表（正常来说一对多，加关系表方便扩展） Mapper 接口
......@@ -31,4 +35,6 @@ public interface RelTenantProjectMapper extends BaseMapper<RelTenantProject> {
*/
IPage<ApiRelTenantProjectSelectPageResponse> selectProjectPage(@Param("page") IPage<ApiRelTenantProjectSelectPageResponse> page, @Param("request") ApiRelTenantProjectSelectPageRequest request);
List<QueryRelTenantProjectListResponse> queryRelTenantProjectList(@Param("request") QueryRelTenantProjectListRequest request);
}
yd-user-service/src/main/java/com/yd/user/service/service/IRelTenantProjectService.java
......@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import com.yd.user.service.dto.RelTenantProjectDto;
import com.yd.user.service.dto.SysTenantDto;
import com.yd.user.service.model.RelTenantProject;
......@@ -42,4 +44,6 @@ public interface IRelTenantProjectService extends IService<RelTenantProject> {
void delRelByProjectBizIdNeTenantBizIdList(String projectBizId, List<String> tenantBizIdList);
void delRelByTenantBizId(String tenantBizId);
List<QueryRelTenantProjectListResponse> queryRelTenantProjectList(QueryRelTenantProjectListRequest request);
}
yd-user-service/src/main/java/com/yd/user/service/service/impl/RelTenantProjectServiceImpl.java
......@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectListPageRequest;
import com.yd.user.feign.request.reltenantproject.ApiRelTenantProjectSelectPageRequest;
import com.yd.user.feign.request.reltenantproject.QueryRelTenantProjectListRequest;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectListPageResponse;
import com.yd.user.feign.response.reltenantproject.ApiRelTenantProjectSelectPageResponse;
import com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse;
import com.yd.user.service.dto.RelTenantProjectDto;
import com.yd.user.service.model.RelTenantProject;
import com.yd.user.service.dao.RelTenantProjectMapper;
......@@ -127,4 +129,14 @@ public class RelTenantProjectServiceImpl extends ServiceImpl<RelTenantProjectMap
public void delRelByTenantBizId(String tenantBizId) {
this.remove(new LambdaQueryWrapper<RelTenantProject>().eq(RelTenantProject::getTenantBizId,tenantBizId));
}
/**
* 根据条件查询租户和项目关系数据
* @param request
* @return
*/
@Override
public List<QueryRelTenantProjectListResponse> queryRelTenantProjectList(QueryRelTenantProjectListRequest request) {
return baseMapper.queryRelTenantProjectList(request);
}
}
yd-user-service/src/main/resources/mappers/RelTenantProjectMapper.xml
......@@ -42,4 +42,21 @@
</select>
<select id="queryRelTenantProjectList"
resultType="com.yd.user.feign.response.reltenantproject.QueryRelTenantProjectListResponse">
select st.*,sp.*,rtp.id as tenantProjectId
from rel_tenant_project rtp
left join sys_tenant st on st.tenant_biz_id = rtp.tenant_biz_id and st.is_deleted = 0
left join sys_project sp on sp.project_biz_id = rtp.project_biz_id and sp.is_deleted = 0
<where>
<if test="request.projectBizIdList != null and request.projectBizIdList.size > 0">
and rtp.project_biz_id in
<foreach collection="request.projectBizIdList" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and rtp.is_deleted = 0
</where>
</select>
</mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment