Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

 import io.swagger.annotations.ApiOperation;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
         return responseBean;
     }
 
+    /**
+     * 针对首屏优化, 获取一些 banner, 开屏等配置
+     * @param cityId
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/extendContent")
+    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId") Integer cityId, HttpServletRequest request) {
+        return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
+    }
+
 
     /**
      * 保存对象

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

      * 微信推荐楼盘列表
      * @return
      */
-    @RequestMapping(value = "/wx/building/mian", method = RequestMethod.GET)
-    public ResponseBean getWxMainBuildingList(){
-        return taBuildingService.getWxMainBuildingList();
+    @RequestMapping(value = "/wx/building/main", method = RequestMethod.GET)
+    public ResponseBean getWxMainBuildingList(HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        return taBuildingService.getWxMainBuildingList(orgId);
     }
 
     /**

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

      */
     @TableField(exist = false)
     private List<TaBuildingImg> buildingListImg;
+
+    /**
+     * 列表封面图
+     */
+    @TableField(exist = false)
+    private String listPoster;
+
+    /**
+     * 标签列表, 逗哈分隔
+     */
+    @TableField(exist = false)
+    private String tags;
 }

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

      * @return
      */
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
+
+    List<TaBuilding> selectMainBuildings(@Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

      * 微信小程序 楼盘列表
      * @return
      */
-    ResponseBean getWxMainBuildingList();
+    ResponseBean getWxMainBuildingList(Integer orgId);
 
     ResponseBean getWxBuildingById(String buildingId);
 

src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java

         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
         // banner 或 screen(首屏广告) ,这里是 screen
-        extendContentQuery.eq("show_type",showType);
+        extendContentQuery.eq(StringUtils.isNotBlank(showType), "show_type",showType);
         extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
         extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
         extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

     }
 
     @Override
-    public ResponseBean getWxMainBuildingList() {
-        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-        buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.eq("is_main", 1);
-        buildingQueryWrapper.orderByAsc("order_no");
-        List<TaBuilding> buildingList = taBuildingMapper.selectList(buildingQueryWrapper);
-
-        for (TaBuilding build:buildingList) {
-            getBuildingAttaches(build);
-        }
-
-        return ResponseBean.success(buildingList);
+    public ResponseBean getWxMainBuildingList(Integer orgId) {
+        List<TaBuilding> buildingList = taBuildingMapper.selectMainBuildings(orgId);
+        if (null == buildingList) {
+            return ResponseBean.success(new ArrayList<>());
+        }
+
+        for (TaBuilding building : buildingList) {
+            String buildingId = building.getBuildingId();
+
+            // 列表封面
+            List<TaBuildingImg> listImage = new ArrayList<>();
+            TaBuildingImg img = new TaBuildingImg();
+            img.setImgType(CommConstant.BUILDING_IMG_LIST);
+            img.setBuildingId(buildingId);
+            img.setUrl(building.getListPoster());
+            listImage.add(img);
+            building.setBuildingListImg(listImage);
+
+            // tags
+            List<TaBuildingTag> tags = new ArrayList<>();
+            String[] tagsArray = StringUtils.ifNull(building.getTags(), "").split(",");
+            if (null != tagsArray) {
+                for(String tagName: tagsArray) {
+                    TaBuildingTag tag = new TaBuildingTag();
+                    tag.setBuildingId(buildingId);
+                    tag.setTagName(tagName);
+                    tags.add(tag);
+                }
+            }
+            building.setBuildingTag(tags);
+
+            // Uv
+            IPage<TaUv> pageUv = new Page<>(1, 10);
+            QueryWrapper<TaUv> query3 = new QueryWrapper<>();
+            query3.eq("be_uv", buildingId);
+            query3.eq("tagert_type", CommConstant.FAVOR_PROJECT);
+            query3.orderByDesc("create_date");
+            IPage<TaUv> uvs = taUvMapper.selectPage(pageUv, query3);
+            building.setUvList(uvs);
+
+            // share num
+            IPage<TaShare> pageSN = new Page<>(1, 10);
+            pageSN.setTotal(null == building.getShareNum() ? 0l : building.getShareNum());
+            building.setShareList(pageSN);
+        }
+
+        IPage<TaBuilding> page = new Page<>(1, 10);
+        page.setTotal(buildingList.size());
+        page.setRecords(buildingList);
+        return ResponseBean.success(page);
     }
 
     @Override

src/main/resources/mapper/TaBuildingMapper.xml

       </if>
     </select>
 
+    <select id="selectMainBuildings" resultType="com.huiju.estateagents.entity.TaBuilding">
+        SELECT
+            t.*,
+            s.url AS list_poster,
+            GROUP_CONCAT( m.tag_name ) AS tags
+        FROM
+            ta_building t
+        LEFT JOIN ta_building_img s ON t.building_id = s.building_id
+        AND s.img_type = 'list'
+        LEFT JOIN ta_building_tag m ON t.building_id = m.building_id
+        WHERE
+            t.org_id = #{orgId}
+        AND t.status = 1
+        AND t.is_main = 1
+        GROUP BY
+            t.building_id
+        ORDER BY t.order_no
+    </select>
+
 </mapper>