From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 427a319..4a791a1 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,6 +11,7 @@
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.dto.RoomDto;
import com.java110.dto.communitySetting.CommunitySettingDto;
@@ -44,12 +45,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;
@@ -575,6 +571,7 @@
* @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) {
@@ -582,9 +579,18 @@
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