建议直通功能

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -361,4 +361,51 @@ public class ApiCustomInfoController {
     public Result callSdsMobile(@PathVariable String id) {
         return customService.callSdsMobile(id);
     }
+
+
+
+
+    /**
+     * 用户建议问题提交
+     *
+     * @param formDto 提交信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author songyunpeng
+     * @since 2020/10/22 17:58
+     */
+    @PostMapping("advice/submit")
+    public Result adviceSubmit(@RequestBody AdviceSubmitFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return customService.adviceSubmit(formDto, tokenDto);
+    }
+
+    /**
+     * 用户建议问题列表
+     *
+     * @param formDto 参数
+     * @param tokenDto 用户信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>>
+     * @author songyunpeng
+     * @since 2020/10/23 11:03
+     */
+    @GetMapping("advice/list")
+    public Result<List<AdviceResultDTO>> reportIssueList(AdviceListFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return customService.listAdvice(formDto, tokenDto);
+    }
+
+    /**
+     * 建议问题详情
+     *
+     * @param id 记录ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>
+     * @author songyunpeng
+     * @since 2020/10/23 10:39
+     */
+    @GetMapping("advice/detail/{id}")
+    public Result<AdviceResultDTO> adviceDetail(@PathVariable("id") String id) {
+        return customService.getAdviceById(id);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -332,4 +332,39 @@ public interface CustomFeignClient {
      **/
     @GetMapping(value = "custom/epdc-app/sds/callMobile/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result callSdsMobile(@PathVariable String id);
+
+
+    /**
+     * 用户建议提交
+     *
+     * @param formDto 提交信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/10/22 18:04
+     */
+    @PostMapping(value = "custom/epdc-app/advice/submit", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result adviceSubmit(AdviceSubmitFormDTO formDto);
+
+    /**
+     * 用户建议列表
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ReportIssueSubmitResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/23 10:06
+     */
+    @GetMapping(value = "custom/epdc-app/advice/list", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<AdviceResultDTO>> adviceList(AdviceListFormDTO formDto);
+
+    /**
+     * 建议详情
+     *
+     * @param id 记录ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>
+     * @author Liuchuang
+     * @since 2020/10/23 10:39
+     */
+    @GetMapping(value = "custom/epdc-app/advice/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<AdviceResultDTO> adviceDetail(@PathVariable("id") String id);
+
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@@ -184,4 +184,19 @@ public class CustomFeignClientFallback implements CustomFeignClient {
     public Result callSdsMobile(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "callMobile", id);
     }
+
+    @Override
+    public Result adviceSubmit(AdviceSubmitFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "adviceSubmit", formDto);
+    }
+
+    @Override
+    public Result<List<AdviceResultDTO>> adviceList(AdviceListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "adviceList", formDto);
+    }
+
+    @Override
+    public Result<AdviceResultDTO> adviceDetail(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "AdviceDetail", id);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@@ -331,4 +331,28 @@ public interface CustomService {
      * @Param [formDTO]
      **/
     Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
+    /**
+     * @Description  提交建议 
+     * @Author songyunpeng
+     * @Date  2021/3/4
+     * @Param [formDto, tokenDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result adviceSubmit(AdviceSubmitFormDTO formDto, TokenDto tokenDto);
+    /**
+     * @Description  建议列表 
+     * @Author songyunpeng
+     * @Date  2021/3/4
+     * @Param [formDto, tokenDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.AdviceResultDTO>>
+     **/
+    Result<List<AdviceResultDTO>> listAdvice(AdviceListFormDTO formDto, TokenDto tokenDto);
+    /**
+     * @Description  建议详情 
+     * @Author songyunpeng
+     * @Date  2021/3/4
+     * @Param [id]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.AdviceResultDTO>
+     **/
+    Result<AdviceResultDTO> getAdviceById(String id);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -352,4 +352,43 @@ public class CustomServiceImpl implements CustomService {
     public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {
         return customFeignClient.getEvaluationList(formDTO);
 	}
+
+    @Override
+    public Result adviceSubmit(AdviceSubmitFormDTO formDto, TokenDto tokenDto) {
+        if (null == tokenDto) {
+            return new Result().error("无效的token");
+        }
+
+        // 用户信息
+        formDto.setUserId(tokenDto.getUserId());
+        formDto.setRealName(tokenDto.getRealName());
+        formDto.setUserFace(tokenDto.getFaceImg());
+        formDto.setNickname(tokenDto.getNickname());
+        formDto.setMobile(tokenDto.getMobile());
+
+        // 机构信息
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(tokenDto.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());
+        return customFeignClient.adviceSubmit(formDto);
+    }
+
+    @Override
+    public Result<List<AdviceResultDTO>> listAdvice(AdviceListFormDTO formDto, TokenDto tokenDto) {
+        formDto.setUserId(tokenDto.getUserId());
+        return customFeignClient.adviceList(formDto);    }
+
+    @Override
+    public Result<AdviceResultDTO> getAdviceById(String id) {
+        return customFeignClient.adviceDetail(id);
+	}
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/advice/controller/AppAdviceController.java

@@ -0,0 +1,70 @@
+package com.elink.esua.epdc.modules.advice.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.form.AdviceListFormDTO;
+import com.elink.esua.epdc.dto.form.AdviceSubmitFormDTO;
+import com.elink.esua.epdc.dto.result.AdviceResultDTO;
+import com.elink.esua.epdc.modules.advice.service.AdviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户建议-移动端接口
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-10-22
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "advice")
+public class AppAdviceController {
+
+    @Autowired
+    private AdviceService adviceService;
+
+    /**
+     * 用户建议提交
+     *
+     * @param formDto 提交信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author songyunpeng
+     * @since 2020/10/22 17:28
+     */
+    @PostMapping("submit")
+    public Result adviceSubmit(@RequestBody AdviceSubmitFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+
+        return adviceService.saveAdvice(formDto);
+    }
+
+    /**
+     * 用户建议列表
+     *
+     * @param formDto 参数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.adviceSubmitResultDTO>>
+     * @author songyunpeng
+     * @since 2020/10/23 10:06
+     */
+    @GetMapping("list")
+    public Result<List<AdviceResultDTO>> adviceList(@RequestBody AdviceListFormDTO formDto) {
+        List<AdviceResultDTO> data = adviceService.listAdvice(formDto);
+        return new Result<List<AdviceResultDTO>>().ok(data);
+    }
+
+    /**
+     * 建议详情
+     *
+     * @param id 记录ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.adviceResultDTO>
+     * @author songyunpeng
+     * @since 2020/10/23 10:39
+     */
+    @GetMapping("detail/{id}")
+    public Result<AdviceResultDTO> adviceDetail(@PathVariable("id") String id) {
+        AdviceResultDTO data = adviceService.getAdviceById(id);
+        return new Result<AdviceResultDTO>().ok(data);
+    }
+}