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

20
schoolNewsServ/achievement/src/main/java/org/xyzh/achievement/service/impl/ACHAchievementServiceImpl.java
View File

@@ -90,8 +90,8 @@ public class ACHAchievementServiceImpl implements AchievementService {
}
// 设置默认值
if (achievement.getID() == null) {
achievement.setID(IDUtils.generateID());
if (achievement.getId() == null) {
achievement.setId(IDUtils.generateID());
}
if (achievement.getAchievementID() == null) {
achievement.setAchievementID(IDUtils.generateID());
@@ -285,7 +285,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
return rd;
}
String userID = user.getID();
String userID = user.getId();
// 仅查询等级类成就
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
List<AchievementVO> levels = achievementMapper.selectUserAchievementsWithProgress(
@@ -371,7 +371,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
for (AchievementVO vo : voList) {
if (Boolean.TRUE.equals(vo.getObtained())) {
TbUserAchievement ua = new TbUserAchievement();
ua.setID(vo.getUserAchievementID());
ua.setId(vo.getUserAchievementID());
ua.setUserID(userID);
ua.setAchievementID(vo.getAchievementID());
ua.setObtainTime(vo.getObtainTime());
@@ -396,7 +396,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
resultDomain.fail("请先登录");
return resultDomain;
}
return getUserAchievements(user.getID(), type);
return getUserAchievements(user.getId(), type);
}
@Override
@@ -410,7 +410,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
return resultDomain;
}
String userID = user.getID();
String userID = user.getId();
// 使用联表查询一次性获取所有数据（包含成就、用户成就、进度信息及权限过滤）
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
@@ -474,7 +474,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
// 创建用户成就记录
TbUserAchievement userAchievement = new TbUserAchievement();
userAchievement.setID(IDUtils.generateID());
userAchievement.setId(IDUtils.generateID());
userAchievement.setUserID(userID);
userAchievement.setAchievementID(achievementID);
userAchievement.setObtainTime(new Date());
@@ -559,7 +559,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
resultDomain.fail("请先登录");
return resultDomain;
}
return getUserAchievementProgress(user.getID(), achievementID);
return getUserAchievementProgress(user.getId(), achievementID);
}
@Override
@@ -812,7 +812,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
}
progress = new TbUserAchievementProgress();
progress.setID(IDUtils.generateID());
progress.setId(IDUtils.generateID());
progress.setUserID(userID);
progress.setAchievementID(achievementID);
progress.setCurrentValue(0);
@@ -845,7 +845,7 @@ public class ACHAchievementServiceImpl implements AchievementService {
private TbUserAchievement grantAchievementInternal(String userID, TbAchievement achievement) {
try {
TbUserAchievement userAchievement = new TbUserAchievement();
userAchievement.setID(IDUtils.generateID());
userAchievement.setId(IDUtils.generateID());
userAchievement.setUserID(userID);
userAchievement.setAchievementID(achievement.getAchievementID());
userAchievement.setObtainTime(new Date());

10
schoolNewsServ/achievement/src/main/resources/mapper/AchievementMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.usercenter.TbAchievement">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="achievement_id" property="achievementID" />
<result column="name" property="name" />
<result column="description" property="description" />
@@ -34,8 +34,8 @@
<sql id="Base_Where_Clause">
<where>
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND id = #{filter.id}
</if>
<if test="filter.achievementID != null and filter.achievementID != ''">
AND achievement_id = #{filter.achievementID}
@@ -254,7 +254,7 @@
) VALUES
<foreach collection="achievementList" item="item" separator=",">
(
#{item.ID}, #{item.achievementID}, #{item.name}, #{item.description}, #{item.icon},
#{item.id}, #{item.achievementID}, #{item.name}, #{item.description}, #{item.icon},
#{item.type}, #{item.level}, #{item.conditionType}, #{item.conditionValue},
#{item.points}, #{item.orderNum}, #{item.creator}, #{item.updater},
#{item.createTime}, #{item.updateTime}, #{item.deleteTime}, #{item.deleted}
@@ -327,7 +327,7 @@
<!-- AchievementVO 结果映射（包含用户成就和进度信息） -->
<resultMap id="AchievementVOResultMap" type="org.xyzh.common.vo.AchievementVO">
<!-- 成就基本信息 -->
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="achievement_id" property="achievementID" />
<result column="name" property="name" />
<result column="description" property="description" />

8
schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.usercenter.TbUserAchievement">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="user_id" property="userID" />
<result column="achievement_id" property="achievementID" />
<result column="obtain_time" property="obtainTime" />
@@ -19,8 +19,8 @@
<sql id="Base_Where_Clause">
<where>
<if test="filter != null">
<if test="filter.ID != null and filter.ID != ''">
AND ua.id = #{filter.ID}
<if test="filter.id != null and filter.id != ''">
AND ua.id = #{filter.id}
</if>
<if test="filter.userID != null and filter.userID != ''">
AND ua.user_id = #{filter.userID}
@@ -158,7 +158,7 @@
) VALUES
<foreach collection="userAchievementList" item="item" separator=",">
(
#{item.ID}, #{item.userID}, #{item.achievementID}, #{item.obtainTime}
#{item.id}, #{item.userID}, #{item.achievementID}, #{item.obtainTime}
)
</foreach>
</insert>

4
schoolNewsServ/achievement/src/main/resources/mapper/UserAchievementProgressMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.usercenter.TbUserAchievementProgress">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="user_id" property="userID" />
<result column="achievement_id" property="achievementID" />
<result column="current_value" property="currentValue" />
@@ -112,7 +112,7 @@
) VALUES
<foreach collection="progressList" item="item" separator=",">
(
#{item.ID}, #{item.userID}, #{item.achievementID}, #{item.currentValue},
#{item.id}, #{item.userID}, #{item.achievementID}, #{item.currentValue},
#{item.targetValue}, #{item.progressPercentage}, #{item.completed},
#{item.lastUpdateTime}, #{item.createTime}
)