Merge remote-tracking branch 'origin/dev_resi_event' into dev_resi_event

# Conflicts:
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java
#	epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

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<String> eventImgs;
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java

@@ -172,6 +172,16 @@ public class ResiEventController {
         formDTO.setUserId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class);
         return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
+    }}
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    @PostMapping("newevents")
+    public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto){
+        return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId()));
     }
 
     /**
@@ -190,4 +200,3 @@ public class ResiEventController {
         resiEventService.closeResiEvent(formDTO);
         return new Result();
     }
-}

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<ResiEventEntity> {
      * @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<NewEventsResultDTO> newEvents(@Param("orgIds")List<String> orgIds);
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ResiEventService.java

@@ -90,6 +90,14 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      */
     List<UserMentionResultDTO> mentionList(UserMentionFormDTO formDTO);
 
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    List<NewEventsResultDTO> newEvents(String userId);
+
     /**
      * 报事办结
      *
@@ -99,4 +107,5 @@ public interface ResiEventService extends BaseService<ResiEventEntity> {
      * @date 2021/8/5 10:48
      */
     void closeResiEvent(CloseResiEventFormDTO formDTO);
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

@@ -89,7 +89,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
     private ProjectDao projectDao;
     @Autowired
     private ResiEventReplyDao resiEventReplyDao;
-
+y
     /**
      * @Description  群众直报（待处理、处理中、已办结）列表
      *   未处理：按照创建时间正序；
@@ -495,6 +495,26 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         return result.getList();
     }
 
+    /**
+     * @Description  最新直报
+     * @Param userId
+     * @author zxc
+     * @date 2021/8/5 9:55 上午
+     */
+    @Override
+    public List<NewEventsResultDTO> newEvents(String userId) {
+        Result<List<String>> listResult = govOrgOpenFeignClient.selectOrgsByUserId(userId);
+        if (!listResult.success()){
+            throw new RenException("查询userId："+userId+"，所在org失败");
+        }
+        List<String> orgIds = listResult.getData();
+        if (!CollectionUtils.isEmpty(orgIds)){
+            List<NewEventsResultDTO> result = baseDao.newEvents(orgIds);
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
     /**
      * 报事办结：没有回复或立项不可办结
      *

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 @@
     </resultMap>
     <select id="selectEventDetail" resultMap="selectEventDetailMap">
         SELECT
-            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,
             IFNULL(re.EVENT_CONTENT,'') AS eventContent,
             IFNULL(re.ADDRESS,'') AS eventAddress,
             (CASE WHEN re.`STATUS` = 'processing' THEN FALSE WHEN re.`STATUS` = 'closed_case' THEN TRUE ELSE FALSE END) AS isClosed,
@@ -153,4 +153,29 @@
           AND USER_ID = #{userId}
           AND RESI_EVENT_ID = #{eventId}
     </update>
+
+    <resultMap id="newEventsMap" type="com.epmet.dto.result.NewEventsResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventTime" column="eventTime"/>
+        <collection property="eventImgs" ofType="java.lang.String">
+            <result column="img"/>
+        </collection>
+    </resultMap>
+    <select id="newEvents" resultMap="newEventsMap">
+        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(
+        <foreach collection="orgIds" item="orgId" separator=",">
+            #{orgId}
+        </foreach>)
+        ORDER BY ro.CREATED_TIME DESC
+    </select>
 </mapper>