From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 09 十月 2025 18:29:29 +0800
Subject: [PATCH] 钉钉通知 与钥匙柜开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 49b59a4..f1808a3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.service.business.third.model.LoginUserInfo;
@@ -38,6 +39,8 @@
public class CategoryServiceImpl implements CategoryService {
@Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
private CategoryMapper categoryMapper;
@Override
@@ -58,6 +61,7 @@
insert.setRemark(category.getRemark());
insert.setStatus(Constants.ZERO);
insert.setSortnum(category.getSortnum());
+ insert.setBizType(category.getBizType());
insert.setImgurl(category.getImgurl());
insert.setType(category.getType());
insert.setParentId(category.getParentId());
@@ -105,6 +109,7 @@
//娓呯┖鍏朵粬璇izType灞炴��,鍙繚鐣欏綋鍓嶈褰曞敮涓�鏈夋晥
categoryMapper.update(null,new UpdateWrapper<Category>().lambda()
.set(Category::getBizType,null)
+ .eq(Category::getBizType,category.getBizType())
.ne(Category::getId,category.getId())
);
}
@@ -153,20 +158,28 @@
IPage<Category> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Category> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.FTP,Constants.BANNER_IMG).getCode();
+
queryWrapper.lambda().eq(Category::getIsdeleted,Constants.ZERO)
.eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
- .isNull(Category::getParentId);
+ .like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Category::getName,pageWrap.getModel().getName())
+ .isNull(Category::getParentId)
+ .orderByDesc(Category::getSortnum);
PageData<Category> categoryPageData = PageData.from(categoryMapper.selectPage(page, queryWrapper));
//鏌ヨ鎵�鏈変簩绾ф暟鎹�
List<Category> categoryList = categoryMapper.selectList(
new QueryWrapper<Category>().lambda()
.eq(Objects.nonNull(pageWrap.getModel().getType()),Category::getType,pageWrap.getModel().getType())
- .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId));
+ .eq(Category::getIsdeleted,Constants.ZERO).isNotNull(Category::getParentId).orderByDesc(Category::getSortnum));
for (Category category:categoryPageData.getRecords()) {
category.setChildCategoryList(
categoryList.stream().filter(i->Constants.equalsInteger(i.getParentId(),category.getId())).collect(Collectors.toList())
);
+ if(StringUtils.isNotBlank(category.getImgurl())){
+ category.setImgurlFull(prefixUrl + category.getImgurl());
+ }
}
return categoryPageData;
@@ -179,6 +192,10 @@
}
@Override
public List<Category> findChileList(Category model) {
+ if(Objects.isNull(model)){
+ model = new Category();
+ }
+ model.setIsdeleted(Constants.ZERO);
List<Category> list =findList(model);
List<Category> data = new ArrayList<>();
if(list!=null){
@@ -191,6 +208,8 @@
category.setGroupName( category.getParentName()+"/"+category.getName());
data.add(category);
}
+ }else{
+ data.add(category);
}
}
}
@@ -219,7 +238,7 @@
List<Category> categories = categoryMapper.selectList(wrapper);
if (org.apache.commons.collections.CollectionUtils.isNotEmpty(categories)){
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"鍒嗙被淇℃伅宸插瓨鍦�");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"淇℃伅宸插瓨鍦�");
}
}
}
--
Gitblit v1.9.3