From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
index 6eafefa..5df5ec6 100755
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -13,6 +13,7 @@
import com.java110.community.bmo.roomRenovationRecord.ISaveRoomRenovationRecordBMO;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IPhotoSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.communitySetting.CommunitySettingDto;
import com.java110.dto.fee.FeeAttrDto;
@@ -109,6 +110,9 @@
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IPhotoSMO photoSMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -433,22 +437,25 @@
roomRenovationRecordPo.setStaffName(users.get(0).getName());
roomRenovationRecordPo.setIsTrue(isTrue);
saveRoomRenovationRecordBMO.saveRecord(roomRenovationRecordPo);
+ for (String photo : photos) {
+ photoSMOImpl.savePhoto(photo,roomRenovationRecordPo.getRecordId(),roomRenovationPo.getCommunityId(),"19000");
+ }
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setObjId(roomRenovationRecordPo.getRecordId());
//table琛ㄧず琛ㄥ瓨鍌� ftp琛ㄧずftp鏂囦欢瀛樺偍
fileRelPo.setSaveWay("ftp");
fileRelPo.setCreateTime(new Date());
- //鍥剧墖涓婁紶
- if (photos != null && photos.size() > 0) {
- //19000琛ㄧず瑁呬慨鍥剧墖
- fileRelPo.setRelTypeCd("19000");
- for (String photo : photos) {
- fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
- fileRelPo.setFileRealName(photo);
- fileRelPo.setFileSaveName(photo);
- fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
- }
- }
+// //鍥剧墖涓婁紶
+// if (photos != null && photos.size() > 0) {
+// //19000琛ㄧず瑁呬慨鍥剧墖
+// fileRelPo.setRelTypeCd("19000");
+// for (String photo : photos) {
+// fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
+// fileRelPo.setFileRealName(photo);
+// fileRelPo.setFileSaveName(photo);
+// fileRelInnerServiceSMOImpl.saveFileRel(fileRelPo);
+// }
+// }
//瑙嗛涓婁紶
if (!StringUtil.isEmpty(videoName)) {
//21000琛ㄧず瑁呬慨瑙嗛
@@ -562,7 +569,6 @@
@RequestMapping(value = "/saveRoomRenovationDetail", method = RequestMethod.POST)
@Java110Transactional
public ResponseEntity<String> saveRoomRenovationDetail(@RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "user-name") String userName,
@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "rId", "璇锋眰鎶ユ枃涓湭鍖呭惈rId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
--
Gitblit v1.8.0