wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端和json优化

Browse Source
This commit is contained in:
wangys
2025-11-28 17:16:17 +08:00
parent 34e69c7f62
commit dfb11c85f1
135 changed files with 930 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
schoolNewsServ/common/common-core/pom.xml
View File

@@ -30,5 +30,17 @@
<artifactId>jjwt-api</artifactId>
<scope>provided</scope>
</dependency>
<!-- FastJson2 - JSON序列化工具 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<!-- FastJson2 Spring6 支持 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2-extension-spring6</artifactId>
</dependency>
</dependencies>
</project>

50
schoolNewsServ/common/common-core/src/main/java/org/xyzh/common/config/properties/FastJsonConfiguration.java Normal file
View File

@@ -0,0 +1,50 @@
package org.xyzh.common.config.properties;
import com.alibaba.fastjson2.support.config.FastJsonConfig;
import com.alibaba.fastjson2.support.spring6.http.converter.FastJsonHttpMessageConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.List;
/**
* @description FastJson配置类 - 统一处理日期时间格式序列化
* @filename FastJsonConfig.java
* @author yslg
* @copyright xyzh
* @since 2025-11-28
*/
@Configuration
public class FastJsonConfiguration implements WebMvcConfigurer {
/**
* 配置FastJson消息转换器
*/
@Override
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
// FastJson配置
FastJsonConfig config = new FastJsonConfig();
// 设置日期格式
config.setDateFormat("yyyy-MM-dd HH:mm:ss");
// 设置字符集
converter.setDefaultCharset(StandardCharsets.UTF_8);
// 设置支持的MediaType
converter.setSupportedMediaTypes(Collections.singletonList(MediaType.APPLICATION_JSON));
// 应用配置
converter.setFastJsonConfig(config);
// 添加到转换器列表（添加到最前面，优先使用）
converters.add(0, converter);
}
}

4
schoolNewsServ/common/common-dto/pom.xml
View File

@@ -22,6 +22,10 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
</dependencies>
</project>

