开发智能对话记录功能提交

src/main/java/com/rf/kjb/intelligentDialogue/dao/repository/IntelligentDialogueRepository.java

@@ -30,7 +30,7 @@ public interface IntelligentDialogueRepository extends BaseRepository<Intelligen
     @Query(value = "SELECT t1.* FROM t_intelligent_dialogue t1 INNER JOIN (SELECT MAX(id) AS id FROM t_intelligent_dialogue GROUP BY identifier ) t2 ON t1.id = t2.id ", nativeQuery = true)
     List<IntelligentDialogueEntity> findAllIdentifier();
 
-    @Query(value = "SELECT * FROM t_intelligent_dialogue WHERE identifier = :identifier ORDER BY create_time DESC ",
-            countQuery = "SELECT * FROM t_intelligent_dialogue WHERE identifier = :identifier ", nativeQuery = true)
-    Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(Pageable pageable, @Param("identifier") String identifier);
+    @Query(value = "SELECT * FROM t_intelligent_dialogue WHERE type = :type and identifier = :identifier ORDER BY create_time DESC ",
+            countQuery = "SELECT * FROM t_intelligent_dialogue WHERE type = :type and identifier = :identifier ", nativeQuery = true)
+    Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(Pageable pageable, @Param("identifier") String identifier, @Param("type") String type);
 }

src/main/java/com/rf/kjb/intelligentDialogue/rest/IntelligentDialogueController.java

@@ -57,8 +57,8 @@ public class IntelligentDialogueController extends BaseController {
 
     @GetMapping("/dialogueRecords")
     @ApiOperation(value = "用户智能对话记录查询", notes = "identifier:编号；pageNum：页数；pageSize：每页记录数")
-    public Result getDialogueRecords(String identifier, int pageNum, int pageSize, HttpServletRequest request) {
-        Page<IntelligentDialogueEntity> intelligentDialogueEntities = this.intelligentDialogueService.getIntelligentDialogueEntityByIdentifier(identifier, pageNum, pageSize);
+    public Result getDialogueRecords(String identifier, int pageNum, int pageSize, String type, HttpServletRequest request) {
+        Page<IntelligentDialogueEntity> intelligentDialogueEntities = this.intelligentDialogueService.getIntelligentDialogueEntityByIdentifier(identifier, pageNum, pageSize, type);
         String greetings = null;
         if (intelligentDialogueEntities.getContent().size() == 0){
             JSONObject jsonObject = new JSONObject();

src/main/java/com/rf/kjb/intelligentDialogue/service/IntelligentDialogueService.java

@@ -14,5 +14,5 @@ public interface IntelligentDialogueService {
 
     List<IntelligentDialogueEntity> findAllIdentifier();
 
-    Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(String identifier, int pageNum, int pageSize);
+    Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(String identifier, int pageNum, int pageSize, String type);
 }

src/main/java/com/rf/kjb/intelligentDialogue/service/impl/IntelligentDialogueServiceImpl.java

@@ -67,7 +67,7 @@ public class IntelligentDialogueServiceImpl implements IntelligentDialogueServic
     }
 
     @Override
-    public Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(String identifier, int pageNum, int pageSize) {
-        return this.repository.getIntelligentDialogueEntityByIdentifier(PageRequest.of(pageNum - 1, pageSize), identifier);
+    public Page<IntelligentDialogueEntity> getIntelligentDialogueEntityByIdentifier(String identifier, int pageNum, int pageSize, String type) {
+        return this.repository.getIntelligentDialogueEntityByIdentifier(PageRequest.of(pageNum - 1, pageSize), identifier, type);
     }
 }