WinTeachTeam
/
IESExtension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
develop
hhb@hotmail.com 2 months ago
parent a5d404a025 8100e15948
commit 692015b0c7
6 changed files with 273 additions and 227 deletions
Show Stats Download Patch File Download Diff File

8
src/main/java/cn/teammodel/controller/frontend/AiController.java
Unescape View File

@ -151,14 +151,6 @@ public class AiController {
@PostMapping("chat/comments")
@ApiOperation("设置评语")
public SseEmitter chatComments(@RequestBody @Valid ChatCommentsDto chatCommentsDto) {
/*
Authentication user0 = SecurityUtil.getAuthentication();
Object user01 = SecurityUtil.getAuthentication().getPrincipal();
TmdUserDetail user02 = (TmdUserDetail) SecurityUtil.getAuthentication().getPrincipal();
Claims user03 = ((TmdUserDetail) SecurityUtil.getAuthentication().getPrincipal()).getClaims();
String user04 = ((TmdUserDetail) SecurityUtil.getAuthentication().getPrincipal()).getClaims().getSubject();
*/
//String userId = ((TmdUserDetail) SecurityUtil.getAuthentication().getPrincipal()).getClaims().getSubject();
// 获取getClaims时为空
String userId = ((TmdUserDetail) SecurityUtil.getAuthentication().getPrincipal()).getUser().getId();

6
src/main/java/cn/teammodel/model/dto/ai/ChatModelDto.java
Unescape View File

@ -12,10 +12,10 @@ import java.util.List;
public class ChatModelDto {
public String type;
public String name;
public String role;
public String chat;
public ArrayList<String> role;
public ArrayList<String> chat;
public ArrayList<String> cycleChats;
public String end;
public ArrayList<String> end;
}

11
src/main/java/cn/teammodel/model/dto/ai/comment/ChatCommentsDto.java
Unescape View File

@ -32,6 +32,17 @@ public class ChatCommentsDto {
* 评语重复次数
*/
private int repeat;
/**
* 名称
*/
private String name;
/*
* 评语阶段
*/
private int phase;
/**
* 返回评语大概字数
*/

13
src/main/java/cn/teammodel/model/dto/ai/comment/WisdomExamCommentsDto.java
Unescape View File

@ -6,6 +6,7 @@ import lombok.Data;
*/
@Data
public class WisdomExamCommentsDto {
/**
* 试卷名称
*/
@ -21,9 +22,19 @@ public class WisdomExamCommentsDto {
/**
* 得分率
*/
public int scoreRate;
public double scoreRate;
/**
* 排名
*/
public int ranking;
/**
* 班级得分率
*/
public double classRate;
/**
* 年级得分率
*/
public double gradeRate;
}

157
src/main/java/cn/teammodel/service/impl/ChatMessageServiceImpl.java
Unescape View File

@ -76,6 +76,7 @@ public class ChatMessageServiceImpl implements ChatMessageService {
try {
// 目前仅使用讯飞星火大模型
String appId = chatCommentsDto.getAppId();
// 获取模板文本
String text = commentsTemplate(chatCommentsDto);
if (!StringUtils.isEmpty(text)) {
chatCommentsDto.setText(text);
@ -300,29 +301,15 @@ public class ChatMessageServiceImpl implements ChatMessageService {
* @return
*/
private String commentsTemplate(ChatCommentsDto chatCommentsDto) {
try {
StringBuilder builder = new StringBuilder();
String strData = JSON.toJSONString(chatCommentsDto.getData());
//检查是否角色
int phase = Math.max(chatCommentsDto.getPhase(), 0);
List<ChatModelDto> chatModels = new ArrayList<>();
ChatModelDto chatModel = null;
// 获取模型数据
chatModels = jsonLoader.myJsonDataBean();
/*
//验证获取模型数据 异常问题
try {
String fileText = FileUtil.getFileText("Json/ChatModel.json");
String jsonData = JSON.toJSONString(fileText);
//获取聊天字段中的数据
Object obj = JSON.parseObject(jsonData).get("chatModel");
String jsonData01 = JSON.toJSONString(obj);
//转换方式
chatModels = JSON.parseObject(jsonData01, new TypeReference<List<ChatModelDto>>() {});
log.info("获取地址fileText："+fileText+"----文件内容Data:"+ jsonData +"----获取模型集合Object：" + obj +"----获取模型集合String："+ jsonData01 +"----获取模型集合机构："+chatModels);
} catch (Exception e) {
throw new ServiceException(ErrorCode.OPERATION_ERROR.getCode(), "读取文件" + Arrays.toString(e.getStackTrace()) + e.getMessage());
}*/
//循环查找对应的模型数据
for (ChatModelDto chatModelTemp : chatModels) {
//判断评语类型
@ -331,10 +318,30 @@ public class ChatMessageServiceImpl implements ChatMessageService {
break;
}
}
String chatName = "";
switch(phase){
case 1:
if (chatCommentsDto.getName().contains("班") || chatCommentsDto.getName().contains("班级")) {
chatName = chatCommentsDto.getName();
} else {
chatName = chatCommentsDto.getName()+"班级";
}
break;
case 2:
if (chatCommentsDto.getName().contains("年级")) {
chatName = chatCommentsDto.getName();
} else {
chatName = chatCommentsDto.getName()+"年级";
}
break;
default:
chatName = chatCommentsDto.getName()+"同学";
break;
}
if (chatModel != null) {
//角色条件
builder.append(String.format(chatModel.getRole(), chatCommentsDto.getPeriod(), chatCommentsDto.getSubject()));
builder.append(String.format(chatModel.getRole().get(0), chatCommentsDto.getPeriod(), chatCommentsDto.getSubject(), chatName));
}
ChatModelDto finalChatModel = chatModel;
@ -354,10 +361,13 @@ public class ChatMessageServiceImpl implements ChatMessageService {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
String chat = phase > 0 ? finalChatModel.getChat().get(1) : finalChatModel.getChat().get(0);
String cycleChat = finalChatModel.getCycleChats().get(0);
// 使用String.format方法生成最终的字符串
builder.append(String.format(
finalChatModel.getChat(),
wisdomComments.getName(),
chat,
chatCommentsDto.getName(),
wisdomComments.getYear(),
wisdomComments.getSemester(),
wisdomComments.getJoinAll(),
@ -368,24 +378,10 @@ public class ChatMessageServiceImpl implements ChatMessageService {
wisdomComments.getProportion(),
wisdomComments.getName()
));
/*
//有平均分
builder.append(String.format(
finalChatModel.getChat(),
wisdomComments.getName(),
wisdomComments.getYear(),
wisdomComments.getSemester(),
wisdomComments.getJoinAll(),
wisdomComments.getLessonMiddle(),
wisdomComments.getOnLine(),
wisdomComments.getMarking(),
wisdomComments.getAverage(),
wisdomComments.getLevel(),
wisdomComments.getProportion(),
wisdomComments.getName()
));*/
wisdomComments.getDims().forEach(item -> {
builder.append(String.format(finalChatModel.getCycleChats().get(0),
if(item.data.length >= 4)
{
builder.append(String.format(cycleChat,
item.name,
item.data[0],
item.data[1],
@ -393,8 +389,9 @@ public class ChatMessageServiceImpl implements ChatMessageService {
item.data[3],
item.data[4]
));
}
});
builder.append(String.format(finalChatModel.getEnd(), wisdomComments.getName()));
//builder.append(String.format(finalChatModel.getEnd().get(0),chatName, wisdomComments.getDims().size()));
break;
}
//智育 表现模版
@ -415,32 +412,54 @@ public class ChatMessageServiceImpl implements ChatMessageService {
}
}
int count = 1;
if(finalChatModel.getChat() != null && !chatCommentsDto.getName().isEmpty()){
//昵称
builder.append(String.format(finalChatModel.getChat().get(0), chatCommentsDto.getName()));
}
switch(phase){
case 1:{
for (WisdomExamCommentsDto examComment : examComments) {
builder.append(String.format(finalChatModel.getCycleChats().get(1), count, examComment.getName(),examComment.getTime(), examComment.getClassRate(),examComment.getGradeRate()));
count++;
}
break;
}
case 2:{
for (WisdomExamCommentsDto examComment : examComments) {
builder.append(String.format(finalChatModel.getCycleChats().get(2), count, examComment.getName(),examComment.getTime(), examComment.getGradeRate()));
count++;
}
break;
}
default:{
for (WisdomExamCommentsDto examComment : examComments) {
builder.append(String.format(finalChatModel.getCycleChats().get(0), count, examComment.getName(),
examComment.getTime(), examComment.getScore(), examComment.getScoreRate(),
examComment.getRanking()));
if (count < examComments.size()) {
builder.append(String.format(finalChatModel.getCycleChats().get(0), count, examComment.getName(),examComment.getTime(), examComment.getScore(), examComment.getScoreRate(),examComment.getRanking()));
count++;
}
break;
}
}
builder.append(String.format(finalChatModel.getEnd(), count));
break;
}
// 智育 学科评语模版
case "windomSubject": {
case "wisdomSubject": {
List<WisdomSubjectComments> subjectComments;
try {
subjectComments = JSON.parseObject(strData, new TypeReference<List<WisdomSubjectComments>>() {
});
subjectComments = JSON.parseObject(strData, new TypeReference<List<WisdomSubjectComments>>() {});
} catch (Exception e) {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
if (subjectComments.size() <= 1) {
if (subjectComments.isEmpty()) {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
if(finalChatModel.getChat() != null && !chatCommentsDto.getName().isEmpty()){
builder.append(String.format(finalChatModel.getChat().get(1), chatCommentsDto.getName()));
}
else {
if (finalChatModel.getChat() != null) {
builder.append(finalChatModel.getChat().get(0));
}
}
builder.append(finalChatModel.getChat());
String name = "";
//拼接学科数组
for (WisdomSubjectComments comments : subjectComments) {
@ -448,10 +467,12 @@ public class ChatMessageServiceImpl implements ChatMessageService {
for (WisdomSubjectComments.StuInfo stuInfo : comments.getRankings()) {
builder.append(String.format(finalChatModel.getCycleChats().get(1), stuInfo.ranking,stuInfo.name, stuInfo.scoreRate*100));
}
if (phase == 0) {
name = comments.getClaasRanking().name;
builder.append(String.format(finalChatModel.getCycleChats().get(2),name,comments.getClaasRanking().ranking, comments.getClaasRanking().scoreRate * 100,comments.getClaasRanking().average * 100));
builder.append(String.format(finalChatModel.getCycleChats().get(2), name, comments.getClaasRanking().ranking, comments.getClaasRanking().scoreRate * 100, comments.getClaasRanking().average * 100));
}
}
builder.append(String.format(finalChatModel.getEnd(), subjectComments.size(),name));
//builder.append(String.format(finalChatModel.getEnd().get(0), subjectComments.size(),chatName));
break;
}
//艺术 考核指标纬度评语
@ -468,21 +489,25 @@ public class ChatMessageServiceImpl implements ChatMessageService {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
}
builder.append(finalChatModel.getChat());
for (ArtLatitudeDto artLatitude : artLatitudes)
{
if(finalChatModel.getChat() != null && !chatCommentsDto.getName().isEmpty()) {
builder.append(String.format(finalChatModel.getChat().get(1), chatCommentsDto.getName()));
}else {
if (finalChatModel.getChat() != null) {
builder.append(finalChatModel.getChat().get(0));
}
}
for (ArtLatitudeDto artLatitude : artLatitudes){
builder.append(String.format(finalChatModel.getCycleChats().get(0), artLatitude.getQuotaN1(),artLatitude.getQuotaP1(), artLatitude.getQuotaN2(),artLatitude.getQuotaP2(), artLatitude.getQuotaN3(),artLatitude.getQuotaP3(), artLatitude.getPercent(),artLatitude.getLevel()));
}
builder.append(finalChatModel.getEnd());
//builder.append(String.format(finalChatModel.getEnd().get(0),chatName));
break;
}
//艺术 学科评语模版
case "artSubject":{
List<ArtSubjectDto> artSubjects;
try {
artSubjects = JSON.parseObject(strData, new TypeReference<List<ArtSubjectDto>>() {
});
artSubjects = JSON.parseObject(strData, new TypeReference<List<ArtSubjectDto>>() {});
} catch (Exception e) {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
@ -491,12 +516,12 @@ public class ChatMessageServiceImpl implements ChatMessageService {
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "请求参数异常");
}
}
builder.append(finalChatModel.getChat());
builder.append(String.format(finalChatModel.getChat().get(0), chatCommentsDto.getSubject()));
for (ArtSubjectDto artSubject : artSubjects){
builder.append(String.format(finalChatModel.getCycleChats().get(0), artSubject.getDimension(),artSubject.getBlock(), artSubject.getPoint(),artSubject.getScore(), artSubject.getTotalScore(),artSubject.getPercent()));
}
builder.append(String.format(finalChatModel.getEnd(),chatCommentsDto.getSubject()));
//builder.append(String.format(finalChatModel.getEnd().get(0),chatName));
break;
}
//体育
@ -511,21 +536,21 @@ public class ChatMessageServiceImpl implements ChatMessageService {
//德育
case "moral":{
builder.append(finalChatModel.getChat());
break;
}
default:
throw new ServiceException(ErrorCode.PARAMS_ERROR.getCode(), "评语类型异常");
}
if (chatCommentsDto.getSize() > 0) {
builder.append("字数限制在：")
.append(chatCommentsDto.getSize())
.append("字左右");
} else {
builder.append("字数限制在：200字左右");
}
String limitChat = "。限制条件如下：1.%s字左右；2.直接返回评价的内容；3.评价开头不要提示语；4.评价开头不允许出现特殊字符。";
int size = chatCommentsDto.getSize() > 0 ? chatCommentsDto.getSize() : 200;
builder.append(String.format(limitChat, size));
return builder.toString();
} catch (Exception e) {
log.info(Arrays.toString(e.getStackTrace()));
log.error("{}-{}", e.getMessage(), Arrays.toString(e.getStackTrace()));
throw new ServiceException(ErrorCode.OPERATION_ERROR.getCode(), Arrays.toString(e.getStackTrace()));
}
}
}

41
src/main/resources/Json/ChatModel.json
Unescape View File

@ -3,42 +3,49 @@
{
"type": "wisdom",
"name": "智育 总体评语模版",
"role": "请扮演[%s%s]老师角色\n",
"chat": "%s同学，在%s学年度，第%s学期中，共计参加了%s次评测，其中课中评测%s次、线上评测%s次、阅卷评测%s次，素养等级为%s，已超过班级%s%% 同学。\n %s同学总体表现：",
"role": ["请扮演[%s%s]老师角色，依据提供的数据，对%s的总体的表现做一个评价。\n 数据如下："],
"chat": ["%s同学，在%s学年度，第%s学期中，共计参加了%s次评测，其中课中评测%s次、线上评测%s次、阅卷评测%s次，素养等级为%s，已超过班级%s%% 的同学。\n %s同学的总体表现：",
"%s，在%s学年度，第%s学期，共计参加了%s次评测，其中课中评测%s次、线上评测%s次、阅卷评测%s次，总体表现如下："
],
"cycleChats": ["在%s中：学习态度为：%s、学习成效：%s、合作能力：%s、评价能力：%s、评价能力：%s ;\n"],
"end": "根据我提供的数据,对这 %s 次考试成绩表现做一个评价\n"
"end": ["请根据我提供的数据,对%s的考试成绩表现做一个评价。\n"],
"limit": "。限制条件如下：1、%s字左右；2、直接返回评语的内容；3、评语的开篇不允许出现提示语；4、评语的开篇不允许出现特殊字符。"
},
{
"type": "wisdomExam",
"name": "智育 成绩表现模版",
"role": "请扮演[%s%s]老师角色\n",
"chat": "",
"cycleChats": ["参加第%s次，考试结果：名称:%s，时间:%s，得分：%s，考试得分率：%s %% 排名：%s ;\n"],
"end": "根据我提供的数据,对这 %s 次考试成绩表现做一个评价。\n"
"role": ["请扮演[%s%s]老师角色，依据我提供的数据，对%s的学习成效表现做一个评价。数据如下：\n"],
"chat": ["%s\n,"],
"cycleChats": ["参加第%s次，考试结果：名称:%s，时间:%s，得分：%s，考试得分率：%s %% 排名：%s ;\n","参加第%s次，考试结果：名称:%s，时间:%s，班级平均得分率：%s %%，年级平均得分率：%s %%;\n","参加第%s次，考试结果：名称:%s，时间:%s，年级平均得分率：%s %%;\n"],
"end": ["请根据我提供的数据,对%s的考试成绩表现做一个评价。\n"],
"limit": "。限制条件如下：1、%s字左右；2、直接返回评语的内容；3、评语的开篇不允许出现提示语；4、评语的开篇不允许出现特殊字符。"
},
{
"type": "windomSubject",
"type": "wisdomSubject",
"name": "智育 学科评语模版",
"role": "请扮演[%s%s]老师角色\n ",
"chat": "各科评测表现",
"role": ["请扮演[%s%s]老师角色，依据我提供的数据，对%s的各科评测表现做一个评价。 数据如下：\n"],
"chat": ["的各科评测表现：","%s的各科评测表现：\""],
"cycleChats":["科目：%s 班级top10"," 排名:%s，姓名：%s，得分率：%s %% ,\n " ,"%s在班级排名：%s,得分率：%s %%,排在班级平均得分率：(%s %%)"],
"end": "根据我提供的数据,对这%s门学科，【%s】在班级中的表现做一个评价。 \n"
"end": ["请根据我提供的数据,对这%s门学科，对%s的表现做一个评价。 \n"],
"limit": "。限制条件如下：1、%s字左右；2、直接返回评语的内容；3、评语的开篇不允许出现提示语；4、评语的开篇不允许出现特殊字符。"
},
{
"type": "artLatitude",
"name": "艺术 考核指标评语模版",
"role": "请扮演[%s%s]老师角色\n ",
"chat": "考核指标评纬度\n",
"role": ["请扮演[%s%s]老师角色，依据我提供的数据，对%s的表现做一个整体的评价。数据如下：\n"],
"chat": ["考核指标评纬度\n","%s的考核指标评纬度\n"],
"cycleChats": [" 一级指标：%s（ %s %%）；二级指标：%s（ %s %%）；三级指标 %s（ %s %%） ；得分率：%s %% 等级：%s\n"],
"end": "根据我提供的【考核指标纬度】做一个整体的评价。 \n"
"end": ["请根据我提供的数据，对%s做一个整体的评价。 \n"],
"limit": ""
},
{
"type": "artSubject",
"name": "艺术 学科评语模版",
"role": "请扮演[%s%s]老师角色\n ",
"chat": "%s学科\n",
"role": ["请扮演[%s%s]老师角色，依据我提供的数据，对%s的表现做一个整体的评价。 数据如下：\n "],
"chat": ["%s的学科\n"],
"cycleChats": [" 考核纬度：%s；一级知识点：%s；二级知识点 %s；得分：%s/%s 得分率：%s\n"],
"end": "根据我提供的【%s学科】的表现做一个整体的评价。 \n"
"end": ["请根据我提供的数据，对%s的表现做一个整体的评价。 \n"],
"limit": "。限制条件如下：1、%s字左右；2、直接返回评语的内容；3、评语的开篇不允许出现提示语；4、评语的开篇不允许出现特殊字符。"
}
]
}

Write Preview
Loading…
Cancel
Save