添加dto

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/controller/AdviceController.java

@@ -3,6 +3,7 @@ package com.epmet.modules.advice.controller;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.MyAdviceListFormDTO;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
 import com.epmet.modules.advice.service.AdviceService;
@@ -44,13 +45,13 @@ public class AdviceController {
 
     /**
      * @Description 我的建议列表
-     * @param map
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result
      * @Author liushaowen
      * @Date 2020/11/5 13:26
      */
     @PostMapping("myadvicelist")
-    public Result<List<MyAdviceListResultDTO>> getMyAdviceList(@RequestBody Map<String,Integer> map){
+    public Result<List<MyAdviceListResultDTO>> getMyAdviceList(@RequestBody MyAdviceListFormDTO dto){
-        return adviceService.getMyAdviceList(map);
+        return adviceService.getMyAdviceList(dto);
     }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/AdviceService.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.advice.service;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.MyAdviceListFormDTO;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.MyAdviceListResultDTO;
 
@@ -10,5 +11,5 @@ import java.util.Map;
 public interface AdviceService {
     Result submitAdvice(SubmitAdviceFormDTO dto);
 
-    Result<List<MyAdviceListResultDTO>> getMyAdviceList(Map<String,Integer> map);
+    Result<List<MyAdviceListResultDTO>> getMyAdviceList(MyAdviceListFormDTO dto);
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/advice/service/impl/AdviceServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.advice.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.MyAdviceListFormDTO;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.advice.service.AdviceService;
@@ -31,13 +32,13 @@ public class AdviceServiceImpl implements AdviceService {
 
     /**
      * @Description 我的建议列表
-     * @param map
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result
      * @Author liushaowen
      * @Date 2020/11/5 10:40
      */
     @Override
-    public Result getMyAdviceList(Map<String, Integer> map) {
+    public Result getMyAdviceList(MyAdviceListFormDTO dto) {
-        return epmetUserOpenFeignClient.myAdviceList(map);
+        return epmetUserOpenFeignClient.myAdviceList(dto);
     }
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyAdviceListFormDTO.java

@@ -0,0 +1,28 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2020/11/11 14:41
+ */
+@Data
+public class MyAdviceListFormDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private int pageNo;
+
+    /**
+     * 页大小
+     */
+    @Min(1)
+    private int pageSize;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -404,13 +404,13 @@ public interface EpmetUserOpenFeignClient {
 
     /**
      * @Description 个人中心-我的建议列表
-     * @param map pageSize,pageNo
+     * @param dto
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.MyAdviceListResultDTO>
      * @Author liushaowen
      * @Date 2020/11/11 10:35
      */
     @PostMapping("/epmetuser/useradvice/myadvicelist")
-    Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody Map<String,Integer> map);
+    Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody MyAdviceListFormDTO dto);
 
     /**
      * @Description 个人中心-提交建议

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -279,8 +279,8 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     }
 
     @Override
-    public Result<List<MyAdviceListResultDTO>> myAdviceList(Map<String, Integer> map) {
+    public Result<List<MyAdviceListResultDTO>> myAdviceList(MyAdviceListFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", map);
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "myAdviceList", dto);
 
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.UserAdviceDTO;
 import com.epmet.dto.form.AdviceListFormDTO;
+import com.epmet.dto.form.MyAdviceListFormDTO;
 import com.epmet.dto.form.ReplyAdviceFormDTO;
 import com.epmet.dto.form.SubmitAdviceFormDTO;
 import com.epmet.dto.result.AdviceDetailResultDTO;
@@ -161,16 +162,8 @@ public class UserAdviceController {
      * @Date 2020/11/9 17:35
      */
     @PostMapping("myadvicelist")
-    public Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody Map<String,Integer> map) {
+    public Result<List<MyAdviceListResultDTO>> myAdviceList(@RequestBody MyAdviceListFormDTO dto) {
-        int pageSize = map.get("pageSize");
+        return new Result<List<MyAdviceListResultDTO>>().ok(userAdviceService.myAdviceList(dto.getPageSize(),dto.getPageNo(),loginUserUtil.getLoginUserId()));
-        int pageNo = map.get("pageNo");
-        if (pageSize == 0){
-            pageSize = 10;
-        }
-        if (pageNo == 0){
-            pageNo = 1;
-        }
-        return new Result<List<MyAdviceListResultDTO>>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId()));
     }
 
     @PostMapping("submitadvice")