Merge branch 'master' of http://git.ycjcjy.com/whole-estate/service

whole-estate/src/main/java/com/example/wholeestate/controller/ActivityController.java

@@ -212,4 +212,16 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
+    @ApiOperation(value = "微信活动列表", notes = "微信活动列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")
+    })
+    public ResponseBean getWxList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                @RequestParam(defaultValue = "10") Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iActivityService.getList(pageNum, pageSize, null,null,null);
+        return responseBean;
+    }
 }

whole-estate/src/main/java/com/example/wholeestate/controller/BuildingController.java

@@ -265,4 +265,15 @@ public class BuildingController extends BaseController {
         ResponseBean  responseBean = iBuildingService.buildingUpdate(parameter);
         return responseBean;
     }
+
+
+    @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
+    @ApiOperation(value = "楼盘详情", notes = "楼盘详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "id", value = "楼盘id"),
+    })
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id){
+        ResponseBean  responseBean = iBuildingService.buildingAllSelectId(id);
+        return responseBean;
+    }
 }

whole-estate/src/main/java/com/example/wholeestate/dao/BuildingImgMapper.java

@@ -1,7 +1,11 @@
 package com.example.wholeestate.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.wholeestate.model.BuildingDynamic;
 import com.example.wholeestate.model.BuildingImg;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.example.wholeestate.model.BuildingImg;
  * @since 2019-03-21
  */
 public interface BuildingImgMapper extends BaseMapper<BuildingImg> {
-
+    List<BuildingImg> getBuildingImgByApartment(@Param("id") String id);
 }

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -100,5 +100,9 @@ public class Building implements Serializable {
     @TableField(exist = false)
     private List<BuildingImg> BuildingImg;
 
-
+    /**
+     * 户型
+     */
+    @TableField(exist = false)
+    private List<BuildingApartment> buildingApartment;
 }

whole-estate/src/main/java/com/example/wholeestate/service/IBuildingService.java

@@ -29,6 +29,14 @@ public interface IBuildingService extends IService<Building> {
      */
     ResponseBean buildingSelectId(String id);
 
+    /**
+     * 楼盘详情
+     * @param id
+     * @return
+     */
+    ResponseBean buildingAllSelectId(String id);
+
+
     /**
      * 修改楼盘
      * @param parameter

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -93,6 +93,34 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         return response;
     }
 
+    @Override
+    public ResponseBean buildingAllSelectId(String id) {
+        ResponseBean response= new ResponseBean();
+        QueryWrapper<Building> buildingtWrapper = new QueryWrapper<>();
+        buildingtWrapper.lambda().gt(Building::getStatus,-1);
+        buildingtWrapper.lambda().eq(Building::getBuildingId,id);
+        Building building= buildingMapper.selectOne(buildingtWrapper);
+        //查询当前图片
+        QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
+        BuildingImgQueryWrapper.eq("building_id", id);
+        BuildingImgQueryWrapper.eq("img_type", "banner");
+        List<BuildingImg> buildingImg= buildingImgMapper.selectList(BuildingImgQueryWrapper);
+        building.setBuildingImg(buildingImg);
+        // 查询户型
+        QueryWrapper<BuildingApartment> AppointmentQueryWrapper = new QueryWrapper<>();
+        AppointmentQueryWrapper.eq("building_id", id);
+        AppointmentQueryWrapper.eq("status", 1);
+        List<BuildingApartment> appoint= buildingApartmentMapper.selectList(AppointmentQueryWrapper);
+
+        for (BuildingApartment apar:appoint) {
+            List<BuildingImg> imgs = buildingImgMapper.getBuildingImgByApartment(apar.getApartmentId());
+            apar.setBuildingImgList(imgs);
+        }
+        building.setBuildingApartment(appoint);
+        response.addSuccess(building);
+        return response;
+    }
+
     @Override
     public ResponseBean buildingUpdate(String parameter) {
         ResponseBean response= new ResponseBean();

whole-estate/src/main/resources/mapper/BuildingImgMapper.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.wholeestate.dao.BuildingImgMapper">
-
+    <select id="getBuildingImgByApartment" resultType="com.example.wholeestate.model.BuildingImg" >
+      select a.* from ta_building_img a inner join ta_apartment_img b on a.img_id = b.img_id
+      where a.status = 1 and b.status=1 and b.apartment_id = #{id}
+    </select>
 </mapper>