toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:listDept feign调用接口

Browse Source
This commit is contained in:
zhuxinru
2026-03-13 09:34:57 +08:00
parent bdfc64fc8a
commit 0c0ef092f6
7 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/main/java/com/sdm/system/model/req/dept/DeptQueryReq.java → common/src/main/java/com/sdm/common/entity/req/system/DeptQueryReq.java
View File

@@ -1,6 +1,6 @@
package com.sdm.system.model.req.dept;
package com.sdm.common.entity.req.system;
import com.sdm.system.model.req.BaseReq;
import com.sdm.common.entity.BaseReq;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

41
common/src/main/java/com/sdm/common/feign/impl/system/SysDeptFeignClientImpl.java Normal file
View File

@@ -0,0 +1,41 @@
package com.sdm.common.feign.impl.system;
import com.alibaba.fastjson2.JSONObject;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.DeptQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.SysDeptUserResp;
import com.sdm.common.feign.inter.system.ISysDeptFeignClient;
import com.sdm.common.feign.inter.system.ISysLogFeignClient;
import com.sdm.common.log.dto.SysLogDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Optional;
@Slf4j
@Component
public class SysDeptFeignClientImpl implements ISysDeptFeignClient {
@Autowired
private ISysDeptFeignClient sysDeptFeignClient;
@Override
public SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(DeptQueryReq req) {
SdmResponse response=null ;
try {
response = sysDeptFeignClient.listDept(req);
if(response==null || !response.isSuccess()){
log.error("listDept failed response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
return SdmResponse.failed("查询部门负责人失败");
}
} catch (Exception e) {
log.error("listDept error response:{}", JSONObject.toJSONString(Optional.ofNullable(response)));
return SdmResponse.failed("查询部门负责人失败");
}
return response;
}
}

20
common/src/main/java/com/sdm/common/feign/inter/system/ISysDeptFeignClient.java Normal file
View File

@@ -0,0 +1,20 @@
package com.sdm.common.feign.inter.system;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.DeptQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.SysDeptUserResp;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
@FeignClient(name = "system",contextId = "systemDeptClient")
public interface ISysDeptFeignClient {
@GetMapping("/dept/listDept")
SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(@SpringQueryMap DeptQueryReq req);
}

11
system/src/main/java/com/sdm/system/controller/SysDeptController.java
View File

@@ -1,16 +1,17 @@
package com.sdm.system.controller;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.system.DeptQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.system.model.entity.SysDeptUser;
import com.sdm.common.entity.resp.system.SysDeptUserResp;
import com.sdm.common.feign.inter.system.ISysDeptFeignClient;
import com.sdm.system.model.req.dept.DeptOperateReq;
import com.sdm.system.model.req.dept.DeptQueryReq;
import com.sdm.system.model.resp.SysDeptUserResp;
import com.sdm.system.service.ISysDeptUserService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springdoc.core.annotations.ParameterObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -18,7 +19,7 @@ import java.util.List;
@Tag(name = "部门管理", description = "部门相关接口")
@RestController
@RequestMapping("/dept")
public class SysDeptController {
public class SysDeptController implements ISysDeptFeignClient {
@Autowired
private ISysDeptUserService deptUserService;
@@ -43,7 +44,7 @@ public class SysDeptController {
@Operation(summary = "查询部门列表", description = "查询部门列表")
@GetMapping("/listDept")
public SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(@ParameterObject DeptQueryReq req) {
public SdmResponse<PageDataResp<List<SysDeptUserResp>>> listDept(@SpringQueryMap DeptQueryReq req) {
return deptUserService.listDept(req);
}

40
system/src/main/java/com/sdm/system/model/resp/SysDeptUserResp.java
View File

@@ -1,40 +0,0 @@
package com.sdm.system.model.resp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.sdm.common.entity.resp.system.CIDUserResp;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class SysDeptUserResp {
@Schema(description = "主键ID")
private Integer id;
@Schema(description = "部门ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long deptId;
@Schema(description = "部门名称")
private String deptName;
@Schema(description = "部门负责人用户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long userId;
private CIDUserResp userResp;
@Schema(description = "所属租户ID")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long tenantId;
@Schema(description = "创建人")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private Long creator;
@Schema(description = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
}

4
system/src/main/java/com/sdm/system/service/ISysDeptUserService.java
View File

@@ -3,10 +3,10 @@ package com.sdm.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.SysDeptUserResp;
import com.sdm.system.model.entity.SysDeptUser;
import com.sdm.system.model.req.dept.DeptOperateReq;
import com.sdm.system.model.req.dept.DeptQueryReq;
import com.sdm.system.model.resp.SysDeptUserResp;
import com.sdm.common.entity.req.system.DeptQueryReq;
import java.util.List;

4
system/src/main/java/com/sdm/system/service/impl/ISysDeptUserServiceImpl.java
View File

@@ -11,14 +11,14 @@ import com.sdm.common.common.ThreadLocalContext;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.entity.resp.system.SysDeptUserResp;
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
import com.sdm.common.utils.CidSysUserUtil;
import com.sdm.common.utils.PageUtils;
import com.sdm.system.dao.SysDeptUserMapper;
import com.sdm.system.model.entity.SysDeptUser;
import com.sdm.system.model.req.dept.DeptOperateReq;
import com.sdm.system.model.req.dept.DeptQueryReq;
import com.sdm.system.model.resp.SysDeptUserResp;
import com.sdm.common.entity.req.system.DeptQueryReq;
import com.sdm.system.service.ISysDeptUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;