Merge branch 'master' of http://git.cc-lotus.info/customer/service

src/main/java/com/free/controller/TransferApplyController.java

@@ -125,7 +125,8 @@ public class TransferApplyController {
     // 获取客服人员id
     Long customer_id = Long.valueOf(String.valueOf(userMap.get("id")));
     updateData.setCustomer_id(customer_id);
-    this.service.updateById(data);
+    updateData.setIs_agree(data.getIs_agree());
+    this.service.updateById(updateData);
     TransferApply newData = this.service.getById(id);
     // 如果审核通过了, 则需要给申请人发送mq消息.申请人需要知道是谁跟自己对话
     if (newData.getIs_agree().equals(TransferApplyAgree)) {
@@ -170,7 +171,7 @@ public class TransferApplyController {
     } else {
       List list = service.list(qw);
       List newData = service.getUserAndCustomerName(list);
-      map.put("data", list);
+      map.put("data", newData);
     }
     return ResponseFormat.success(map);
   }

src/main/java/com/free/entity/ChatRecord.java

@@ -59,4 +59,10 @@ public class ChatRecord extends BaseEntity {
   @ApiModelProperty("内容类型")
   private String content_type;
 
+
+  @Column(comment = "已读/未读", defaultValue = "0")
+  @TableField(value = "is_read")
+  @ApiModelProperty("已读/未读")
+  private String is_read;
+
 }

src/main/java/com/free/entity/TransferApply.java

@@ -52,4 +52,5 @@ public class TransferApply extends BaseEntity {
   @ApiModelProperty("是否结束")
   private int is_close;
 
+
 }

src/main/java/com/free/mq/MqService.java

@@ -3,13 +3,13 @@ package com.free.mq;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import java.util.Map;
 import java.util.HashMap;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -33,6 +33,7 @@ public class MqService {
    * @throws JsonProcessingException JSON处理异常
    */
   public void sendMsg(String ex, String queue, Map msg) throws JsonProcessingException {
+    System.out.println(msg);
     String strMsg = null;
     ObjectMapper mapper = new ObjectMapper();
     mapper.setSerializationInclusion(Include.NON_NULL);
@@ -88,8 +89,9 @@ public class MqService {
     String routerKey = MqListeners.queueName + "." + apply.getUser_id();
     Map map = new HashMap<>();
     Map data = Utils.objectToMap(apply);
-    map.put("data", map);
+    map.put("data", data);
     map.put("type", "notice");
+    System.out.println(data);
     try {
       this.sendMsg(ex, routerKey, map);
     } catch (JsonProcessingException e) {