From bed2cb1ff0f73cebfcfc95a888f3687c6daf7b63 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 15 七月 2025 14:52:02 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java |   67 ++++++++++++++++++++++++++++++++-
 1 files changed, 65 insertions(+), 2 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 1120c1f..2dd7779 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
@@ -1,7 +1,12 @@
 package com.doumee.service.business.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.Constants;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.core.utils.Utils;
@@ -21,7 +26,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 鍒嗙被淇℃伅琛⊿ervice瀹炵幇
@@ -34,15 +41,38 @@
     @Autowired
     private CategoryMapper categoryMapper;
 
+    @Autowired
+    private SystemDictDataBiz systemDictDataBiz;
+
     @Override
     public Integer create(Category category) {
+        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())) )
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+        category.setCreateTime(new Date());
+        category.setDeleted(Constants.ZERO);
+        category.setCreateUser(loginUserInfo.getId());
+        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(category.getDetailList())){
+            category.setDetail(category.getDetailList().toJSONString());
+        }
+        if(!Constants.equalsInteger(category.getType(),Constants.ONE)){
+            category.setIsFixed(Constants.ZERO);
+        }
         categoryMapper.insert(category);
         return category.getId();
     }
 
     @Override
     public void deleteById(Integer id) {
-        categoryMapper.deleteById(id);
+        categoryMapper.update(new UpdateWrapper<Category>().lambda().set(Category::getDeleted,Constants.ONE).eq(Category::getId,id));
+
+//        categoryMapper.deleteById(id);
     }
 
     @Override
@@ -61,6 +91,22 @@
 
     @Override
     public void updateById(Category category) {
+        if(Objects.isNull(category)
+                || 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())) )
+        ){
+            throw new BusinessException(ResponseStatus.BAD_REQUEST);
+        }
+        LoginUserInfo loginUserInfo = category.getLoginUserInfo();
+        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);
     }
 
@@ -76,7 +122,19 @@
 
     @Override
     public Category findById(Integer id) {
-        return categoryMapper.selectById(id);
+        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()
+                    +systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.CATEGORY_FILES).getCode();
+            category.setIconFull(path + category.getIcon());
+        }
+        return category;
     }
 
     @Override
@@ -144,11 +202,16 @@
         queryWrapper.orderByAsc(Category::getSortnum);
         PageData<Category> result =PageData.from(categoryMapper.selectJoinPage(page, Category.class,queryWrapper));
         if(result!=null && result.getRecords()!=null){
+            String path  = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.RESOURCE_PATH).getCode()
+                    +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());
+                    }
                 }catch (Exception e){
 
                 }

--
Gitblit v1.9.3