房源详情新增上传人和编辑人字段

fdkanfang-domain/src/main/java/com/fdkanfang/domain/response/HouseResponse.java

@@ -1,8 +1,11 @@
 package com.fdkanfang.domain.response;
 
+import com.fdkanfang.domain.backend.ImageEntity;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.util.Date;
+import java.util.List;
 
 /**
  * Created by owen on 2020/3/2 0002 14:09
@@ -73,7 +76,14 @@ public class HouseResponse {
     private String canNotEditDesc;
 
 
+    @Transient
+    private List<ImageEntity> images;
 
+    // 调用垂直校验需要使用
+    private String sceneJson;
+
+    // 最新的sceneJson
+    private String newSceneJson;
 
 
 

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -85,6 +85,9 @@ public class HouseController extends BaseController {
     @Autowired
     private UserUtils userUtils;
 
+    @Autowired
+    private UserService2 userService2;
+
 
 
 
@@ -424,7 +427,21 @@ public class HouseController extends BaseController {
         List<ImageEntity> images = imageService2.findByHouseIdAndFloor(houseId, floor);
         if(null != house){
             house.setImages(images);
-            return new R(MsgCode.SUCCESS_CODE, house);
+            HouseResponse houseResponse = new HouseResponse();
+            BeanUtils.copyProperties(house , houseResponse);
+            if(null != house.getUserId()){
+                UserEntity uploader = userService2.findById(house.getUserId());
+                if(null != uploader){
+                    houseResponse.setUploadName(uploader.getRealName());
+                }
+            }
+            if(null != house.getHandler()){
+                UserEntity handler = userService2.findById(house.getHandler());
+                if(null != handler){
+                    houseResponse.setHandlerName(handler.getRealName());
+                }
+            }
+            return new R(MsgCode.SUCCESS_CODE, houseResponse);
         }else{
             return new R(MsgCode.ERROR_CODE, "房源不存在");
         }