myreceived

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyReceivedResDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dataaggre.dto.message.result;
+
+import com.epmet.commons.tools.dto.form.FileCommonDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description 我收到的消息列表
+ * @Author yinzuomei
+ * @Date 2021/8/20 6:55 下午
+ */
+@Data
+public class MyReceivedResDTO implements Serializable {
+    private static final long serialVersionUID = 2602131254448130443L;
+    private String infoId;
+    private String publishStaffName;
+    private String publishStaffOrgName;
+    private String headPhoto;
+    private String content;
+    private Date publishTime;
+    /**
+     * 附件列表 列表默认返回一个
+     */
+    private List<FileCommonDTO> attachmentList;
+    private Boolean readFlag;
+    private String publishStaffGender;
+
+    private String firstAttId;
+}
+

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/InfoController.java

@@ -10,11 +10,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO;
 import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO;
 import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO;
 import com.epmet.dataaggre.dto.message.form.MySentFormDTO;
-import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO;
-import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO;
-import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO;
-import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO;
-import com.epmet.dataaggre.dto.message.result.MySentResDTO;
+import com.epmet.dataaggre.dto.message.result.*;
 import com.epmet.dataaggre.service.epmetmessage.EpmetMessageService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -124,4 +120,22 @@ public class InfoController {
         ValidatorUtils.validateEntity(mySentFormDTO,PageFormDTO.AddUserInternalGroup.class);
         return new Result<List<MySentResDTO>>().ok(epmetMessageService.queryMySent(mySentFormDTO));
     }
