行程上报

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<MySuggestionResultDTO> 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);
+    }
 }

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<MySuggestionResultDTO> 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);
 }

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<MySuggestionResultDTO> 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);
+    }
 }

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<MySuggestionResultDTO> 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);
 }

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<MySuggestionResultDTO> getDetailSuggestion(String id) {
         return customFeignClient.getDetailSuggestion(id);
     }
+
+    @Override
+    public Result saveTripInfo(TokenDto userDetail, SaveTripInfoFormDTO formDto) {
+        if (null == userDetail) {
+            return new Result().error("获取用户信息失败");
+        }
+        //获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> 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);
+    }
 }