From e59e92d2020ac5f2e8a771e3a05500b5e31e40da Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 13 Oct 2021 14:54:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiCustomController.java | 50 +++++++++++++++++++ .../esua/epdc/feign/CustomFeignClient.java | 42 ++++++++++++++++ .../fallback/CustomFeignClientFallback.java | 22 ++++++++ .../esua/epdc/service/CustomService.java | 38 ++++++++++++++ .../epdc/service/impl/CustomServiceImpl.java | 49 ++++++++++++++++-- 5 files changed, 198 insertions(+), 3 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java index f24fc1b..02af626 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiCustomController.java @@ -5,6 +5,8 @@ import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; @@ -166,4 +168,52 @@ public class ApiCustomController { public Result detailSuggestion(@PathVariable String id) { return customService.getDetailSuggestion(id); } + + /** + * @describe: 行程上报 + * @author wangtong + * @date 2021/10/13 10:50 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("saveTripInfo") + public Result saveTripInfo(@LoginUser TokenDto userDetail, @RequestBody SaveTripInfoFormDTO formDto) { + return customService.saveTripInfo(userDetail,formDto); + } + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getTripInfoList") + public Result getTripInfoList(@LoginUser TokenDto userDetail,GetTripInfoFormDTO formDto) { + return customService.getTripInfoList(userDetail,formDto); + } + + /** + * @describe: 上报详情 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getTripInfoDetail") + public Result getTripInfoDetail(GetTripInfoFormDTO formDto) { + return customService.getTripInfoDetail(formDto); + } + + /** + * @describe: 删除上报信息 + * @author wangtong + * @date 2021/10/13 14:17 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @DeleteMapping("deleteTripById") + public Result deleteTripById(@RequestBody GetTripInfoFormDTO formDto) { + return customService.deleteTripById(formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index a8a677a..e31713e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; @@ -186,4 +188,44 @@ public interface CustomFeignClient { **/ @GetMapping("custom/suggestionmake/detailSuggestion/{id}") Result getDetailSuggestion(@PathVariable("id") String id); + + /** + * @describe: 行程上报 + * @author wangtong + * @date 2021/10/13 10:50 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result saveTripInfo(SaveTripInfoFormDTO formDto); + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getTripInfoList(GetTripInfoFormDTO formDto); + + /** + * @describe: 上报详情 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getTripInfoDetail(GetTripInfoFormDTO formDto); + + /** + * @describe: 删除上报信息 + * @author wangtong + * @date 2021/10/13 14:17 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @DeleteMapping(value = "custom/tripreport/saveTripInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result deleteTripById(GetTripInfoFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index f0ec264..466745c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.EpidemicSentryPostDTO; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; @@ -102,4 +104,24 @@ public class CustomFeignClientFallback implements CustomFeignClient { public Result getDetailSuggestion(String id) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getDetailSuggestion", id); } + + @Override + public Result saveTripInfo(SaveTripInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "saveTripInfo", formDto); + } + + @Override + public Result getTripInfoList(GetTripInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getTripInfoList", formDto); + } + + @Override + public Result getTripInfoDetail(GetTripInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getTripInfoDetail", formDto); + } + + @Override + public Result deleteTripById(GetTripInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "deleteTripById", formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomService.java index 92b0241..10de194 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/CustomService.java @@ -3,6 +3,8 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.DeptOption; +import com.elink.esua.epdc.dto.GetTripInfoFormDTO; +import com.elink.esua.epdc.dto.SaveTripInfoFormDTO; import com.elink.esua.epdc.dto.TypeNode; import com.elink.esua.epdc.dto.epdc.form.EpdcAppPidemicCompleteInfoFromDTO; import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO; @@ -107,4 +109,40 @@ public interface CustomService { * @Date 09:37 2021-09-15 **/ Result getDetailSuggestion(String id); + + /** + * @describe: 行程上报 + * @author wangtong + * @date 2021/10/13 10:50 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto); + + /** + * @describe: 我的上报列表 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto); + + /** + * @describe: 上报详情 + * @author wangtong + * @date 2021/10/13 13:37 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getTripInfoDetail(GetTripInfoFormDTO formDto); + + /** + * @describe: 删除上报信息 + * @author wangtong + * @date 2021/10/13 14:17 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result deleteTripById(GetTripInfoFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index 7a0c318..9c91f42 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java @@ -1,10 +1,8 @@ package com.elink.esua.epdc.service.impl; -import com.alibaba.fastjson.JSON; -import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; -import com.elink.esua.epdc.commons.tools.redis.RedisChannels; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -241,4 +239,49 @@ public class CustomServiceImpl implements CustomService { public Result getDetailSuggestion(String id) { return customFeignClient.getDetailSuggestion(id); } + + @Override + public Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + //获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + formDto.setParentDeptIds(deptDTO.getParentDeptIds()); + formDto.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + formDto.setAllDeptIds(deptDTO.getAllDeptIds()); + formDto.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + formDto.setDeptName(deptDTO.getGrid()); + formDto.setDeptId(deptDTO.getGridId().toString()); + + formDto.setUserId(userDetail.getUserId()); + + formDto.setFaceImg(userDetail.getFaceImg()); + formDto.setRealName(userDetail.getRealName()); + formDto.setUserMobile(userDetail.getMobile()); + return customFeignClient.saveTripInfo(formDto); + } + + @Override + public Result getTripInfoList(TokenDto userDetail, GetTripInfoFormDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + formDto.setUserId(userDetail.getUserId()); + return customFeignClient.getTripInfoList(formDto); + } + + @Override + public Result getTripInfoDetail( GetTripInfoFormDTO formDto) { + return customFeignClient.getTripInfoDetail(formDto); + } + + @Override + public Result deleteTripById(GetTripInfoFormDTO formDto) { + return customFeignClient.deleteTripById(formDto); + } }