From 31ea4f4f4120c5542159b42c0158bc3affbed2be Mon Sep 17 00:00:00 2001 From: liushaowen <565850092@qq.com> Date: Mon, 9 Nov 2020 18:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=BB=BA=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/MyAdviceListResultDTO.java | 4 ++-- .../controller/UserAdviceController.java | 13 ++++++++++-- .../java/com/epmet/dao/UserAdviceDao.java | 7 +++++++ .../com/epmet/service/UserAdviceService.java | 12 +++++++++++ .../service/impl/UserAdviceServiceImpl.java | 21 ++++++++++++++++--- .../main/resources/mapper/UserAdviceDao.xml | 21 +++++++++++++++++++ 6 files changed, 71 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java index a451b24393..77a8e2c460 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyAdviceListResultDTO.java @@ -20,11 +20,11 @@ public class MyAdviceListResultDTO implements Serializable { private List imgList; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8") private Date adviceTime; private String replyContent; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy/MM/dd", timezone = "GMT+8") private Date replyTime; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java index 38578093ea..1020c5d66a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserAdviceController.java @@ -129,8 +129,17 @@ public class UserAdviceController { return new Result>().ok(page); } + /** + * @Description 居民端-我的建议列表 + * @param map ->pageSize,pageNo + * @return com.epmet.commons.tools.utils.Result> + * @Author liushaowen + * @Date 2020/11/9 17:35 + */ @PostMapping("myadvicelist") - public Result> myAdviceList(String pageSize, String pageNo) { - return null; + public Result> myAdviceList(@RequestBody Map map) { + int pageSize = map.get("pageSize"); + int pageNo = map.get("pageNo"); + return new Result>().ok(userAdviceService.myAdviceList(pageSize,pageNo,loginUserUtil.getLoginUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java index e198ef4b82..087b91f225 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserAdviceDao.java @@ -18,10 +18,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * user_advice * @@ -34,4 +37,8 @@ public interface UserAdviceDao extends BaseDao { @Param("replyContent") String replyContent, @Param("govContent") String govContent, @Param("replyUserId") String loginUserId); + + List myAdviceList(@Param("pageSize") int pageSize, + @Param("pageNo") int pageNo, + @Param("userId") String loginUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java index 31a63b3ffa..35a5e840ce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserAdviceService.java @@ -24,6 +24,7 @@ import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import java.util.List; @@ -124,4 +125,15 @@ public interface UserAdviceService extends BaseService { * @Date 2020/11/9 10:41 */ PageData adviceList(AdviceListFormDTO dto); + + /** + * @Description 居民端-我的建议列表 + * @param pageSize + * @param pageNo + * @param loginUserId + * @return java.util.List + * @Author liushaowen + * @Date 2020/11/9 17:39 + */ + List myAdviceList(int pageSize, int pageNo, String loginUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java index 58686403c4..8973026d33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserAdviceServiceImpl.java @@ -42,6 +42,7 @@ import com.epmet.dto.form.AdviceListFormDTO; import com.epmet.dto.form.ReplyAdviceFormDTO; import com.epmet.dto.result.AdviceDetailResultDTO; import com.epmet.dto.result.AdviceListResultDTO; +import com.epmet.dto.result.MyAdviceListResultDTO; import com.epmet.entity.UserAdviceEntity; import com.epmet.entity.UserAdviceImgEntity; import com.epmet.redis.UserAdviceRedis; @@ -278,6 +279,20 @@ public class UserAdviceServiceImpl extends BaseServiceImpl + * @Description 居民端-我的建议列表 + * @Author liushaowen + * @Date 2020/11/9 17:39 + */ + @Override + public List myAdviceList(int pageSize, int pageNo, String loginUserId) { + return baseDao.myAdviceList(pageSize, pageNo, loginUserId); + } + private void auditText(String text) { TextScanParamDTO textScanParamDTO = new TextScanParamDTO(); TextTaskDTO taskDTO = new TextTaskDTO(); @@ -285,14 +300,14 @@ public class UserAdviceServiceImpl extends BaseServiceImpl textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); - logger.info("用户建议文字审核入参:"+JSON.toJSONString(textScanParamDTO)); - logger.info("用户建议文字审核返参:"+JSON.toJSONString(textSyncScanResult)); + logger.info("用户建议文字审核入参:" + JSON.toJSONString(textScanParamDTO)); + logger.info("用户建议文字审核返参:" + JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { logger.warn("用户建议文字审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.warn("用户建议文字审核失败,文字:",text); + logger.warn("用户建议文字审核失败,文字:", text); throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode()); } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml index 0f7d01cd50..d787d73850 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserAdviceDao.xml @@ -43,4 +43,25 @@ where id = #{adviceId} and del_flag = 0 + + + + + + + + + + +