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

2
schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceController.java
View File

@@ -81,7 +81,7 @@ public class ResourceController {
result.fail("请先登录");
return result;
}
resourceVO.getResource().setCreator(user.getID());
resourceVO.getResource().setCreator(user.getId());
resourceVO.getResource().setAuthor(user.getUsername());
Date now = new Date();
resourceVO.getResource().setCreateTime(now);

4
schoolNewsServ/news/src/main/java/org/xyzh/news/controller/ResourceRecommendController.java
View File

@@ -47,7 +47,7 @@ public class ResourceRecommendController {
@GetMapping("/recommend/{recommendID}")
public ResultDomain<ResourceRecommendVO> getRecommendById(@PathVariable("recommendID") String recommendID) {
TbResourceRecommend filter = new TbResourceRecommend();
filter.setID(recommendID);
filter.setId(recommendID);
PageParam pageParam = new PageParam();
pageParam.setPageNumber(1);
pageParam.setPageSize(1);
@@ -72,7 +72,7 @@ public class ResourceRecommendController {
TbSysUser user = LoginUtil.getCurrentUser();
if (user != null) {
if (recommend.getCreator() == null) {
recommend.setCreator(user.getID());
recommend.setCreator(user.getId());
}
}
return resourceRecommendService.addRecommend(recommend);

4
schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCBannerServiceImpl.java
View File

@@ -92,8 +92,8 @@ public class NCBannerServiceImpl implements BannerService {
}
// 设置默认值
if (banner.getID() == null) {
banner.setID(IDUtils.generateID());
if (banner.getId() == null) {
banner.setId(IDUtils.generateID());
}
banner.setBannerID(IDUtils.generateID());
banner.setCreateTime(new Date());

20
schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceRecommendServiceImpl.java
View File

@@ -81,8 +81,8 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
}
// 设置默认值
if (recommend.getID() == null) {
recommend.setID(IDUtils.generateID());
if (recommend.getId() == null) {
recommend.setId(IDUtils.generateID());
}
recommend.setCreateTime(new Date());
@@ -117,13 +117,13 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
ResultDomain<TbResourceRecommend> resultDomain = new ResultDomain<>();
try {
// 参数验证
if (recommend == null || !StringUtils.hasText(recommend.getID())) {
if (recommend == null || !StringUtils.hasText(recommend.getId())) {
resultDomain.fail("推荐ID不能为空");
return resultDomain;
}
// 检查推荐是否存在
TbResourceRecommend existing = resourceRecommendMapper.selectById(recommend.getID());
TbResourceRecommend existing = resourceRecommendMapper.selectById(recommend.getId());
if (existing == null || existing.getDeleted()) {
resultDomain.fail("推荐不存在");
return resultDomain;
@@ -135,9 +135,9 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
// 更新数据库
int result = resourceRecommendMapper.updateResourceRecommend(recommend);
if (result > 0) {
logger.info("更新推荐成功: {}", recommend.getID());
logger.info("更新推荐成功: {}", recommend.getId());
// 重新查询返回完整数据
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID());
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId());
resultDomain.success("更新推荐成功", updated);
return resultDomain;
} else {
@@ -227,7 +227,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
}
TbResourceRecommend recommend = new TbResourceRecommend();
recommend.setID(IDUtils.generateID());
recommend.setId(IDUtils.generateID());
recommend.setResourceID(resourceID);
recommend.setRecommendType(recommendType);
recommend.setReason(reason);
@@ -281,7 +281,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
List<TbResourceRecommend> recommendList = resourceRecommendMapper.selectByResourceId(resourceID);
if (recommendList != null && !recommendList.isEmpty()) {
for (TbResourceRecommend recommend : recommendList) {
recommendIDs.add(recommend.getID());
recommendIDs.add(recommend.getId());
}
}
}
@@ -388,7 +388,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
if (result > 0) {
logger.info("更新推荐排序成功: {}", resourceID);
// 重新查询返回完整数据
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID());
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId());
resultDomain.success("更新推荐排序成功", updated);
return resultDomain;
} else {
@@ -429,7 +429,7 @@ public class NCResourceRecommendServiceImpl implements ResourceRecommendService
if (result > 0) {
logger.info("更新推荐理由成功: {}", resourceID);
// 重新查询返回完整数据
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getID());
TbResourceRecommend updated = resourceRecommendMapper.selectById(recommend.getId());
resultDomain.success("更新推荐理由成功", updated);
return resultDomain;
} else {

35
schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCResourceServiceImpl.java
View File

@@ -16,6 +16,7 @@ import org.xyzh.common.dto.resource.TbTag;
import org.xyzh.common.dto.user.TbSysUser;
import org.xyzh.common.dto.usercenter.TbUserCollection;
import org.xyzh.common.utils.IDUtils;
import org.xyzh.common.utils.NonUtils;
import org.xyzh.common.vo.ResourceVO;
import org.xyzh.common.vo.TagVO;
import org.xyzh.common.vo.TaskItemVO;
@@ -90,8 +91,8 @@ public class NCResourceServiceImpl implements ResourceService {
Date now = new Date();
// 填充必要的默认值
for (TbResource res : resources) {
if (res.getID() == null) {
res.setID(IDUtils.generateID());
if (res.getId() == null) {
res.setId(IDUtils.generateID());
}
if (res.getResourceID() == null) {
res.setResourceID(IDUtils.generateID());
@@ -247,8 +248,8 @@ public class NCResourceServiceImpl implements ResourceService {
}
// 设置默认值
if (resourceVO.getResource().getID() == null) {
resourceVO.getResource().setID(IDUtils.generateID());
if (resourceVO.getResource().getId() == null) {
resourceVO.getResource().setId(IDUtils.generateID());
}
if (resourceVO.getResource().getResourceID() == null) {
resourceVO.getResource().setResourceID(IDUtils.generateID());
@@ -284,7 +285,7 @@ public class NCResourceServiceImpl implements ResourceService {
// 进行审核
ResultDomain<String> pass =auditService.auditText(resource.getTitle() + " "+resource.getContent());
if(pass.isSuccess()){
resource.setPublishTime(new Date());
resource.setPublishTime(NonUtils.isNotNull(resourceVO.getResource().getPublishTime())? resourceVO.getResource().getPublishTime() : new Date());
resource.setIsAudited(true);
}else {
auditService.sendAuditResultMessage(resource.getCreator(), "文章"+resource.getTitle(), pass.getDataList());
@@ -299,8 +300,8 @@ public class NCResourceServiceImpl implements ResourceService {
List<TbResourceTag> resourceTagList = new ArrayList<>();
for (TbTag tag : resourceVO.getTags()) {
TbResourceTag resourceTag = new TbResourceTag();
resourceTag.setResourceID(resourceVO.getResource().getID());
resourceTag.setTagID(tag.getID());
resourceTag.setResourceID(resourceVO.getResource().getId());
resourceTag.setTagID(tag.getId());
resourceTagList.add(resourceTag);
}
int resourceTagResult = resourceTagMapper.batchInsertResourceTags(resourceTagList);
@@ -350,7 +351,7 @@ public class NCResourceServiceImpl implements ResourceService {
resultDomain.fail("请先登录");
return resultDomain;
}
resource.setUpdater(user.getID());
resource.setUpdater(user.getId());
try {
// 参数验证
if (resource == null || !StringUtils.hasText(resource.getResourceID())) {
@@ -399,9 +400,9 @@ public class NCResourceServiceImpl implements ResourceService {
Date now = new Date();
// tag先删后增
TbResourceTag resourceTag = new TbResourceTag();
resourceTag.setID(IDUtils.generateID());
resourceTag.setId(IDUtils.generateID());
resourceTag.setResourceID(resource.getResourceID());
resourceTag.setCreator(user.getID());
resourceTag.setCreator(user.getId());
resourceTag.setCreateTime(now);
resourceTag.setDeleted(false);
resourceTag.setTagID(resourceVO.getResource().getTagID());
@@ -528,7 +529,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("更新资源状态成功: {}", resourceID);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("更新资源状态成功", updated);
return resultDomain;
} else {
@@ -585,7 +586,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("发布资源成功: {}", resourceID);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("发布资源成功", updated);
return resultDomain;
} else {
@@ -625,7 +626,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("下架资源成功: {}", resourceID);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("下架资源成功", updated);
return resultDomain;
} else {
@@ -694,7 +695,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("增加资源点赞次数成功: {}", resourceID);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("增加点赞次数成功", updated);
return resultDomain;
} else {
@@ -719,7 +720,7 @@ public class NCResourceServiceImpl implements ResourceService {
resultDomain.fail("请先登录");
return resultDomain;
}
collection.setUserID(user.getID());
collection.setUserID(user.getId());
// 参数验证
if (!StringUtils.hasText(resourceID)) {
resultDomain.fail("资源ID不能为空");
@@ -766,7 +767,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("设置资源推荐状态成功: {} -> {}", resourceID, isRecommend);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("设置推荐状态成功", updated);
return resultDomain;
} else {
@@ -810,7 +811,7 @@ public class NCResourceServiceImpl implements ResourceService {
if (result > 0) {
logger.info("设置资源轮播状态成功: {} -> {}", resourceID, isBanner);
// 重新查询返回完整数据
TbResource updated = resourceMapper.selectByResourceId(resource.getID());
TbResource updated = resourceMapper.selectByResourceId(resource.getId());
resultDomain.success("设置轮播状态成功", updated);
return resultDomain;
} else {

10
schoolNewsServ/news/src/main/java/org/xyzh/news/service/impl/NCTagServiceImpl.java
View File

@@ -66,8 +66,8 @@ public class NCTagServiceImpl implements TagService {
}
// 设置默认值
if (tag.getID() == null) {
tag.setID(IDUtils.generateID());
if (tag.getId() == null) {
tag.setId(IDUtils.generateID());
}
if (tag.getTagID() == null) {
tag.setTagID(IDUtils.generateID());
@@ -126,7 +126,7 @@ public class NCTagServiceImpl implements TagService {
return resultDomain;
}
// 更新时间
tag.setUpdater(user.getID());
tag.setUpdater(user.getId());
tag.setUpdateTime(new Date());
// 更新数据库
@@ -313,7 +313,7 @@ public class NCTagServiceImpl implements TagService {
// 创建关联
TbResourceTag resourceTag = new TbResourceTag();
resourceTag.setID(IDUtils.generateID());
resourceTag.setId(IDUtils.generateID());
resourceTag.setResourceID(resourceID);
resourceTag.setTagID(tagID);
resourceTag.setCreateTime(new Date());
@@ -363,7 +363,7 @@ public class NCTagServiceImpl implements TagService {
// 创建关联
TbResourceTag resourceTag = new TbResourceTag();
resourceTag.setID(IDUtils.generateID());
resourceTag.setId(IDUtils.generateID());
resourceTag.setResourceID(resourceID);
resourceTag.setTagID(tagID);
resourceTag.setCreateTime(new Date());

4
schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml
View File

@@ -206,10 +206,10 @@
<!-- 插入资源 -->
<insert id="insertResource" parameterType="org.xyzh.common.dto.resource.TbResource">
INSERT INTO tb_resource (
id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited,
id, resource_id, title, content, summary, cover_image, tag_id, author, source, is_audited, publish_time,
status,source_url, creator,create_time
) VALUES (
#{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited},
#{id}, #{resourceID}, #{title}, #{content}, #{summary}, #{coverImage}, #{tagID}, #{author}, #{source}, #{isAudited}, #{publistTime}
#{status}, #{sourceUrl}, #{creator}, #{createTime}
)
</insert>