diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java index 57b259e24..41d43c43e 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/EpdFeignClient.java @@ -6,6 +6,7 @@ import com.njcn.system.api.fallback.EpdFeignClientFallbackFactory; import com.njcn.system.pojo.param.EleEpdPqdParam; import com.njcn.system.pojo.po.EleEpdPqd; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -30,4 +31,7 @@ public interface EpdFeignClient { @PostMapping("/addEvt") HttpResult> addEvt(@RequestBody List eleEpdPqdParam); + @PostMapping("/selectById") + HttpResult selectById(@RequestParam("id") String id); + } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java index de43e51a4..80df5d04f 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/EpdFeignClientFallbackFactory.java @@ -51,6 +51,12 @@ public class EpdFeignClientFallbackFactory implements FallbackFactory selectById(String id) { + log.error("{}异常,降级处理,异常为:{}","根据id查询字典数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java index 43b74a1a2..6edc165f6 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/EleEpdPqd.java @@ -1,7 +1,6 @@ package com.njcn.system.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import lombok.Data; /** diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java index f34e97567..2b182d117 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java @@ -127,5 +127,17 @@ public class EleEpdPqdController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, map, methodDescribe); } + @PostMapping("/selectById") + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @ApiOperation("根据id查询字典数据") + @ApiImplicitParam(name = "id", value = "字典id", required = true) + public HttpResult selectById(@RequestParam("id") @Validated String id){ + log.info("根据id查询字典数据"); + String methodDescribe = getMethodDescribe("selectById"); + LogUtil.njcnDebug(log, "{},根据id查询字典数据:", methodDescribe); + EleEpdPqd eleEpdPqd = eleEpdPqdService.selectById(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEpdPqd, methodDescribe); + } + } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java index 8ae7e8dfd..ee512b7bf 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IEleEpdPqdService.java @@ -60,4 +60,10 @@ public interface IEleEpdPqdService { * @param eleEpdPqdParam */ Map saveEvt(List eleEpdPqdParam); + + /** + * 存储事件的字典数据 + * @param id + */ + EleEpdPqd selectById(String id); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java index 0545dcccf..fcb73dc72 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EleEpdPqdServiceImpl.java @@ -127,6 +127,11 @@ public class EleEpdPqdServiceImpl extends ServiceImpl