From 1a4b8b087f2fb5012b0a6cd69e836336098b4dd3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 19 十一月 2025 10:49:36 +0800
Subject: [PATCH] update
---
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java | 3 +++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java | 3 +++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java | 2 ++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java | 2 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java | 2 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java | 2 ++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java | 2 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java | 3 +++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java | 4 ++++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java | 3 ++-
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java | 2 ++
ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java | 2 ++
ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java | 2 ++
13 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java
index 22e22b7..0b0c16a 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyListenDTO.java
@@ -16,6 +16,9 @@
@ApiModelProperty("排序")
private Integer studySort;
+ @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
+ private String sort;
+
@ApiModelProperty("类型1常规 2示例 ")
private Integer type;
}
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java
index a3fb75b..b427fca 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/dto/StudyPairDTO.java
@@ -15,6 +15,8 @@
private Integer isVip;
@ApiModelProperty("排序")
private Integer studySort;
+ @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
+ private String sort;
}
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java
index c954485..3e3862a 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyListenVO.java
@@ -20,4 +20,6 @@
@ApiModelProperty(value = "题型 1常规 2示例")
private Integer type;
+ @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
+ private String sort;
}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
index 77c6a2a..f018a80 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/StudyPairVO.java
@@ -17,4 +17,6 @@
private Integer isVip;
@ApiModelProperty(value = "id")
private Integer id;
+ @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
+ private String sort;
}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java
index 086e881..147a66e 100644
--- a/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java
+++ b/ruoyi-api/ruoyi-api-study/src/main/java/com/ruoyi/study/api/vo/SubjectVO.java
@@ -19,4 +19,6 @@
private Integer state;
@ApiModelProperty(value = "所属分类名称")
private String categoryName;
+ @ApiModelProperty(value = "图片")
+ private String img;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
index a81f4db..0dda7f6 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/controller/TStudyController.java
@@ -450,6 +450,7 @@
tStudyListen.setRate(dto.getListenRate());
tStudyListen.setStudySort(studyListenDTO.getStudySort());
tStudyListen.setType(studyListenDTO.getType());
+ tStudyListen.setSort(studyListenDTO.getSort());
studyListenService.save(tStudyListen);
}
List<Integer> ids1 = studyLookService.lambdaQuery().eq(TStudyLook::getId, one.getId())
@@ -560,6 +561,7 @@
tStudyPair.setRate(dto.getPairRate());
tStudyPair.setIsVip(studyPairDTO.getIsVip());
tStudyPair.setStudySort(studyPairDTO.getStudySort());
+ tStudyPair.setSort(studyPairDTO.getSort());
studyPairService.save(tStudyPair);
}
}
@@ -782,6 +784,7 @@
studyListenVO.setIsVip(tStudyListen.getIsVip());
studyListenVO.setId(tStudyListen.getId());
studyListenVO.setType(tStudyListen.getType());
+ studyListenVO.setSort(tStudyListen.getSort());
listenVOS.add(studyListenVO);
}
res.setListenRate(tStudyListen.getRate());
@@ -925,6 +928,7 @@
studyPairVO.setSubject(tStudyPair.getSubject());
studyPairVO.setIsVip(tStudyPair.getIsVip());
studyPairVO.setId(tStudyPair.getId());
+ studyPairVO.setSort(tStudyPair.getSort());
pairVOS.add(studyPairVO);
}
res.setPairRate(tStudyPair.getRate());
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java
index 8d22e8c..bde24ef 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyListen.java
@@ -65,4 +65,7 @@
@ApiModelProperty("1常规 2示例")
private Integer type;
+ @ApiModelProperty("框架记忆排序 多个逗号隔开和故事ids一一对应")
+ private String sort;
+
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java
index aa5e951..cb6ff3f 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/domain/TStudyPair.java
@@ -60,4 +60,6 @@
private String rate;
@ApiModelProperty("排序")
private Integer studySort;
+ @ApiModelProperty("框架记忆排序 多个逗号隔开和故事ids一一对应")
+ private String sort;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java
index 1e258eb..694555a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyListenDTO.java
@@ -15,7 +15,8 @@
private Integer isVip;
@ApiModelProperty("排序")
private Integer studySort;
-
+ @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
+ private String sort;
@ApiModelProperty("类型1常规 2示例")
private Integer type;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java
index e929203..3954efc 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/dto/StudyPairDTO.java
@@ -15,6 +15,8 @@
private Integer isVip;
@ApiModelProperty("排序")
private Integer studySort;
+ @ApiModelProperty("排序ids 逗号隔开 和题目一一对应")
+ private String sort;
}
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java
index 0d18f31..ec3c6a8 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyListenVO.java
@@ -22,5 +22,8 @@
@ApiModelProperty(value = "题型 1常规 2示例")
private Integer type;
+ @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
+ private String sort;
+
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java
index 7e4cea0..52d4989 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/StudyPairVO.java
@@ -17,4 +17,6 @@
private Integer isVip;
@ApiModelProperty(value = "id")
private Integer id;
+ @ApiModelProperty(value = "排序 逗号隔开 与题组名称位置对应")
+ private String sort;
}
\ No newline at end of file
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java
index ec87e94..4ccd8d7 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/vo/SubjectVO.java
@@ -23,4 +23,6 @@
private Integer secondCategory;
@ApiModelProperty(value = "所属分类名称")
private String categoryName;
+ @ApiModelProperty(value = "图片")
+ private String img;
}
\ No newline at end of file
--
Gitblit v1.7.1