diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java new file mode 100644 index 0000000000..77f4eb4d68 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/NewEventsResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2021/8/5 9:51 上午 + * @DESC + */ +@Data +public class NewEventsResultDTO implements Serializable { + + private static final long serialVersionUID = 2151884734349908080L; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 事件时间 + */ + private String eventTime; + + /** + * 事件图片 + */ + private List eventImgs; +} 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 0e090ed1b9..c76a1ea63c 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 @@ -174,4 +174,15 @@ public class ResiEventController { return new Result>().ok(resiEventService.mentionList(formDTO)); } + /** + * @Description 最新直报 + * @Param userId + * @author zxc + * @date 2021/8/5 9:55 上午 + */ + @PostMapping("newevents") + public Result> newEvents(@LoginUser TokenDto tokenDto){ + return new Result>().ok(resiEventService.newEvents(tokenDto.getUserId())); + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java index cf74df59f1..6275a0d821 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.EventDetailResultDTO; import com.epmet.dto.result.EventListResultDTO; import com.epmet.dto.result.MyReportedResultDTO; +import com.epmet.dto.result.NewEventsResultDTO; import com.epmet.entity.ResiEventEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -79,4 +80,12 @@ public interface ResiEventDao extends BaseDao { * @date 2021/8/4 5:32 下午 */ void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId); + + /** + * @Description 最新直报 + * @Param orgIds + * @author zxc + * @date 2021/8/5 10:42 上午 + */ + List newEvents(@Param("orgIds")List orgIds); } \ 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 65d13d225f..236ebe765e 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 @@ -89,4 +89,12 @@ public interface ResiEventService extends BaseService { * @date 2021/8/4 9:41 */ List mentionList(UserMentionFormDTO formDTO); + + /** + * @Description 最新直报 + * @Param userId + * @author zxc + * @date 2021/8/5 9:55 上午 + */ + List newEvents(String userId); } \ 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 776d82467a..89f51ed5c5 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 @@ -493,5 +493,25 @@ public class ResiEventServiceImpl extends BaseServiceImpl newEvents(String userId) { + Result> listResult = govOrgOpenFeignClient.selectOrgsByUserId(userId); + if (!listResult.success()){ + throw new RenException("查询userId："+userId+"，所在org失败"); + } + List orgIds = listResult.getData(); + if (!CollectionUtils.isEmpty(orgIds)){ + List result = baseDao.newEvents(orgIds); + return result; + } + return new ArrayList<>(); + } + } \ 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 4ff17b6e35..1af9c54926 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 @@ -18,7 +18,7 @@ SELECT IFNULL(rea.ATTACHMENT_URL,'') AS img,t.* FROM (SELECT re.EVENT_CONTENT AS eventContent, - IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i:%s'),'') AS eventTime, + IFNULL(DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i'),'') AS eventTime, re.ID AS eventId, (CASE WHEN re.SHIFT_PROJECT = 1 THEN TRUE ELSE FALSE END) AS isProject, (CASE WHEN ro.RED_DOT = 1 THEN TRUE ELSE FALSE END) AS redDot @@ -113,7 +113,7 @@ + SELECT + IFNULL(re.EVENT_CONTENT,'') AS eventContent, + DATE_FORMAT(re.CREATED_TIME,'%Y-%m-%d %H:%i') AS eventTime, + IFNULL(ea.ATTACHMENT_URL,'') AS img + FROM resi_event_report_org ro + LEFT JOIN resi_event re ON (re.ID = ro.RESI_EVENT_ID AND re.DEL_FLAG = '0') + LEFT JOIN resi_event_attachment ea ON (ea.RESI_EVENT_ID = ro.RESI_EVENT_ID AND ea.DEL_FLAG = '0' AND + ea.ATTACHMENT_TYPE = 'image' AND ea.SORT IN (0,1,2)) + WHERE ro.DEL_FLAG = '0' + AND ro.ORG_READ = 'un_read' + AND ro.ORG_ID IN( + + #{orgId} + ) + ORDER BY ro.CREATED_TIME DESC + \ No newline at end of file