开发聊天记录点赞和刷新功能提交

src/main/java/com/rf/AIquantum/dialogue/dao/model/ChatHistoryEntity.java

@@ -38,4 +38,10 @@ public class ChatHistoryEntity extends BaseEntity {
     @Column(name = "status", columnDefinition = "int(2) not null comment  '状态(0：删除；1：正常)'")
     private int status;
 
+    @Column(name = "endorse", columnDefinition = "int(2) not null comment  '是否赞同(1：未评价（默认）；2：赞同；3：不赞同)'")
+    private int endorse;
+
+    @Column(name = "feedback", columnDefinition = "varchar(200) comment  '反馈意见'")
+    private String feedback;
+
 }

src/main/java/com/rf/AIquantum/dialogue/dao/repository/ChatHistoryRepository.java

@@ -28,4 +28,9 @@ public interface ChatHistoryRepository extends BaseRepository<ChatHistoryEntity,
 
     @Query(value = "select * from t_chat_history where dialogue_id = ?1 AND status = ?2 order by create_time desc",nativeQuery = true)
     Page<ChatHistoryEntity> findByDialogueIdAndStatus(String dialogueId, int status, PageRequest of);
+
+    @Transactional
+    @Modifying
+    @Query(value = "DELETE FROM t_chat_history WHERE dialogue_id = ?1 AND create_time >= ?2  ", nativeQuery = true)
+    void deleteByDialogueIdAndCreateTime(String dialogueId, String createTime);
 }

src/main/java/com/rf/AIquantum/dialogue/rest/ChatHistoryController.java

@@ -1,6 +1,7 @@
 package com.rf.AIquantum.dialogue.rest;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.rf.AIquantum.base.rest.BaseController;
@@ -21,10 +22,13 @@ import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 
+import static com.rf.AIquantum.dialogue.rest.DialogueController.HttpClientChat;
+
 /**
  * @Description: 聊天记录相关接口
  * @Author: zsy
@@ -40,9 +44,70 @@ public class ChatHistoryController extends BaseController {
 
     @GetMapping("/findChats")
     @ApiOperation(value = "查询聊天记录",notes = "参数包括：pageNum:页码, pageSize:数量, dialogueId:对话id")
-    public Result findDialogues(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String dialogueId){
+    public Result findChatHistorys(@RequestParam int pageNum, @RequestParam int pageSize, @RequestParam String dialogueId){
         Page<ChatHistoryEntity> chatHistoryEntities = chatHistoryService.findByDialogueIdAndStatus(pageNum,pageSize,dialogueId,1);
         return success(chatHistoryEntities);
     }
 
+    @PostMapping("/updateChatHistory")
+    @ApiOperation(value = "修改聊天记录信息（点赞、点踩）",notes = "ChatHistory对象,点赞时只需将endorse的值改为2；点赞时只需将endorse的值改为3,如果有反馈意见放到feedback字段；endorse：1：未评价（默认）；2：赞同；3：不赞同")
+    public Result updateChatHistory(@RequestBody String json) {
+        ChatHistoryEntity chatHistoryEntity = JSONObject.parseObject(json,ChatHistoryEntity.class);
+        chatHistoryEntity.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
+        this.chatHistoryService.save(chatHistoryEntity);
+        return success("修改成功");
+    }
+
+    @PostMapping("/refresh")
+    @ApiOperation(value = "刷新某条回答",notes = "ChatHistory对象")
+    public Result refresh(@RequestBody String json) throws UnsupportedEncodingException {
+        ChatHistoryEntity chatHistoryEntity = JSONObject.parseObject(json,ChatHistoryEntity.class);
+        String dialogueId = chatHistoryEntity.getDialogueId();
+        String createTime = chatHistoryEntity.getCreateTime();
+        this.chatHistoryService.deleteByDialogueIdAndCreateTime(dialogueId,createTime);
+        //调用模型相关操作
+        List<ChatHistoryEntity> chatHistoryEntities = this.chatHistoryService.findChatHistoryByDialogueIdAndStatus(dialogueId);
+        JSONArray messages = new JSONArray();
+        for (ChatHistoryEntity chatHistory : chatHistoryEntities) {
+            JSONArray contents = new JSONArray();
+            JSONObject jsonText = new JSONObject();
+            jsonText.put("type","text");
+            jsonText.put("text",chatHistory.getContent());
+            if (chatHistory.getImage() != null && !chatHistory.getImage().equals("")) {
+                JSONObject jsonImage = new JSONObject();
+                jsonImage.put("type","image_url");
+                JSONObject jsonUrl = new JSONObject();
+                jsonUrl.put("url",chatHistory.getImage());
+                jsonImage.put("image_url",jsonUrl);
+                contents.add(jsonImage);
+            }
+            contents.add(jsonText);
+            JSONObject jsonRole = new JSONObject();
+            jsonRole.put("role",chatHistory.getRole());
+            jsonRole.put("content",contents);
+            messages.add(jsonRole);
+        }
+        JSONObject jsonChat = new JSONObject();
+        jsonChat.put("messages",messages);
+
+        String url = Constant.INVOKE_IP_PROT + Constant.CHAT_PATH;
+        String data = HttpClientChat(jsonChat,url);
+        JSONObject jsonSystem = JSONObject.parseObject(data);
+        if (jsonSystem == null || !jsonSystem.containsKey("response")) {
+            return fail("", "模型服务内部错误");
+        }
+        String content = jsonSystem.getString("response");
+        chatHistoryEntity = new ChatHistoryEntity();
+        chatHistoryEntity.setDialogueId(dialogueId);
+        chatHistoryEntity.setRole("system");
+        chatHistoryEntity.setContent(content);
+        chatHistoryEntity.setStatus(1);
+        chatHistoryEntity.setEndorse(1);
+        chatHistoryEntity.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
+        chatHistoryEntity.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
+        chatHistoryEntity = this.chatHistoryService.save(chatHistoryEntity);
+
+        return success(chatHistoryEntity);
+    }
+
 }

src/main/java/com/rf/AIquantum/dialogue/rest/DialogueController.java

@@ -63,27 +63,10 @@ public class DialogueController extends BaseController {
     @PostMapping("/saveChat")
     @ApiOperation(value = "保存对话",notes = "参数包括：phone:手机号, dialogueId:对话id（为空时是新建对话）, content:消息内容,image：图片（可以为空）")
     public Result saveChat(MultipartFile image, String phone, String dialogueId, String content) throws UnsupportedEncodingException {
-        /*JSONObject jsonObject =JSONObject.parseObject(jsonParam);
-        if (!jsonObject.containsKey("phone")) {
-            return fail("", "缺少参数：phone");
-        }
-        if (!jsonObject.containsKey("dialogueId")) {
-            return fail("", "缺少参数：dialogueId");
-        }
-        if (!jsonObject.containsKey("content")) {
-            return fail("", "缺少参数：content");
-        }
-        if (!jsonObject.containsKey("image")) {
-            return fail("", "缺少参数：image");
-        }
-        String phone = jsonObject.getString("phone");*/
         UserEntity user = this.userService.findUserByPhone(phone);
         if (user == null){
             return fail(null,"用户不存在");
         }