+
+    /**
+     * 发送消息-我收到的列表
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return  com.epmet.commons.tools.utils.Result
+     * @author yinzuomei
+     * @date 2021/8/20 6:54 下午
+     */
+    @PostMapping("receivedlist")
+    public Result<List<MyReceivedResDTO>> queryMyReceivedList(@LoginUser TokenDto tokenDto, @RequestBody MySentFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        ValidatorUtils.validateEntity(formDTO,PageFormDTO.AddUserInternalGroup.class);
+        return new Result<List<MyReceivedResDTO>>().ok(epmetMessageService.queryMyReceivedList(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetmessage/InfoProfileDao.java

@@ -18,6 +18,7 @@
 package com.epmet.dataaggre.dao.epmetmessage;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.message.result.MyReceivedResDTO;
 import com.epmet.dataaggre.dto.message.result.MySentResDTO;
 import com.epmet.dataaggre.entity.epmetmessage.InfoProfileEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,4 +44,15 @@ public interface InfoProfileDao extends BaseDao<InfoProfileEntity> {
      * @date 2021/8/20 3:46 下午
      */
     List<MySentResDTO> selectListMySent(@Param("publishStaffId") String publishStaffId,@Param("content") String content);
+
+    /**
+     * 我收到的消息列表
+     *
+     * @param userId
+     * @param content
+     * @return  java.util.List<com.epmet.dataaggre.dto.message.result.MyReceivedResDTO>
+     * @author yinzuomei
+     * @date 2021/8/20 7:01 下午
+     */
+    List<MyReceivedResDTO> selectListMyReceived(@Param("userId") String userId, @Param("content") String content);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/EpmetMessageService.java

@@ -5,11 +5,7 @@ import com.epmet.dataaggre.dto.govorg.result.ReceiversResultDTO;
 import com.epmet.dataaggre.dto.message.form.InfoGroupDetailFormDTO;
 import com.epmet.dataaggre.dto.message.form.InfoRepliesFormDTO;
 import com.epmet.dataaggre.dto.message.form.MySentFormDTO;
-import com.epmet.dataaggre.dto.message.result.InfoGroupDetailResDTO;
-import com.epmet.dataaggre.dto.message.result.InfoRedDotResultDTO;
-import com.epmet.dataaggre.dto.message.result.InfoReplyResDTO;
-import com.epmet.dataaggre.dto.message.result.MyInfoGroupResultDTO;
-import com.epmet.dataaggre.dto.message.result.MySentResDTO;
+import com.epmet.dataaggre.dto.message.result.*;
 
 import java.util.List;
 
@@ -74,4 +70,14 @@ public interface EpmetMessageService {
      * @date 2021/8/20 3:03 下午
      */
     List<MySentResDTO> queryMySent(MySentFormDTO mySentFormDTO);
+
+    /**
+     * 发送消息-我收到的消息列表 可根据内容搜索
+     *
+     * @param formDTO
+     * @return  java.util.List<com.epmet.dataaggre.dto.message.result.MyReceivedResDTO>
+     * @author yinzuomei
+     * @date 2021/8/20 7:00 下午
+     */
+    List<MyReceivedResDTO> queryMyReceivedList(MySentFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java

@@ -209,4 +209,19 @@ public class EpmetMessageServiceImpl implements EpmetMessageService {
         return data.getList();
     }
 
+    /**
+     * 发送消息-我收到的消息列表 可根据内容搜索
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.dataaggre.dto.message.result.MyReceivedResDTO>
+     * @author yinzuomei
+     * @date 2021/8/20 7:00 下午
+     */
+    @Override
+    public List<MyReceivedResDTO> queryMyReceivedList(MySentFormDTO formDTO) {
+        PageInfo<MyReceivedResDTO> data = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize())
+                .doSelectPageInfo(() -> infoProfileDao.selectListMyReceived(formDTO.getUserId(),formDTO.getContent()));
+        return data.getList();
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoProfileDao.xml

@@ -21,7 +21,7 @@
     </resultMap>
 
     <!--    我发出的消息列表-->
-    <select id="selectListMySent" parameterType="java.lang.String" resultMap="MySentResDTOMap">
+    <select id="selectListMySent" parameterType="map" resultMap="MySentResDTOMap">
         select
             i.id,
             ip.content,
@@ -44,9 +44,52 @@
           and i.DEL_FLAG='0'
           and i.publish_staff_id=#{publishStaffId}
          <if test="null != content and content !=''">
-             i.content like concat('%',#{content},'%')
+             i.content like concat('%',trim(#{content}),'%')
          </if>
         order by i.CREATED_TIME desc
     </select>
 
+    <resultMap id="MyReceivedResDTOMap" type="com.epmet.dataaggre.dto.message.result.MyReceivedResDTO">
+        <id property="infoId" column="id" />
+        <result property="content" column="content"/>
+        <result property="publishTime" column="CREATED_TIME"/>
+        <result property="firstAttId" column="first_att_id"/>
+        <result property="readFlag" column="read_flag"/>
+        <collection property="attachmentList" ofType="com.epmet.commons.tools.dto.form.FileCommonDTO" >
+            <result property="name" column=""/>
+            <result property="url" column=""/>
+            <result property="type" column=""/>
+            <result property="format" column=""/>
+            <result property="size" column=""/>
+            <result property="duration" column=""/>
+        </collection>
+    </resultMap>
+    <select id="selectListMyReceived" parameterType="map" resultMap="MyReceivedResDTOMap">
+        SELECT
+            ir.INFO_ID,
+            ip.content,
+            ii.CREATED_TIME,
+            ir.READ_FLAG,
+            ip.first_att_id,
+            IFNULL(ia.ATTACHMENT_NAME,'') AS name,
+            IFNULL(ia.ATTACHMENT_FORMAT,'') AS format,
+            IFNULL(ia.ATTACHMENT_TYPE,'') AS type,
+            IFNULL(ia.ATTACHMENT_URL,'') AS url,
+            IFNULL(ia.ATTACHMENT_SIZE,'') AS size,
+            IFNULL(ia.DURATION,'') AS duration
+        FROM
+            info_receivers ir
+                INNER JOIN info ii ON ( ir.INFO_ID = ii.ID )
+                INNER JOIN info_profile ip ON ( ii.ID = ip.INFO_ID AND ip.DEL_FLAG = '0' )
+                LEFT JOIN info_att ia ( ip.first_att_id = ia.id AND ia.DEL_FLAG = '0' )
+        WHERE
+            ir.DEL_FLAG = '0'
+          AND ii.DEL_FLAG = '0'
+          AND ir.STAFF_ID = #{userId}
+          <if test="null != content and content !=''">
+            ii.content like concat('%',trim(#{content}),'%')
+          </if>
+        ORDER BY
+            ii.CREATED_TIME DESC
+    </select>
 </mapper>