From f8bf5c88605e51b409d89c9cbd966942796e3ec5 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 19 九月 2025 09:23:20 +0800
Subject: [PATCH] 优化
---
server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 90 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 19 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
index 7cc0fc1..289e50f 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
@@ -1,5 +1,6 @@
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.ResponseStatus;
@@ -51,14 +52,14 @@
public Integer create(Carousel carousel) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(carousel)
- || Objects.isNull(carousel.getType())
- || Objects.isNull(carousel.getImgurl())
+// || Objects.isNull(carousel.getImgurl())
|| Objects.isNull(carousel.getJumpType())
- || Objects.isNull(carousel.getSortnum())
- || (!Constants.equalsInteger(carousel.getJumpType(),Constants.ZERO) && StringUtils.isEmpty(carousel.getContnet()))
+// || Objects.isNull(carousel.getSortnum())
+ || StringUtils.isEmpty(carousel.getTitle())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ carousel.setType(Constants.ZERO);
carousel.setIsdeleted(Constants.ZERO);
carousel.setStatus(Constants.ZERO);
carousel.setCreateDate(new Date());
@@ -70,7 +71,7 @@
@Override
public void deleteById(Integer id) {
- carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ZERO).eq(Carousel::getId,id));
+ carouselMapper.update(new UpdateWrapper<Carousel>().lambda().set(Carousel::getIsdeleted,Constants.ONE).eq(Carousel::getId,id));
}
@Override
@@ -84,7 +85,9 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- carouselMapper.deleteBatchIds(ids);
+ for(Integer id :ids){
+ this.deleteById(id);
+ }
}
@Override
@@ -92,11 +95,9 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Objects.isNull(carousel)
|| Objects.isNull(carousel.getId())
- || Objects.isNull(carousel.getType())
|| Objects.isNull(carousel.getImgurl())
|| Objects.isNull(carousel.getJumpType())
|| Objects.isNull(carousel.getSortnum())
- || (!Constants.equalsInteger(carousel.getJumpType(),Constants.ZERO) && StringUtils.isEmpty(carousel.getContnet()))
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -176,7 +177,15 @@
wrapper.lambda().eq(Carousel::getIsdeleted,Constants.ZERO)
.eq(Carousel::getStatus,Constants.ZERO)
.orderByDesc(Carousel::getSortnum);
- return carouselMapper.selectList(wrapper);
+ List<Carousel> carouselList =
+ carouselMapper.selectList(wrapper);
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(carouselList)){
+ String fileDir = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
+ for (Carousel carousel:carouselList) {
+ this.imgFullPath(fileDir,carousel);
+ }
+ }
+ return carouselList;
}
@Override
@@ -188,12 +197,14 @@
.eq(pageWrap.getModel().getId() != null, Carousel::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getRemark() != null, Carousel::getRemark, pageWrap.getModel().getRemark())
.like(pageWrap.getModel().getTitle() != null, Carousel::getTitle, pageWrap.getModel().getTitle())
- .like(pageWrap.getModel().getDescribe() != null, Carousel::getDescribe, pageWrap.getModel().getDescribe())
.eq(pageWrap.getModel().getType() != null, Carousel::getType, pageWrap.getModel().getType())
+ .like(pageWrap.getModel().getDetail() != null, Carousel::getDetail, pageWrap.getModel().getDetail())
.eq(pageWrap.getModel().getJumpType() != null, Carousel::getJumpType, pageWrap.getModel().getJumpType())
- .eq(pageWrap.getModel().getContnet() != null, Carousel::getContnet, pageWrap.getModel().getContnet())
+ .like(pageWrap.getModel().getContent() != null, Carousel::getContent, pageWrap.getModel().getContent())
.eq(pageWrap.getModel().getSortnum() != null, Carousel::getSortnum, pageWrap.getModel().getSortnum())
.eq(pageWrap.getModel().getStatus() != null, Carousel::getStatus, pageWrap.getModel().getStatus())
+ .orderByDesc(Carousel::getSortnum)
+
;
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
@@ -221,13 +232,34 @@
@Override
public FootDataVO getFoodDataVO(){
FootDataVO footDataVO = new FootDataVO();
+ String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode();
footDataVO.setFootWords(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_WORDS).getCode());
- footDataVO.setFootImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode());
+ footDataVO.setFootImgUrl(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL).getCode());
+ footDataVO.setFootFullImgUrl(path+
+ footDataVO.getFootImgUrl());
+ footDataVO.setFootImgUrl2(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FOOT_IMGURL2).getCode());
+ footDataVO.setFootFullImgUrl2(path +
+ footDataVO.getFootImgUrl2());
footDataVO.setAddress(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ADDRESS).getCode());
- footDataVO.setLinkMobile(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_PHONE).getCode());
+ footDataVO.setLinkPhone(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_PHONE).getCode());
+ footDataVO.setQyemail(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.QYEMAIL).getCode());
footDataVO.setLinkMobile(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.LINK_MOBILE).getCode());
- footDataVO.setSolveScheme(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SOLVE_SCHEME).getCode());
- footDataVO.setWisdomSystem(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WISDOM_SYSTEM).getCode());
+ SystemDictData solveScheme = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SOLVE_SCHEME);
+ if(Objects.nonNull(solveScheme) && org.apache.commons.lang3.StringUtils.isNotBlank(solveScheme.getCode())){
+ footDataVO.setSolveScheme(JSONArray.parseArray(solveScheme.getCode()));
+ }
+ SystemDictData wisdomSystem = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.WISDOM_SYSTEM);
+ if(Objects.nonNull(wisdomSystem) && org.apache.commons.lang3.StringUtils.isNotBlank(wisdomSystem.getCode())){
+ footDataVO.setWisdomSystem(JSONArray.parseArray(wisdomSystem.getCode()));
+ }
+ SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.HONORS);
+ if(Objects.nonNull(wisdomSystem) && org.apache.commons.lang3.StringUtils.isNotBlank(honors.getCode())){
+ footDataVO.setHonors(JSONArray.parseArray(honors.getCode()));
+ }
+ SystemDictData yqlinks = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.YQLINKS);
+ if(Objects.nonNull(yqlinks) && org.apache.commons.lang3.StringUtils.isNotBlank(yqlinks.getCode())){
+ footDataVO.setYqlinks(JSONArray.parseArray(yqlinks.getCode()));
+ }
footDataVO.setServerTime(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_TIME).getCode());
return footDataVO;
}
@@ -243,11 +275,21 @@
footWords.setCode(footDataDTO.getFootWords());
systemDictDataBiz.updateById(footWords);
}
+ SystemDictData qyemail = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.QYEMAIL);
+ if (Objects.nonNull(qyemail)) {
+ qyemail.setCode(footDataDTO.getQyemail());
+ systemDictDataBiz.updateById(qyemail);
+ }
SystemDictData footImgUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_IMGURL);
if (Objects.nonNull(footImgUrl)) {
footImgUrl.setCode(footDataDTO.getFootImgUrl());
systemDictDataBiz.updateById(footImgUrl);
+ }
+ SystemDictData footImgUrl2 = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_IMGURL2);
+ if (Objects.nonNull(footImgUrl2)) {
+ footImgUrl2.setCode(footDataDTO.getFootImgUrl2());
+ systemDictDataBiz.updateById(footImgUrl2);
}
SystemDictData linkPhone = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.LINK_PHONE);
@@ -275,16 +317,26 @@
}
SystemDictData solveScheme = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.SOLVE_SCHEME);
- if (Objects.nonNull(solveScheme)) {
- solveScheme.setCode(footDataDTO.getSolveScheme());
+ if (Objects.nonNull(solveScheme)&&Objects.nonNull(footDataDTO.getSolveScheme())) {
+ solveScheme.setCode(footDataDTO.getSolveScheme().toString());
systemDictDataBiz.updateById(solveScheme);
}
SystemDictData wisdomSystem = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.WISDOM_SYSTEM);
- if (Objects.nonNull(wisdomSystem)) {
- wisdomSystem.setCode(footDataDTO.getWisdomSystem());
+ if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getWisdomSystem())) {
+ wisdomSystem.setCode(footDataDTO.getWisdomSystem().toString());
systemDictDataBiz.updateById(wisdomSystem);
}
+ SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.HONORS);
+ if (Objects.nonNull(honors)&&Objects.nonNull(footDataDTO.getHonors())) {
+ honors.setCode(footDataDTO.getHonors().toString());
+ systemDictDataBiz.updateById(honors);
+ }
+ SystemDictData yqlinks = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.YQLINKS);
+ if (Objects.nonNull(yqlinks)&&Objects.nonNull(footDataDTO.getYqlinks())) {
+ yqlinks.setCode(footDataDTO.getYqlinks().toString());
+ systemDictDataBiz.updateById(yqlinks);
+ }
}
--
Gitblit v1.9.3