Merge branch 'feature/xgh/加好友申请标签' into 'master'

Feature/xgh/加好友申请标签

See merge request !2289

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/ChatDataController.java

@@ -11,6 +11,7 @@ import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.manage.web.handle.*;
 import com.gic.haoban.manage.web.qo.chat.*;
+import com.gic.haoban.manage.web.qo.open.UserChatDetailLogQO;
 import com.gic.haoban.manage.web.qo.wechatwork.StoreGroupCommonQO;
 import com.gic.haoban.manage.web.qo.wechatwork.WechatWorkLostClerkQO;
 import com.gic.haoban.manage.web.qo.wechatwork.WechatWorkLostStoreGroupQO;
@@ -1215,6 +1216,24 @@ public class ChatDataController extends NewBaseController {
 
 
     /**
+     * 用户单独对话聊天记录
+     * @param req
+     * @return
+     */
+    @RequestMapping("user-chat-detail-log")
+    public RestResponse<List<UserChatDetailLogVO>> userChatDetailLog(@RequestBody UserChatDetailLogQO req) {
+        Map<String, Object> res = DataApiUtils.http(JSONObject.toJSONString(req), "data_mbr_scale_haoban_qw_chat_detail_log");
+        List<JSONObject> list = DataApiUtils.getDataList(res);
+        if (CollectionUtils.isNotEmpty(list)) {
+            List<UserChatDetailLogVO> voList = JSONArray.parseArray(JSON.toJSONString(list), UserChatDetailLogVO.class);
+            return RestResponse.successResult(voList) ;
+        }
+        return RestResponse.successResult();
+    }
+
+
+
+    /**
      * 群聊统计 会话明细 数据导出
      *
      *

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

@@ -166,8 +166,11 @@ public class QywxOpenTaskController {
             String logContent2 = this.otherLog(oldMemberRule, newMemberRule, "人群规则", oldMemberRuleTitle, newMemberRuleTitle);
             String oldLabel = oldDTO.getMemberLabelId();
             String newLabel = dto.getMemberLabelId();
-            String logContent3 = this.membrLabel(oldLabel, newLabel);
-            String logContent = this.addListForLog(logContent1, logContent2, logContent3);
+            String oldApplyLabel = oldDTO.getApplyMemberLabelId() ;
+            String newApplyLabel = dto.getApplyMemberLabelId() ;
+            String logContent3 = this.memberLabel("好友申请通过后添加",oldLabel, newLabel);
+            String logContent4 = this.memberLabel("发起好友申请时添加",oldApplyLabel, newApplyLabel);
+            String logContent = this.addListForLog(logContent1, logContent2, logContent3,logContent4);
             if (StringUtils.isNotBlank(logContent)) {
                 logContent = title + logContent;
                 GicLogRecordEvaluationContext.putAttribute("logValue", logContent);
@@ -193,17 +196,29 @@ public class QywxOpenTaskController {
         return "";
     }
 
-    private String membrLabel(String oldValue, String newValue) {
+    private String memberLabel(String title,String oldValue, String newValue) {
+        if(null == oldValue) {
+            oldValue = "";
+        }
+        if(null == newValue) {
+            newValue = "" ;
+        }
         if (!oldValue.equals(newValue)) {
-            MemberTagItemDTO oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
-            MemberTagItemDTO newResp = this.memberTagApiService.findMemberTagItem(newValue);
+            MemberTagItemDTO oldResp = null ;
+            if(StringUtils.isNotBlank(oldValue)) {
+                oldResp = this.memberTagApiService.findMemberTagItem(oldValue);
+            }
+            MemberTagItemDTO newResp = null ;
+            if(StringUtils.isNotBlank(newValue)) {
+                newResp = this.memberTagApiService.findMemberTagItem(newValue);
+            }
             if (null != oldResp) {
                 oldValue = oldResp.getTagItemName();
             }
             if (null != newResp) {
                 newValue = newResp.getTagItemName();
             }
-            return "标签从【" + oldValue + "】修改为【" + newValue + "】";
+            return title+"标签从【" + oldValue + "】修改为【" + newValue + "】";
         }
         return "";
     }
@@ -231,6 +246,15 @@ public class QywxOpenTaskController {
                 vo.setMemberLabelStatus(tagItem.getStatus());
             }
         }
+        if(StringUtils.isNotBlank(vo.getApplyMemberLabelId())) {
+            MemberTagItemDTO tagItem = this.memberTagApiService.findMemberTagItem(vo.getApplyMemberLabelId());
+            if (null != tagItem) {
+                String tagId = tagItem.getTagId();
+                MemberTagDTO tag = this.memberTagApiService.getMemberTagById(tagId);
+                vo.setApplyMemberLabelName(tag.getTagName() + "-" + tagItem.getTagItemName());
+                vo.setApplyMemberLabelStatus(tagItem.getStatus());
+            }
+        }
         // 会员分组
         if (vo.getMemberType() == 1) {
             List<MemberTagGroupVO> memberTagGroupVOS = this.listMemberTagGroupInfoByGoupIds(vo

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/chat/GroupChatChatDetailReq.java

@@ -72,6 +72,19 @@ public class GroupChatChatDetailReq implements Serializable {
      */
     private String requestProject;
 
+    /**
+     * 群名称、id
+     */
+    private String groupSearchParams ;
+
+    public String getGroupSearchParams() {
+        return groupSearchParams;
+    }
+
+    public void setGroupSearchParams(String groupSearchParams) {
+        this.groupSearchParams = groupSearchParams;
+    }
+
     public Integer getDataApiOrderField() {
         Map<String, Integer> map = new HashMap<>(4);
         map.put("joinTime", 1);
@@ -109,6 +122,9 @@ public class GroupChatChatDetailReq implements Serializable {
         if (StringUtils.isNotBlank(userType)) {
             jsonObject.put("userType", userType);
         }
+        if(StringUtils.isNotBlank(groupSearchParams)) {
+            jsonObject.put("groupSearchParams",groupSearchParams) ;
+        }
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/open/UserChatDetailLogQO.java

+package com.gic.haoban.manage.web.qo.open;
+
+import java.io.Serializable;
+
+public class UserChatDetailLogQO implements Serializable {
+
+    private Long groupChatId ;
+
+    private String memberId ;
+
+    private String clerkId ;
+
+    private Integer rn ;
+
+    // 1群聊2单聊
+    private Integer tableType ;
+
+    // 1往前10条   2往后10条
+    private Integer dataType ;
+
+
+    public Long getGroupChatId() {
+        return groupChatId;
+    }
+
+    public void setGroupChatId(Long groupChatId) {
+        this.groupChatId = groupChatId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public Integer getRn() {
+        return rn;
+    }
+
+    public void setRn(Integer rn) {
+        this.rn = rn;
+    }
+
+    public Integer getTableType() {
+        return tableType;
+    }
+
+    public void setTableType(Integer tableType) {
+        this.tableType = tableType;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/GroupChatChatDetailVO.java

@@ -99,6 +99,16 @@ public class GroupChatChatDetailVO extends StoreGroupCommonVO implements Seriali
      */
     private String msgType;
 
+    private Long rn ;
+
+    public Long getRn() {
+        return rn;
+    }
+
+    public void setRn(Long rn) {
+        this.rn = rn;
+    }
+
     public String getMemberId() {
         return memberId;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/SingleChatDetailVO.java

@@ -88,6 +88,15 @@ public class SingleChatDetailVO extends StoreGroupCommonVO implements Serializab
      */
     private String sendTime;
 
+    private Long rn ;
+
+    public Long getRn() {
+        return rn;
+    }
+
+    public void setRn(Long rn) {
+        this.rn = rn;
+    }
 
     public String getMemberId() {
         return memberId;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/chat/UserChatDetailLogVO.java

+package com.gic.haoban.manage.web.vo.chat;
+
+import java.io.Serializable;
+
+public class UserChatDetailLogVO implements Serializable {
+
+    // 聊天内容
+    private String content ;
+
+    // 发送时间
+    private String sendTime ;
+
+    // 排序值
+    private Long rn ;
+
+    // 发送人名字
+    private String sendName ;
+
+    // 1导购2客户
+    private Integer userType ;
+
+    private Integer msgType ;
+
+    public Integer getMsgType() {
+        return msgType;
+    }
+
+    public void setMsgType(Integer msgType) {
+        this.msgType = msgType;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getSendTime() {
+        return sendTime;
+    }
+
+    public void setSendTime(String sendTime) {
+        this.sendTime = sendTime;
+    }
+
+    public Long getRn() {
+        return rn;
+    }
+
+    public void setRn(Long rn) {
+        this.rn = rn;
+    }
+
+    public String getSendName() {
+        return sendName;
+    }
+
+    public void setSendName(String sendName) {
+        this.sendName = sendName;
+    }
+
+    public Integer getUserType() {
+        return userType;
+    }
+
+    public void setUserType(Integer userType) {
+        this.userType = userType;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/open/AddTaskDetailVO.java

@@ -20,6 +20,11 @@ public class AddTaskDetailVO implements Serializable {
     private String memberLabelId;
     private String memberLabelName ;
     private int memberLabelStatus ;
+
+    private String applyMemberLabelId ;
+    private String applyMemberLabelName ;
+    private int applyMemberLabelStatus ;
+
     /**开始时间*/
     private java.util.Date startTime;
     /**结束时间*/
@@ -49,6 +54,30 @@ public class AddTaskDetailVO implements Serializable {
     /** 人群id用于回显 */
     private String searchParamsId ;
 
+    public String getApplyMemberLabelId() {
+        return applyMemberLabelId;
+    }
+
+    public void setApplyMemberLabelId(String applyMemberLabelId) {
+        this.applyMemberLabelId = applyMemberLabelId;
+    }
+
+    public String getApplyMemberLabelName() {
+        return applyMemberLabelName;
+    }
+
+    public void setApplyMemberLabelName(String applyMemberLabelName) {
+        this.applyMemberLabelName = applyMemberLabelName;
+    }
+
+    public int getApplyMemberLabelStatus() {
+        return applyMemberLabelStatus;
+    }
+
+    public void setApplyMemberLabelStatus(int applyMemberLabelStatus) {
+        this.applyMemberLabelStatus = applyMemberLabelStatus;
+    }
+
     private List<MemberTagGroupVO> tagGroupList;
 
     public List<MemberTagGroupVO> getTagGroupList() {