From 08675d26d73c60e1c593e901e09588acf2c39233 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 10 四月 2026 20:03:47 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 51 +++++++++++++++++++--------------------------------
1 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 56d9001..5fb7a02 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -52,24 +52,17 @@
if(Objects.isNull(category)
|| Objects.isNull(category.getType())
|| Objects.isNull(category.getName())
- || (!Constants.equalsInteger(category.getType(),Constants.ZERO)&& CollectionUtils.isEmpty(category.getDetailList()))
- || (Constants.equalsInteger(category.getType(),Constants.ONE) && (Objects.isNull(category.getIcon())||Objects.isNull(category.getIsFixed())) )
+ || StringUtils.isBlank(category.getDetail())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ validateByType(category);
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
category.setDeleted(Constants.ZERO);
category.setCreateTime(new Date());
category.setCreateUser(loginUserInfo.getId());
category.setUpdateTime(new Date());
category.setUpdateUser(loginUserInfo.getId());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
- && !Constants.equalsInteger(category.getType(),Constants.THREE)){
- category.setDetail(category.getDetailList().toJSONString());
- }
- if(!Constants.equalsInteger(category.getType(),Constants.ONE)){
- category.setIsFixed(Constants.ZERO);
- }
categoryMapper.insert(category);
return category.getId();
}
@@ -102,19 +95,14 @@
|| Objects.isNull(category.getId())
|| Objects.isNull(category.getType())
|| Objects.isNull(category.getName())
- || (!Constants.equalsInteger(category.getType(),Constants.ZERO)&& CollectionUtils.isEmpty(category.getDetailList()))
- || (Constants.equalsInteger(category.getType(),Constants.ONE) && (Objects.isNull(category.getIcon())||Objects.isNull(category.getIsFixed())) )
+ || StringUtils.isBlank(category.getDetail())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ validateByType(category);
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
category.setUpdateTime(new Date());
- category.setIsFixed(null);
category.setUpdateUser(loginUserInfo.getId());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())
- && !Constants.equalsInteger(category.getType(),Constants.THREE)){
- category.setDetail(category.getDetailList().toJSONString());
- }
categoryMapper.updateById(category);
}
@Override
@@ -125,11 +113,7 @@
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
category.setUpdateTime(new Date());
- category.setIsFixed(null);
category.setUpdateUser(loginUserInfo.getId());
- if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
- category.setDetail(category.getDetailList().toJSONString());
- }
categoryMapper.updateById(category);
}
@@ -148,9 +132,6 @@
Category category = categoryMapper.selectById(id);
if(Objects.isNull(category)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
- }
- if(StringUtils.isNotBlank(category.getDetail())){
- category.setDetailList(JSONArray.parseArray(category.getDetail()));
}
if(StringUtils.isNotBlank(category.getIcon())){
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
@@ -219,9 +200,6 @@
if (pageWrap.getModel().getIcon() != null) {
queryWrapper.eq(Category::getIcon, pageWrap.getModel().getIcon());
}
- if (pageWrap.getModel().getIsFixed() != null) {
- queryWrapper.eq(Category::getIsFixed, pageWrap.getModel().getIsFixed());
- }
queryWrapper.orderByAsc(Category::getSortnum);
PageData<Category> result =PageData.from(categoryMapper.selectJoinPage(page, Category.class,queryWrapper));
if(result!=null && result.getRecords()!=null){
@@ -229,9 +207,6 @@
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
for(Category cate : result.getRecords()){
try {
- if(StringUtils.isNotBlank(cate.getDetail())){
- cate.setDetailList(JSONArray.parseArray(cate.getDetail()));
- }
if(StringUtils.isNotBlank(cate.getIcon())){
cate.setIconFull(path + cate.getIcon());
}
@@ -259,9 +234,6 @@
String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
for (Category category:categoryList) {
- if(StringUtils.isNotBlank(category.getDetail())){
- category.setDetailList(JSONArray.parseArray(category.getDetail()));
- }
if(StringUtils.isNotBlank(category.getIcon())){
category.setIconFull(path + category.getIcon());
}
@@ -270,5 +242,20 @@
return categoryList;
}
+ private void validateByType(Category category) {
+ if (Constants.equalsInteger(category.getType(), Constants.ONE)) {
+ if (StringUtils.isBlank(category.getOtherField())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "杞﹁締绫诲瀷蹇呴』濉啓闄勫睘瀛楁");
+ }
+ } else if (Constants.equalsInteger(category.getType(), Constants.TWO)) {
+ if (Objects.isNull(category.getRelationId())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐗╁搧鍒嗙被蹇呴』閫夋嫨鍏宠仈鐗╁搧绛夌骇");
+ }
+ } else if (Constants.equalsInteger(category.getType(), Constants.FOUR)) {
+ if (StringUtils.isBlank(category.getIcon())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐗╁搧灏哄蹇呴』涓婁紶鍥炬爣");
+ }
+ }
+ }
}
--
Gitblit v1.9.3