Parcourir la source

新增内蒙会话内容存档

anderx il y a 5 mois
Parent
commit
de914026ea

+ 1 - 1
src/main/java/com/kede/common/dao/ChatMsgUserMapper.java

@@ -83,7 +83,7 @@ public interface ChatMsgUserMapper {
 
     ChatMsgUser selectByUserId(String userId);
 
-    List<ChatMsgUser> getUserList(@Param("type")Integer type);
+    List<ChatMsgUser> getUserList(@Param("type")Integer type,@Param("provinceType")Integer provinceType);
 
     List<ChatMsgUser>  selectMyIdByUser(InputgetUserMsg in);
 

+ 3 - 0
src/main/java/com/kede/common/mapper/ChatMsgUserMapper.xml

@@ -147,6 +147,9 @@
         <if test="type != null">
             and type = #{type}
         </if>
+        <if test="provinceType != null">
+            and province_type = #{provinceType}
+        </if>
         </where>
     </select>
     <select id="selectMyIdByUser" resultMap="ChatMsgUserMap">

+ 8 - 0
src/main/java/com/kede/wechat/bo/InputGetChatName.java

@@ -1,5 +1,13 @@
 package com.kede.wechat.bo;
 
 public class InputGetChatName {
+    private Integer provinceType;
 
+    public Integer getProvinceType() {
+        return provinceType;
+    }
+
+    public void setProvinceType(Integer provinceType) {
+        this.provinceType = provinceType;
+    }
 }

+ 9 - 0
src/main/java/com/kede/wechat/bo/InputgetUserMsg.java

@@ -4,11 +4,20 @@ public class InputgetUserMsg {
 
     private String userId;
     private Integer msgType;
+    private Integer provinceType;
     private String foId;
     private String roomId;
     private String startTime;
     private String endTime;
 
+    public Integer getProvinceType() {
+        return provinceType;
+    }
+
+    public void setProvinceType(Integer provinceType) {
+        this.provinceType = provinceType;
+    }
+
     public String getStartTime() {
         return startTime;
     }

+ 2 - 2
src/main/java/com/kede/wechat/service/impl/ConversationContentServiceImpl.java

@@ -682,7 +682,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
     @Override
     public Object getMsgData(InputGetChatName in) {
 
-        List<ChatMsgUser> list = chatMsgUserMapper.getUserList(2);
+        List<ChatMsgUser> list = chatMsgUserMapper.getUserList(2,in.getProvinceType());
         list.forEach(e->{
            //查询每个人的所有信息
             List<ChatMsg> chatMsgs = chatMsgMapper.selectMsgById(e.getUserId(),null);
@@ -724,7 +724,7 @@ public class ConversationContentServiceImpl extends BaseMybatisDao<ChatMsgUserMa
 
     @Override
     public Object getUserMsg(InputgetUserMsg in) {
-       List<ChatMsgUser> list = chatMsgUserMapper.getUserList(2);
+       List<ChatMsgUser> list = chatMsgUserMapper.getUserList(2,in.getProvinceType());
        return list;
 
     }