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

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

@@ -43,26 +43,26 @@ public class TaHouseController extends BaseController {
     @Autowired
     public ITaHouseService iTaHouseService;
 
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/mp/taHouse",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHouseList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaHouse> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHouse> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("status", StatusConstant.NORMAL);
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaHouse> result = iTaHouseService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
+//
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/mp/taHouse",method= RequestMethod.GET)
+//    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+//    public ResponseBean taHouseList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+//
+//		    IPage<TaHouse> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaHouse> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("status", StatusConstant.NORMAL);
+//            queryWrapper.orderByDesc("create_date");
+//
+//            IPage<TaHouse> result = iTaHouseService.page(pg, queryWrapper);
+//            return ResponseBean.success(result);
+//    }
 
     /**
      * 分页查询列表
@@ -92,7 +92,7 @@ public class TaHouseController extends BaseController {
      * @param taHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/mp/taHouse",method= RequestMethod.POST)
+    @RequestMapping(value="/ma/taHouse",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean taHouseAdd(@ApiParam("保存内容") @RequestBody TaHouse taHouse) throws Exception{
 
@@ -107,7 +107,7 @@ public class TaHouseController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/mp/taHouse/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/ma/taHouse/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
     public ResponseBean taHouseDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
         TaHouse taHouse = iTaHouseService.getById(id);
@@ -126,7 +126,7 @@ public class TaHouseController extends BaseController {
      * @param taHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/mp/taHouse/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/ma/taHouse/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
     public ResponseBean taHouseUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaHouse taHouse) throws Exception{
@@ -138,17 +138,6 @@ public class TaHouseController extends BaseController {
         }
     }
 
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/mp/taHouse/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHouseGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaHouseService.getById(id));
-    }
-
-
     /**
      * 查询当前房源
      * @param id  实体ID

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

@@ -46,16 +46,14 @@ public class TaHouseSurroundController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taHouseSurround",method= RequestMethod.GET)
+    @RequestMapping(value="/ma/taHouseSurround",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taHouseSurroundList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taHouseSurroundList(@ApiParam("页码") @RequestParam(value ="pageNum", defaultValue = "1") Integer pageNum,
+                                            @ApiParam("单页数据量") @RequestParam(value ="pageSize", defaultValue = "10") Integer pageSize,
+                                            @ApiParam("房源ID") @RequestParam(value ="houseId", required = false) String houseId) throws Exception{
 
 		    IPage<TaHouseSurround> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaHouseSurround> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaHouseSurround> result = iTaHouseSurroundService.page(pg, queryWrapper);
+            IPage<TaHouseSurround> result = iTaHouseSurroundService.getListByHouseOrNot(pg, houseId);
             return ResponseBean.success(result);
     }
 

src/main/java/com/shigongli/mapper/TaHouseSurroundMapper.java

@@ -1,8 +1,10 @@
 package com.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouseSurround;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaHouseSurroundMapper extends BaseMapper<TaHouseSurround> {
 
+    IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, @Param("houseId") String houseId);
 }

src/main/java/com/shigongli/service/ITaHouseSurroundService.java

@@ -1,5 +1,6 @@
 package com.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouseSurround;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaHouseSurroundService extends IService<TaHouseSurround> {
 
+    IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, String houseId);
 }

src/main/java/com/shigongli/service/impl/TaHouseSurroundServiceImpl.java

@@ -1,9 +1,11 @@
 package com.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.shigongli.entity.TaHouseSurround;
 import com.shigongli.mapper.TaHouseSurroundMapper;
 import com.shigongli.service.ITaHouseSurroundService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +18,11 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaHouseSurroundServiceImpl extends ServiceImpl<TaHouseSurroundMapper, TaHouseSurround> implements ITaHouseSurroundService {
+    @Autowired
+    TaHouseSurroundMapper taHouseSurroundMapper;
 
+    @Override
+    public IPage<TaHouseSurround> getListByHouseOrNot(IPage<TaHouseSurround> pg, String houseId) {
+        return taHouseSurroundMapper.getListByHouseOrNot(pg, houseId);
+    }
 }

src/main/resources/mapper/TaHouseSurroundMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.shigongli.mapper.TaHouseSurroundMapper">
 
+    <select id="getListByHouseOrNot" resultType="com.shigongli.entity.TaHouseSurround">
+        SELECT
+            t.*,
+            s.image
+        FROM
+            ta_house_surround t
+        INNER JOIN ta_meta_image s ON t.image_id = s.image_id
+        WHERE
+            t.`status` = 1
+        <if test="null != houseId and '' != houseId">
+            AND t.house_id = #{houseId}
+        </if>
+        ORDER BY
+            t.create_date DESC;
+    </select>
 </mapper>