Merge remote-tracking branch 'origin/master' into master

src/main/java/com/shigongli/controller/LoginController.java

@@ -92,7 +92,7 @@ public class LoginController extends BaseController {
 
         // 生成 token
         Map<String, Object> claims = new HashMap<>();
-        claims.put("personId", taPerson.getPersonId());
+        claims.put("userId", taPerson.getPersonId());
         String jws = JWTUtils.encode(claims);
         taPerson.setToken(jws);
 

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -147,4 +147,16 @@ public class TaHouseController extends BaseController {
     public ResponseBean taHouseGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         return ResponseBean.success(iTaHouseService.getById(id));
     }
+
+
+    /**
+     * 查询当前房源
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/ma/taHouse/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean houseDetail(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaHouseService.getById(id));
+    }
+
 }

src/main/java/com/shigongli/entity/TaHouse.java

@@ -2,8 +2,12 @@ package com.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+import java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -66,5 +70,6 @@ public class TaHouse implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private List<TaHouseSurround> surroundList;
 }

src/main/java/com/shigongli/entity/TaHouseSurround.java

@@ -2,6 +2,8 @@ package com.shigongli.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -45,5 +47,6 @@ public class TaHouseSurround implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-
+    @TableField(exist = false)
+    private String image;
 }