From 20001a775126c1be95a2b84cebb8813a54608712 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 15 八月 2023 14:42:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java b/java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java
index df47395..a31e4f7 100644
--- a/java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java
+++ b/java110-core/src/main/java/com/java110/core/smo/impl/PhotoSMOImpl.java
@@ -4,6 +4,7 @@
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.smo.IPhotoSMO;
import com.java110.dto.file.FileDto;
+import com.java110.dto.file.FileRelDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.po.file.FileRelPo;
@@ -12,6 +13,8 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
public class PhotoSMOImpl implements IPhotoSMO {
@@ -23,8 +26,12 @@
@Autowired(required = false)
private IFileRelInnerServiceSMO fileRelInnerServiceSMOImpl;
+ public int savePhoto(String photo, String objId, String communityId){
+ return savePhoto(photo,objId,communityId,"11000");
+ }
+
@Override
- public int savePhoto(String photo, String objId, String communityId) {
+ public int savePhoto(String photo, String objId, String communityId,String relTypeCd) {
if (StringUtil.isEmpty(photo)) {
return 0;
}
@@ -39,14 +46,25 @@
photo = fileName;
}
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
- businessUnit.put("relTypeCd", "11000");
+ businessUnit.put("relTypeCd", relTypeCd);
businessUnit.put("saveWay", "table");
businessUnit.put("objId", objId);
businessUnit.put("fileRealName", photo);
businessUnit.put("fileSaveName", photo);
+
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(objId);
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+ if(fileRelDtos == null || fileRelDtos.size()< 1){
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+ return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ }
+
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
- return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ fileRelPo.setFileRelId(fileRelDtos.get(0).getFileRelId());
+ return fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
}
@Override
@@ -66,14 +84,27 @@
}
JSONObject businessUnit = new JSONObject();
- businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
businessUnit.put("relTypeCd", "11000");
businessUnit.put("saveWay", "table");
businessUnit.put("objId", objId);
businessUnit.put("fileRealName", reqJson.getString("photo"));
businessUnit.put("fileSaveName", reqJson.getString("photo"));
+
+ FileRelDto fileRelDto = new FileRelDto();
+ fileRelDto.setObjId(objId);
+ List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+
+ if(fileRelDtos == null || fileRelDtos.size()< 1){
+ businessUnit.put("fileRelId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_fileRelId));
+ FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
+ return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ }
+
FileRelPo fileRelPo = BeanConvertUtil.covertBean(businessUnit, FileRelPo.class);
- return fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+ fileRelPo.setFileRelId(fileRelDtos.get(0).getFileRelId());
+ return fileRelInnerServiceSMOImpl.updateFileRel(fileRelPo);
+
+
}
}
--
Gitblit v1.8.0