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 | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 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 c10923d..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
@@ -11,22 +11,22 @@
import com.java110.community.bmo.roomRenovationRecord.IDeleteRoomRenovationRecordBMO;
import com.java110.community.bmo.roomRenovationRecord.IGetRoomRenovationRecordBMO;
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;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.owner.OwnerRoomRelDto;
import com.java110.dto.roomRenovation.RoomRenovationDto;
import com.java110.dto.roomRenovationDetail.RoomRenovationDetailDto;
import com.java110.dto.user.UserDto;
-import com.java110.intf.IRoomRenovationInnerServiceSMO;
-import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.community.ICommunitySettingInnerServiceSMO;
+import com.java110.intf.community.IRoomRenovationInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -44,12 +44,7 @@
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -99,9 +94,6 @@
private IGetRoomRenovationRecordBMO getRoomRenovationRecordBMOImpl;
@Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
- @Autowired
private IDeleteRoomRenovationRecordBMO deleteRoomRenovationRecordBMOImpl;
@Autowired
@@ -118,6 +110,9 @@
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IPhotoSMO photoSMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -245,7 +240,7 @@
feeAttrPo3.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK); //鑱旂郴鏂瑰紡
feeAttrPo3.setValue(reqJson.getString("personTel"));
feeAttrOwnerLinkPos.add(feeAttrPo3);
- if (FeeDto.FEE_FLAG_ONCE.equals(feeConfigDtos.get(0).getFeeFlag())) {//涓�娆℃�ц垂鐢�
+ if (!FeeDto.FEE_FLAG_CYCLE.equals(feeConfigDtos.get(0).getFeeFlag())) {//涓�娆℃�ц垂鐢�
FeeAttrPo feeAttrPo4 = new FeeAttrPo();
feeAttrPo4.setFeeId(payFeePo.getFeeId());
feeAttrPo4.setCommunityId(reqJson.getString("communityId"));
@@ -442,28 +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.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
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) {
- FileDto fileDto = new FileDto();
- fileDto.setCommunityId("-1");
- fileDto.setContext(photo);
- fileDto.setFileId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_file_id));
- fileDto.setFileName(fileDto.getFileId());
- String fileName = fileInnerServiceSMOImpl.saveFile(fileDto);
- fileRelPo.setFileRealName(fileName);
- fileRelPo.setFileSaveName(fileName);
- 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琛ㄧず瑁呬慨瑙嗛
@@ -575,16 +567,25 @@
* @path /app/roomRenovation/saveRoomRenovationDetail
*/
@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");
Assert.hasKeyAndValue(reqJson, "detailType", "璇锋眰鎶ユ枃涓湭鍖呭惈detailType");
Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈state");
+
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+ Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
RoomRenovationDetailPo roomRenovationDetailPo = BeanConvertUtil.covertBean(reqJson, RoomRenovationDetailPo.class);
roomRenovationDetailPo.setStaffId(userId);
- roomRenovationDetailPo.setStaffName(userName);
+ roomRenovationDetailPo.setStaffName(userDtos.get(0).getName());
RoomRenovationPo roomRenovationPo = new RoomRenovationPo();
roomRenovationPo.setrId(roomRenovationDetailPo.getrId());
roomRenovationPo.setState(roomRenovationDetailPo.getState());
--
Gitblit v1.8.0