6
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.alibaba.fastjson2.annotation.JSONField;
/**
* @description BaseDTO.java文件描述
@@ -20,6 +21,7 @@ public class BaseDTO implements Serializable{
* @author yslg
* @since 2025-09-10
*/
@JSONField(name="id")
private String id;
/**
@@ -100,7 +102,7 @@ public class BaseDTO implements Serializable{
* @author yslg
* @since 2025-09-10
*/
public String getID() {
public String getId() {
return this.id;
}
@@ -110,7 +112,7 @@ public class BaseDTO implements Serializable{
* @author yslg
* @since 2025-09-10
*/
public void setID(String id) {
public void setId(String id) {
this.id = id;
}

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiAgentConfig.java
View File

@@ -136,7 +136,7 @@ public class TbAiAgentConfig extends BaseDTO {
@Override
public String toString() {
return "TbAiAgentConfig{" +
"id=" + getID() +
"id=" + getId() +
", name='" + name + '\'' +
", connectInternet=" + connectInternet +
", difyAppId='" + difyAppId + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiConversation.java
View File

@@ -160,7 +160,7 @@ public class TbAiConversation extends BaseDTO {
@Override
public String toString() {
return "TbAiConversation{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", title='" + title + '\'' +
", status=" + status +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiKnowledge.java
View File

@@ -408,7 +408,7 @@ public class TbAiKnowledge extends BaseDTO {
@Override
public String toString() {
return "TbAiKnowledge{" +
"id=" + getID() +
"id=" + getId() +
", title='" + title + '\'' +
", sourceType=" + sourceType +
", category='" + category + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiMessage.java
View File

@@ -169,7 +169,7 @@ public class TbAiMessage extends BaseDTO {
@Override
public String toString() {
return "TbAiMessage{" +
"id=" + getID() +
"id=" + getId() +
", conversationID='" + conversationID + '\'' +
", userID='" + userID + '\'' +
", role='" + role + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUploadFile.java
View File

@@ -262,7 +262,7 @@ public class TbAiUploadFile extends BaseDTO {
@Override
public String toString() {
return "TbAiUploadFile{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", conversationID='" + conversationID + '\'' +
", fileName='" + fileName + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/ai/TbAiUsageStatistics.java
View File

@@ -121,7 +121,7 @@ public class TbAiUsageStatistics extends BaseDTO {
@Override
public String toString() {
return "TbAiUsageStatistics{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", statDate=" + statDate +
", conversationCount=" + conversationCount +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailDefault.java
View File

@@ -106,7 +106,7 @@ public class TbCrontabEmailDefault extends BaseDTO {
@Override
public String toString() {
return "TbCrontabEmailDefault{" +
"id=" + getID() +
"id=" + getId() +
", defaultId='" + defaultId + '\'' +
", metaId='" + metaId + '\'' +
", userId='" + userId + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabEmailRecipient.java
View File

@@ -107,7 +107,7 @@ public class TbCrontabEmailRecipient extends BaseDTO {
@Override
public String toString() {
return "TbCrontabEmailRecipient{" +
"id=" + getID() +
"id=" + getId() +
", recipientId='" + recipientId + '\'' +
", taskId='" + taskId + '\'' +
", userId='" + userId + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabLog.java
View File

@@ -174,7 +174,7 @@ public class TbCrontabLog extends BaseDTO {
@Override
public String toString() {
return "TbCrontabLog{" +
"id=" + getID() +
"id=" + getId() +
", taskId='" + taskId + '\'' +
", taskName='" + taskName + '\'' +
", taskGroup='" + taskGroup + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTask.java
View File

@@ -237,7 +237,7 @@ public class TbCrontabTask extends BaseDTO {
@Override
public String toString() {
return "TbCrontabTask{" +
"id=" + getID() +
"id=" + getId() +
", taskId='" + taskId + '\'' +
", taskName='" + taskName + '\'' +
", taskGroup='" + taskGroup + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/crontab/TbCrontabTaskMeta.java
View File

@@ -172,7 +172,7 @@ public class TbCrontabTaskMeta extends BaseDTO {
@Override
public String toString() {
return "TbCrontabTaskMeta{" +
"id=" + getID() +
"id=" + getId() +
", metaId='" + metaId + '\'' +
", name='" + name + '\'' +
", category='" + category + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDept.java
View File

@@ -121,7 +121,7 @@ public class TbSysDept extends BaseDTO{
@Override
public String toString() {
return "TbSysDept{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", deptID='" + deptID + '\'' +
", parentID='" + parentID + '\'' +
", deptPath='" + deptPath + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/dept/TbSysDeptRole.java
View File

@@ -95,7 +95,7 @@ public class TbSysDeptRole extends BaseDTO {
@Override
public String toString() {
return "TbSysDeptRole{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", deptID='" + deptID + '\'' +
", roleID='" + roleID + '\'' +
", creator='" + creator + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenu.java
View File

@@ -193,7 +193,7 @@ public class TbSysMenu extends BaseDTO {
@Override
public String toString() {
return "TbSysMenu{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", menuID='" + menuID + '\'' +
", parentID='" + parentID + '\'' +
", name='" + name + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/menu/TbSysMenuPermission.java
View File

@@ -75,7 +75,7 @@ public class TbSysMenuPermission extends BaseDTO{
@Override
public String toString() {
return "TbSysMenuPermission{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", menuID='" + menuID + '\'' +
", permissionID='" + permissionID + '\'' +
", creator='" + creator + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbResourcePermission.java
View File

@@ -133,7 +133,7 @@ public class TbResourcePermission extends BaseDTO {
@Override
public String toString() {
return "TbResourcePermission{" +
"id=" + getID() +
"id=" + getId() +
", resourceType=" + resourceType +
", resourceID='" + resourceID + '\'' +
", deptID='" + deptID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/permission/TbSysPermission.java
View File

@@ -120,7 +120,7 @@ public class TbSysPermission extends BaseDTO{
@Override
public String toString() {
return "TbSysPermission{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", permissionID='" + permissionID + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbBanner.java
View File

@@ -143,7 +143,7 @@ public class TbBanner extends BaseDTO {
@Override
public String toString() {
return "TbBanner{" +
"id=" + getID() +
"id=" + getId() +
", bannerID='" + bannerID + '\'' +
", title='" + title + '\'' +
", imageUrl='" + imageUrl + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResource.java
View File

@@ -266,7 +266,7 @@ public class TbResource extends BaseDTO {
@Override
public String toString() {
return "TbResource{" +
"id=" + getID() +
"id=" + getId() +
", resourceID='" + resourceID + '\'' +
", title='" + title + '\'' +
", tagID='" + tagID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceRecommend.java
View File

@@ -94,7 +94,7 @@ public class TbResourceRecommend extends BaseDTO {
@Override
public String toString() {
return "TbResourceRecommend{" +
"id=" + getID() +
"id=" + getId() +
", resourceID='" + resourceID + '\'' +
", recommendType=" + recommendType +
", orderNum=" + orderNum +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbResourceTag.java
View File

@@ -55,7 +55,7 @@ public class TbResourceTag extends BaseDTO {
@Override
public String toString() {
return "TbResourceTag{" +
"id=" + getID() +
"id=" + getId() +
", resourceID='" + resourceID + '\'' +
", tagID='" + tagID + '\'' +
", createTime=" + getCreateTime() +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/resource/TbTag.java
View File

@@ -107,7 +107,7 @@ public class TbTag extends BaseDTO {
@Override
public String toString() {
return "TbTag{" +
"id=" + getID() +
"id=" + getId() +
", tagID='" + tagID + '\'' +
", name='" + name + '\'' +
", color='" + color + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRole.java
View File

@@ -90,7 +90,7 @@ public class TbSysRole extends BaseDTO {
@Override
public String toString() {
return "TbSysRole{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
",roleID='" + roleID + '\'' +
", name='" + name + '\'' +
", description='" + description + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/role/TbSysRolePermission.java
View File

@@ -74,7 +74,7 @@ public class TbSysRolePermission extends BaseDTO{
@Override
public String toString() {
return "TbSysRolePermission{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", roleID='" + roleID + '\'' +
", permissionID='" + permissionID + '\'' +
", creator='" + creator + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourse.java
View File

@@ -217,7 +217,7 @@ public class TbCourse extends BaseDTO {
@Override
public String toString() {
return "TbCourse{" +
"id=" + getID() +
"id=" + getId() +
", courseID='" + courseID + '\'' +
", name='" + name + '\'' +
", coverImage='" + coverImage + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseChapter.java
View File

@@ -201,7 +201,7 @@ public class TbCourseChapter extends BaseDTO {
@Override
public String toString() {
return "TbCourseChapter{" +
"id=" + getID() +
"id=" + getId() +
", chapterID='" + chapterID + '\'' +
", courseID='" + courseID + '\'' +
", parentID='" + parentID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseNode.java
View File

@@ -212,7 +212,7 @@ public class TbCourseNode extends BaseDTO {
@Override
public String toString() {
return "TbCourseNode{" +
"id=" + getID() +
"id=" + getId() +
", nodeID='" + nodeID + '\'' +
", chapterID='" + chapterID + '\'' +
", name='" + name + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbCourseTag.java
View File

@@ -99,7 +99,7 @@ public class TbCourseTag extends BaseDTO {
@Override
public String toString() {
return "TbCourseTag{" +
"id=" + getID() +
"id=" + getId() +
", courseID='" + courseID + '\'' +
", tagID='" + tagID + '\'' +
", createTime=" + getCreateTime() +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningHistory.java
View File

@@ -226,7 +226,7 @@ public class TbLearningHistory extends BaseDTO {
@Override
public String toString() {
return "TbLearningHistory{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", historyID='" + historyID + '\'' +
", resourceType=" + resourceType +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningRecord.java
View File

@@ -228,7 +228,7 @@ public class TbLearningRecord extends BaseDTO {
@Override
public String toString() {
return "TbLearningRecord{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", taskID='" + taskID + '\'' +
", resourceType=" + resourceType +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatistics.java
View File

@@ -166,7 +166,7 @@ public class TbLearningStatistics extends BaseDTO {
@Override
public String toString() {
return "TbLearningStatistics{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", statDate=" + statDate +
", totalDuration=" + totalDuration +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningStatisticsDetail.java
View File

@@ -173,7 +173,7 @@ public class TbLearningStatisticsDetail extends BaseDTO {
@Override
public String toString() {
return "TbLearningStatisticsDetail{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", statDate=" + statDate +
", resourceType=" + resourceType +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTask.java
View File

@@ -154,7 +154,7 @@ public class TbLearningTask extends BaseDTO {
@Override
public String toString() {
return "TbLearningTask{" +
"id=" + getID() +
"id=" + getId() +
", taskID='" + taskID + '\'' +
", name='" + name + '\'' +
", startTime=" + startTime +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbLearningTaskTag.java
View File

@@ -54,7 +54,7 @@ public class TbLearningTaskTag extends BaseDTO {
@Override
public String toString() {
return "TbLearningTaskTag{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", taskID='" + taskID + '\'' +
", tagID='" + tagID + '\'' +
", creator='" + creator + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskItem.java
View File

@@ -111,7 +111,7 @@ public class TbTaskItem extends BaseDTO {
@Override
public String toString() {
return "TbTaskItem{" +
"id=" + getID() +
"id=" + getId() +
", taskID='" + taskID + '\'' +
", itemType=" + itemType +
", itemID='" + itemID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/study/TbTaskUser.java
View File

@@ -154,7 +154,7 @@ public class TbTaskUser extends BaseDTO {
@Override
public String toString() {
return "TbTaskUser{" +
"id=" + getID() +
"id=" + getId() +
", taskID='" + taskID + '\'' +
", userID='" + userID + '\'' +
", deptID='" + deptID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysConfig.java
View File

@@ -250,7 +250,7 @@ public class TbSysConfig extends BaseDTO {
@Override
public String toString() {
return "TbSysConfig{" +
"id=" + getID() +
"id=" + getId() +
", configKey='" + configKey + '\'' +
", configName='" + configName + '\'' +
", configValue='" + configValue + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictData.java
View File

@@ -159,7 +159,7 @@ public class TbSysDictData extends BaseDTO {
@Override
public String toString() {
return "TbSysDictData{" +
"id=" + getID() +
"id=" + getId() +
", dictType='" + dictType + '\'' +
", dictLabel='" + dictLabel + '\'' +
", dictValue='" + dictValue + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysDictType.java
View File

@@ -94,7 +94,7 @@ public class TbSysDictType extends BaseDTO {
@Override
public String toString() {
return "TbSysDictType{" +
"id=" + getID() +
"id=" + getId() +
", dictType='" + dictType + '\'' +
", dictName='" + dictName + '\'' +
", status=" + status +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysLoginLog.java
View File

@@ -181,7 +181,7 @@ public class TbSysLoginLog extends BaseDTO {
@Override
public String toString() {
return "TbSysLoginLog{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", userID='" + userID + '\'' +
", username='" + username + '\'' +
", ipAddress='" + ipAddress + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysModule.java
View File

@@ -133,7 +133,7 @@ public class TbSysModule extends BaseDTO {
@Override
public String toString() {
return "TbSysModule{" +
"id=" + getID() +
"id=" + getId() +
", moduleID='" + moduleID + '\'' +
", name='" + name + '\'' +
", code='" + code + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysNotification.java
View File

@@ -121,7 +121,7 @@ public class TbSysNotification extends BaseDTO {
@Override
public String toString() {
return "TbSysNotification{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", type=" + type +
", title='" + title + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysOperationLog.java
View File

@@ -224,7 +224,7 @@ public class TbSysOperationLog extends BaseDTO {
@Override
public String toString() {
return "TbSysOperationLog{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", username='" + username + '\'' +
", module='" + module + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/system/TbSysVisitStatistics.java
View File

@@ -108,7 +108,7 @@ public class TbSysVisitStatistics extends BaseDTO {
@Override
public String toString() {
return "TbSysVisitStatistics{" +
"id=" + getID() +
"id=" + getId() +
", statDate=" + statDate +
", totalVisits=" + totalVisits +
", uniqueVisitors=" + uniqueVisitors +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUser.java
View File

@@ -107,7 +107,7 @@ public class TbSysUser extends BaseDTO {
@Override
public String toString() {
return "TbSysUser{" +
"id=" + getID() +
"id=" + getId() +
", username='" + username + '\'' +
", password='" + password + '\'' +
", email='" + email + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserDeptRole.java
View File

@@ -91,7 +91,7 @@ public class TbSysUserDeptRole extends BaseDTO{
@Override
public String toString() {
return "TbSysUserDeptRole{" +
"id='" + getID() + '\'' +
"id='" + getId() + '\'' +
", userID='" + userID + '\'' +
", deptID='" + deptID + '\'' +
", roleID='" + roleID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/user/TbSysUserInfo.java
View File

@@ -167,7 +167,7 @@ public class TbSysUserInfo extends BaseDTO {
@Override
public String toString() {
return "TbSysUserInfo{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", avatar='" + avatar + '\'' +
", gender=" + gender +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbAchievement.java
View File

@@ -172,7 +172,7 @@ public class TbAchievement extends BaseDTO {
@Override
public String toString() {
return "TbAchievement{" +
"id=" + getID() +
"id=" + getId() +
", achievementID='" + achievementID + '\'' +
", name='" + name + '\'' +
", type=" + type +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbPointsRecord.java
View File

@@ -94,7 +94,7 @@ public class TbPointsRecord extends BaseDTO {
@Override
public String toString() {
return "TbPointsRecord{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", points=" + points +
", type=" + type +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievement.java
View File

@@ -56,7 +56,7 @@ public class TbUserAchievement extends BaseDTO {
@Override
public String toString() {
return "TbUserAchievement{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", achievementID='" + achievementID + '\'' +
", obtainTime=" + obtainTime +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserAchievementProgress.java
View File

@@ -120,7 +120,7 @@ public class TbUserAchievementProgress extends BaseDTO {
@Override
public String toString() {
return "TbUserAchievementProgress{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", achievementID='" + achievementID + '\'' +
", currentValue=" + currentValue +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserBrowseRecord.java
View File

@@ -82,7 +82,7 @@ public class TbUserBrowseRecord extends BaseDTO {
@Override
public String toString() {
return "TbUserBrowseRecord{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", browseType=" + browseType +
", browseID='" + browseID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserCollection.java
View File

@@ -68,7 +68,7 @@ public class TbUserCollection extends BaseDTO {
@Override
public String toString() {
return "TbUserCollection{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", collectionType=" + collectionType +
", collectionID='" + collectionID + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/dto/usercenter/TbUserPoints.java
View File

@@ -68,7 +68,7 @@ public class TbUserPoints extends BaseDTO {
@Override
public String toString() {
return "TbUserPoints{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", totalPoints=" + totalPoints +
", currentPoints=" + currentPoints +

4
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/AchievementVO.java
View File

@@ -19,7 +19,7 @@ public class AchievementVO extends TbAchievement {
// ==================== TbUserAchievement表的字段 ====================
/**
* @description 用户成就记录ID（tb_user_achievement.ID）
* @description 用户成就记录ID（tb_user_achievement.id）
*/
private String userAchievementID;
@@ -36,7 +36,7 @@ public class AchievementVO extends TbAchievement {
// ==================== TbUserAchievementProgress表的字段 ====================
/**
* @description 进度记录ID（tb_user_achievement_progress.ID）
* @description 进度记录ID（tb_user_achievement_progress.id）
*/
private String progressID;

16
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/CourseItemVO.java
View File

@@ -387,7 +387,7 @@ public class CourseItemVO extends BaseDTO {
*/
public TbCourse toCourse() {
TbCourse course = new TbCourse();
course.setID(this.getID());
course.setId(this.getId());
course.setCourseID(this.courseID);
course.setName(this.name);
course.setCoverImage(this.coverImage);
@@ -412,7 +412,7 @@ public class CourseItemVO extends BaseDTO {
}
CourseItemVO vo = new CourseItemVO();
vo.setID(course.getID());
vo.setId(course.getId());
vo.setCourseID(course.getCourseID());
vo.setName(course.getName());
vo.setCoverImage(course.getCoverImage());
@@ -434,7 +434,7 @@ public class CourseItemVO extends BaseDTO {
TbLearningRecord record = new TbLearningRecord();
if (this.recordID != null) {
// 如果有recordID，说明是从已有记录转换的，需要设置ID
record.setID(this.recordID);
record.setId(this.recordID);
}
record.setCourseID(this.courseID);
record.setDuration(this.learningDuration);
@@ -454,7 +454,7 @@ public class CourseItemVO extends BaseDTO {
return;
}
this.recordID = record.getID();
this.recordID = record.getId();
this.progress = record.getProgress();
this.isComplete = record.getIsComplete();
this.learningDuration = record.getDuration();
@@ -487,7 +487,7 @@ public class CourseItemVO extends BaseDTO {
}
CourseItemVO vo = new CourseItemVO();
vo.setID(chapter.getID());
vo.setId(chapter.getId());
vo.setChapterID(chapter.getChapterID());
vo.setCourseID(chapter.getCourseID());
vo.setParentID(chapter.getParentID());
@@ -513,7 +513,7 @@ public class CourseItemVO extends BaseDTO {
}
CourseItemVO vo = new CourseItemVO();
vo.setID(node.getID());
vo.setId(node.getId());
vo.setNodeID(node.getNodeID());
vo.setChapterID(node.getChapterID());
vo.setName(node.getName());
@@ -535,7 +535,7 @@ public class CourseItemVO extends BaseDTO {
*/
public TbCourseChapter toChapter() {
TbCourseChapter chapter = new TbCourseChapter();
chapter.setID(this.getID());
chapter.setId(this.getId());
chapter.setChapterID(this.chapterID);
chapter.setCourseID(this.courseID);
chapter.setParentID(this.parentID);
@@ -555,7 +555,7 @@ public class CourseItemVO extends BaseDTO {
*/
public TbCourseNode toNode() {
TbCourseNode node = new TbCourseNode();
node.setID(this.getID());
node.setId(this.getId());
node.setNodeID(this.nodeID);
node.setChapterID(this.chapterID);
node.setName(this.name);

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/ResourcePermissionVO.java
View File

@@ -98,7 +98,7 @@ public class ResourcePermissionVO extends TbResourcePermission {
@Override
public String toString() {
return "ResourcePermissionVO{" +
"id=" + getID() +
"id=" + getId() +
", resourceType=" + getResourceType() +
", resourceID='" + getResourceID() + '\'' +
", resourceTitle='" + resourceTitle + '\'' +

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TagVO.java
View File

@@ -81,7 +81,7 @@ public class TagVO extends BaseDTO {
}
public TbTag getTag() {
TbTag tag = new TbTag();
tag.setID(tagID);
tag.setId(tagID);
tag.setName(tagName);
tag.setColor(tagColor);
return tag;

4
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java
View File

@@ -67,7 +67,7 @@ public class TaskItemVO extends TbLearningTask {
this.setTaskID(taskItem.getTaskID());
this.orderNum = taskItem.getOrderNum();
this.required = taskItem.getRequired();
this.setID(taskItem.getID());
this.setId(taskItem.getId());
this.setCreateTime(taskItem.getCreateTime());
this.setCreator(taskItem.getCreator());
@@ -140,7 +140,7 @@ public class TaskItemVO extends TbLearningTask {
public TbTaskItem toTaskItem() {
TbTaskItem taskItem = new TbTaskItem();
taskItem.setID(getID());
taskItem.setId(getId());
taskItem.setTaskID(getTaskID());
taskItem.setItemType(itemType);
taskItem.setRequired(required);

2
schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/UserCollectionVO.java
View File

@@ -344,7 +344,7 @@ public class UserCollectionVO extends BaseDTO {
@Override
public String toString() {
return "UserCollectionVO{" +
"id=" + getID() +
"id=" + getId() +
", userID='" + userID + '\'' +
", collectionType=" + collectionType +
", collectionID='" + collectionID + '\'' +