From 5da038138e5629359939679936e68a65a077daca Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:59:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 bc78a4b..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
@@ -242,18 +242,23 @@
footDataVO.getFootImgUrl2());
footDataVO.setAddress(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ADDRESS).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());
SystemDictData solveScheme = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SOLVE_SCHEME);
- if(Objects.nonNull(solveScheme) & org.apache.commons.lang3.StringUtils.isNotBlank(solveScheme.getCode())){
+ 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())){
+ 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())){
+ 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;
@@ -270,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);
@@ -313,9 +328,14 @@
systemDictDataBiz.updateById(wisdomSystem);
}
SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.HONORS);
- if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getHonors())) {
- wisdomSystem.setCode(footDataDTO.getHonors().toString());
- systemDictDataBiz.updateById(wisdomSystem);
+ 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