lrf 8 mesiacov pred
rodič
commit
61cced64ab

+ 3 - 2
src/main/java/com/free/controller/ChatRecordController.java

@@ -67,9 +67,9 @@ public class ChatRecordController {
       throw new CustomizationException(ExceptionEnum.CHAT_APPLY_IS_CLOSE);
     }
     Long customer_id = apply.getCustomer_id();
-    Long user_id = apply.getUser_id();
+    String user_id = apply.getUser_id();
     Long speaker = body.getSpeaker();
-    if (customer_id != speaker && user_id != speaker) {
+    if (customer_id != speaker && user_id.equals(speaker.toString())) {
       // 抛出异常,发言人既不是该申请的客服人员,也不是用户
       throw new CustomizationException(ExceptionEnum.CHAT_SPEAKER_NOT_IN_APPLY);
     }
@@ -116,6 +116,7 @@ public class ChatRecordController {
     Long skip = null, limit = null;
     Map map = new HashMap();
     QueryWrapper qw = new QueryWrapper<>();
+    qw.orderByDesc("time");
     /** 参数处理处理 */
     for (String key : allParams.keySet()) {
       Object value = allParams.get(key);

+ 3 - 2
src/main/java/com/free/controller/TestController.java

@@ -38,7 +38,7 @@ public class TestController {
     String messageData = "message: M A N ";
     String createTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
     Map<String, Object> manMap = new HashMap<>();
-    manMap.put("messageId", null);
+    manMap.put("messageId", messageId);
     manMap.put("messageData", messageData);
     manMap.put("createTime", createTime);
     Map data = new HashMap();
@@ -48,7 +48,7 @@ public class TestController {
     data.put("l", l);
     manMap.put("data", data);
     mqService.sendMsg(MqListeners.userExName, MqListeners.userQueue + ".1", manMap);
-    return ResponseFormat.success(data);
+    return ResponseFormat.success(manMap);
   }
 
   /**
@@ -68,6 +68,7 @@ public class TestController {
    * @param test
    * @return
    */
+  @PassToken
   @PostMapping()
   public Object save(@RequestBody Test test) {
     boolean result = testService.save(test);

+ 1 - 1
src/main/java/com/free/controller/TransferApplyController.java

@@ -76,7 +76,7 @@ public class TransferApplyController {
     }
     TransferApply data = new TransferApply();
     data.setApply_time(LocalDateTime.now());
-    data.setUser_id(body.getUser_id());
+    data.setUser_id(body.getUser_id().toString(TransferApplyClose));
     this.service.save(data);
     QueryWrapper qw = new QueryWrapper<>();
     qw.eq("id", data.getId());

+ 2 - 1
src/main/java/com/free/entity/ChatRecord.java

@@ -41,7 +41,8 @@ public class ChatRecord extends BaseEntity {
   @Column(comment = "用户id")
   @TableField(value = "user_id")
   @ApiModelProperty("用户id")
-  private Long user_id;
+  /**UUID */
+  private String user_id;
 
   @TableField(fill = FieldFill.INSERT)
   @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")

+ 2 - 4
src/main/java/com/free/entity/Test.java

@@ -3,7 +3,6 @@ package com.free.entity;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
-import com.gitee.sunchenbin.mybatis.actable.annotation.IsAutoIncrement;
 import com.gitee.sunchenbin.mybatis.actable.annotation.IsKey;
 import com.gitee.sunchenbin.mybatis.actable.annotation.Table;
 import lombok.Data;
@@ -15,11 +14,10 @@ import java.time.LocalDateTime;
 @Table(name = "test")
 @TableName(value = "test")
 public class Test {
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id",type = IdType.ASSIGN_UUID)
     @IsKey
-    @IsAutoIncrement
     @Column(name = "id",comment = "数据id")
-    private Long id;
+    private String id;
 
     @TableField(value = "name")
     private String name;

+ 2 - 1
src/main/java/com/free/entity/TransferApply.java

@@ -32,7 +32,8 @@ public class TransferApply extends BaseEntity {
   @Column(comment = "用户id")
   @TableField(value = "user_id")
   @ApiModelProperty("用户id")
-  private Long user_id;
+  /**UUID */
+  private String user_id;
 
 
   @TableField(fill = FieldFill.INSERT)

+ 0 - 1
src/main/java/com/free/service/TransferApplyService.java

@@ -36,7 +36,6 @@ public class TransferApplyService extends ServiceImpl<TransferApplyMapper, Trans
     for (TransferApply i : list) {
       Map map = Utils.objectToMap(i);
       Long customer_id = i.getCustomer_id();
-      Long user_id = i.getUser_id();
       if (null != customer_id) {
         Customer cData = customerService.getById(customer_id);
         if (null != cData) {