From 44f7f24aef75804fca52feab7d5e24b4ca045ec0 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 15 May 2020 16:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91-=E3=80=90=E9=83=A8=E9=97=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E7=8E=8B?= =?UTF-8?q?=E7=AB=A5=EF=BC=89-2020/05/15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/modules/feign/AdminFeignClient.java | 12 ++++++++++++ .../feign/fallback/AdminFeignClientFallback.java | 5 +++++ .../modules/item/service/impl/ItemServiceImpl.java | 13 ++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java index baf418c97..ce29951be 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java @@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -90,4 +91,15 @@ public interface AdminFeignClient { */ @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}") Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId); + + + /** + * @describe: 获得部门类型 + * @author wangtong + * @date 2020/5/15 14:41 + * @param [deptId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptTypeKey(@RequestParam("deptId") Long deptId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java index 3d260100f..5d923aba6 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java @@ -54,4 +54,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysGridLeaderPhone", deptId); } + + @Override + public Result getDeptTypeKey(Long deptId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId); + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 1ded52b7d..ca85bd302 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -603,13 +603,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem @Transactional(rollbackFor = Exception.class) public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) { try { - Result deptMessage = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); - if( null == deptMessage.getData()){ - throw new RenException("未查到该部门相关信息"); - } - String typeKey = deptMessage.getData().getTypeKey(); - if(StringUtils.isBlank(typeKey)){ - throw new RenException("未查到该部门的键类型信息"); + Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId()); + String typeKey = ""; + if( 0 == deptMessage.getCode()){ + typeKey = deptMessage.getData().toString(); + }else{ + throw new RenException(deptMessage.getMsg()); } dto.setTypeKey(typeKey); ItemEntity entity = baseDao.selectById(dto.getId());