From f1b87860d40569357e2efe5c92d79a650e144318 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 4 Aug 2021 09:55:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E6=9C=AA?= =?UTF-8?q?=E8=AF=BB=E3=80=81=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/UserMentionFormDTO.java | 44 +++++++++++++++ .../dto/result/UserMentionResultDTO.java | 55 +++++++++++++++++++ .../epmet/controller/ResiEventController.java | 22 ++++++-- .../com/epmet/dao/ResiEventMentionDao.java | 16 +++++- .../com/epmet/service/ResiEventService.java | 15 +++-- .../service/impl/ResiEventServiceImpl.java | 16 ++++++ .../main/resources/mapper/ResiEventDao.xml | 3 +- .../resources/mapper/ResiEventMentionDao.xml | 49 +++++++++++++++++ 8 files changed, 209 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java new file mode 100644 index 0000000000..861abebb95 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/UserMentionFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * 我要报事-人大代表未读/已读列表入参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 9:34 + */ +@Data +public class UserMentionFormDTO implements Serializable { + private static final long serialVersionUID = 7548058964554418080L; + + public interface AddUserInternalGroup { + } + + /** + * 未读：un_read;已读：read； + */ + @NotBlank(message = "readFlag不能为空", groups = AddUserInternalGroup.class) + private String readFlag; + @NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) + private Integer pageNo; + @NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) + private Integer pageSize; + + //以下参数从token中获取 + /** + * 当前用户id + */ + @NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) + private String userId; + + /** + * 当前客户id + */ + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) + private String customerId; +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java new file mode 100644 index 0000000000..95ac2e2527 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/UserMentionResultDTO.java @@ -0,0 +1,55 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 我要报事-人大代表未读/已读列表返参 + * + * @author yinzuomei@elink-cn.com + * @date 2021/8/4 9:44 + */ +@Data +public class UserMentionResultDTO implements Serializable { + + private static final long serialVersionUID = 8171079006237395425L; + /** + * 事件id + */ + private String resiEventId; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 图片列表，可为空 + */ + private List imgList; + + /** + * true展示；false不展示 + */ + private Boolean redDot; + + /** + * 处理中：processing；已办结：closed_case + */ + private String status; + + /** + * true:已转项目；false：未立项 + */ + private Boolean shiftProject; + + /** + * 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date showTime; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java index d453e6ecd3..98bfe74b10 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java @@ -22,10 +22,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.ResiEventIdDTO; +import com.epmet.dto.result.*; import com.epmet.service.ResiEventService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -154,6 +151,21 @@ public class ResiEventController { return new Result(); } - + /** + * 我要报事-人大代表未读/已读列表 + * + * @param tokenDto + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @author yinzuomei + * @date 2021/8/4 9:40 + */ + @PostMapping("mentionlist") + public Result> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class); + return new Result>().ok(resiEventService.mentionList(formDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java index 270500ae05..981cee667a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.UserMentionResultDTO; import com.epmet.entity.ResiEventMentionEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 事件被@人表 @@ -29,5 +33,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ResiEventMentionDao extends BaseDao { - + + /** + * 人大代表未读、已读列表 + * + * @param userId + * @param readFlag + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 9:54 + */ + List selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java index 82dabf69fc..604375b0fb 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java @@ -2,11 +2,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.form.*; -import com.epmet.dto.result.EventDetailResultDTO; -import com.epmet.dto.result.EventListResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.ResiEventEntity; -import com.epmet.dto.result.MyReportedResultDTO; -import com.epmet.dto.result.ResiEventIdDTO; import java.util.List; @@ -81,4 +78,14 @@ public interface ResiEventService extends BaseService { * @date 2021/8/3 14:28 */ List queryMyReported(MyReportedFormDTO formDTO); + + /** + * 我要报事-人大代表未读/已读列表 + * + * @param formDTO + * @return java.util.List + * @author yinzuomei + * @date 2021/8/4 9:41 + */ + List mentionList(UserMentionFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java index 935e56abe6..c002ad983a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java @@ -379,5 +379,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl + * @author yinzuomei + * @date 2021/8/4 9:41 + */ + @Override + public List mentionList(UserMentionFormDTO formDTO) { + PageInfo result = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> resiEventMentionDao.selectMentionList(formDTO.getUserId(), + formDTO.getReadFlag())); + return result.getList(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml index 811dbc08a8..b1576f605e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml @@ -74,7 +74,8 @@ from resi_event re left join resi_event_attachment rea on(re.id=rea.RESI_EVENT_ID - and rea.DEL_FLAG='0') + and rea.DEL_FLAG='0' + and rea.ATTACHMENT_TYPE='image') where re.DEL_FLAG='0' and re.RECALL_FLAG='0' and re.REPORT_USER_ID=#{userId} diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml index 98064a416f..7a4f145c75 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml @@ -3,6 +3,55 @@ + + + + + + + + + + + + + + \ No newline at end of file