-        /*String content = jsonObject.getString("content");
-        String image = jsonObject.getString("image");
-        String dialogueId = jsonObject.getString("dialogueId");*/
         String imageUrl = "";
         if (image != null) {
             if (!image.isEmpty()) {
@@ -123,6 +106,7 @@ public class DialogueController extends BaseController {
         chatHistoryEntity.setContent(content);
         chatHistoryEntity.setImage(imageUrl);
         chatHistoryEntity.setStatus(1);
+        chatHistoryEntity.setEndorse(1);
         chatHistoryEntity.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
         chatHistoryEntity.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
         this.chatHistoryService.save(chatHistoryEntity);
@@ -163,6 +147,7 @@ public class DialogueController extends BaseController {
         chatHistoryEntity.setRole("system");
         chatHistoryEntity.setContent(content);
         chatHistoryEntity.setStatus(1);
+        chatHistoryEntity.setEndorse(1);
         chatHistoryEntity.setCreateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
         chatHistoryEntity.setUpdateTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"));
         chatHistoryEntity = this.chatHistoryService.save(chatHistoryEntity);

src/main/java/com/rf/AIquantum/dialogue/service/ChatHistoryService.java

@@ -18,4 +18,6 @@ public interface ChatHistoryService {
     List<ChatHistoryEntity> findChatHistoryByDialogueIdAndStatus(String dialogueId);
 
     Page<ChatHistoryEntity> findByDialogueIdAndStatus(int pageNum, int pageSize, String dialogueId, int status);
+
+    void deleteByDialogueIdAndCreateTime(String dialogueId, String createTime);
 }

src/main/java/com/rf/AIquantum/dialogue/service/impl/ChatHistoryServiceImpl.java

@@ -42,4 +42,9 @@ public class ChatHistoryServiceImpl implements ChatHistoryService {
         Page<ChatHistoryEntity> page = this.chatHistoryRepository.findByDialogueIdAndStatus(dialogueId,status,PageRequestUtil.of(pageNum, pageSize));
         return page;
     }
+
+    @Override
+    public void deleteByDialogueIdAndCreateTime(String dialogueId, String createTime) {
+        this.chatHistoryRepository.deleteByDialogueIdAndCreateTime(dialogueId,createTime);
+    }
 }

src/main/java/com/rf/AIquantum/user/rest/UserController.java

@@ -135,7 +135,14 @@ public class UserController extends BaseController {
      */
     @ApiOperation(value = "修改用户名",notes = "data参数包括：id:用户id,userName:新用户名")
     @PostMapping("/updateUserName")
-    public Result updateUserName(String id, String userName){
+    public Result updateUserName(@RequestBody String jsonParam){
+        JSONObject jsonObject =JSONObject.parseObject(jsonParam);
+        if(!jsonObject.containsKey("id")|| StringUtils.isEmpty(jsonObject.getString("id")))
+            return failBadRequest(null,"用户id不能为空！");
+        if(!jsonObject.containsKey("userName")|| StringUtils.isEmpty(jsonObject.getString("userName")))
+            return failBadRequest(null,"旧密码不能为空！");
+        String id = jsonObject.getString("id");
+        String userName = jsonObject.getString("userName");
         if (userName == null || userName.equals("")){
             return fail(null, "用户名不能为空");
         }