From c7255cb752c12bf5c0c5e2b8bac0ad82d4cdf71b Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 19 八月 2025 19:34:09 +0800
Subject: [PATCH] 费用报表0819
---
service-common/src/main/java/com/java110/common/smo/impl/SmallProgramAdvertServiceSMOImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/SmallProgramAdvertServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/SmallProgramAdvertServiceSMOImpl.java
index 72054b5..3fa6e04 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/SmallProgramAdvertServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/SmallProgramAdvertServiceSMOImpl.java
@@ -11,6 +11,7 @@
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmallProgramAdvertServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
+import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.BusinessException;
import com.java110.utils.exception.DAOException;
@@ -87,6 +88,9 @@
@Override
public void saveSmallAdverts(SmallProgramAdvert smallProgramAdvert) {
+ if(!StringUtils.isEmpty(smallProgramAdvert.getOssUrl())){
+ smallProgramAdvert.setOssUrl(getPath() + smallProgramAdvert.getOssUrl());
+ }
smallProgramAdvertServiceDao.saveSmallProgramAdvertInfo(BeanConvertUtil.beanCovertMap(smallProgramAdvert));
}
@@ -100,25 +104,31 @@
if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getPosition())){
smallProgramAdvert.setPosition(smallProgramAdvertSaveDto.getPosition());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getAdvertsName())){
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getAdvertsName()) &&
+ !smallProgramAdvert.getAdvertsName().equals(smallProgramAdvertSaveDto.getAdvertsName())){
smallProgramAdvert.setAdvertsName(smallProgramAdvertSaveDto.getAdvertsName());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getPicUrl())){
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getPicUrl()) &&
+ !smallProgramAdvert.getPicUrl().equals(smallProgramAdvertSaveDto.getPicUrl())){
smallProgramAdvert.setPicUrl(smallProgramAdvertSaveDto.getPicUrl());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getOssUrl())){
- smallProgramAdvert.setOssUrl(smallProgramAdvertSaveDto.getOssUrl());
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getOssUrl()) &&
+ !smallProgramAdvert.getOssUrl().equals(smallProgramAdvertSaveDto.getOssUrl())){
+ smallProgramAdvert.setOssUrl(getPath() + smallProgramAdvertSaveDto.getOssUrl());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getUrl())){
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getUrl()) &&
+ !smallProgramAdvert.getUrl().equals(smallProgramAdvertSaveDto.getUrl())){
smallProgramAdvert.setUrl(smallProgramAdvertSaveDto.getUrl());
}
if(smallProgramAdvertSaveDto.getSort() != null){
smallProgramAdvert.setSort(smallProgramAdvertSaveDto.getSort());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getSupplierName())){
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getSupplierName()) &&
+ !smallProgramAdvert.getSupplierName().equals(smallProgramAdvertSaveDto.getSupplierName())){
smallProgramAdvert.setSupplierName(smallProgramAdvertSaveDto.getSupplierName());
}
- if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getDesc())){
+ if(!StringUtils.isEmpty(smallProgramAdvertSaveDto.getDesc()) &&
+ !smallProgramAdvert.getDesc().equals(smallProgramAdvertSaveDto.getDesc())){
smallProgramAdvert.setDesc(smallProgramAdvertSaveDto.getDesc());
}
smallProgramAdvert.setUpdateTime(new Date());
@@ -131,6 +141,17 @@
}
}
+ private String getPath(){
+ String path = "";
+ String endPoint = MappingCache.getValue("OSS", "endpoint");
+ String bucketName = MappingCache.getValue("OSS", "bucketName");
+ //瑙ｆ瀽endPoint
+ String[] endpoints = endPoint.split("//");
+ endPoint = endpoints[1];
+ path = "https://" + bucketName +"." + endPoint + "/hc/";
+ return path;
+ }
+
@Override
@Transactional
public void updateSmallAdvertsStatus(SmallProgramAdvertSaveDto smallProgramAdvertSaveDto,String userId) {
--
Gitblit v1.8.0