合并

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

@@ -190,7 +190,7 @@ public class ActivityController extends BaseController {
     }
 
     @RequestMapping(value = "/wx/activity/{openid}", method = RequestMethod.GET)
-    @ApiOperation(value = "根据openid查询参加过的活动列表", notes = "根据openid查询参加过的活动列表")
+    @ApiOperation(value = "微信小程序 根据openid查询参加过的活动列表", notes = "微信小程序 根据openid查询参加过的活动列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageNum", value = "pageNum第几页"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "pageSize", value = "pageSize一页多少行")

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

@@ -154,7 +154,7 @@ public class BuildingController extends BaseController {
     }
 
     @RequestMapping(value = "/wx/collection/{openid}", method = RequestMethod.DELETE)
-    @ApiOperation(value = "根据 openid 和 buildingId 删除收藏楼盘")
+    @ApiOperation(value = "微信小程序 根据 openid 和 buildingId 删除收藏楼盘")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "buildingId", value = "buildingId楼盘编号"),
@@ -176,7 +176,7 @@ public class BuildingController extends BaseController {
     }
 
     @RequestMapping(value = "/wx/collection/{openid}", method = RequestMethod.POST)
-    @ApiOperation(value = "根据 openid 和 buildingId 收藏楼盘")
+    @ApiOperation(value = "微信小程序 根据 openid 和 buildingId 收藏楼盘")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "openid", value = "openid"),
             @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "buildingId", value = "buildingId楼盘编号"),

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

@@ -0,0 +1,20 @@
+package com.example.wholeestate.controller;
+
+
+import com.example.wholeestate.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-22
+ */
+@RestController
+@RequestMapping("/")
+public class CommentImgController extends BaseController {
+
+}

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

@@ -1,6 +1,7 @@
 package com.example.wholeestate.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.example.wholeestate.common.base.BaseController;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.PageImg;
@@ -9,9 +10,14 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -34,10 +40,29 @@ public class PageImgController extends BaseController {
             @ApiImplicitParam(paramType = "Query",dataType = "String",name = "id",value = "图片id" ),
     })
     @RequestMapping(value = "/pageIm", method = RequestMethod.GET)
-    public ResponseBean apageImgSelect(@RequestParam(value = "id",required = false)String id)
-    {
+    public ResponseBean apageImgSelect(@RequestParam(value = "id",required = false)String id) {
+
+        ResponseBean responseBean = iPageImgService.apageImgSelect(id);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/banner", method = RequestMethod.GET)
+    @ApiOperation(value = "微信小程序 首页Banner")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "imgType", value = "图片类型"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "imgLocation", value = "图片位置")
+    })
+    public ResponseBean getWxBanner(@RequestParam("imgType") String imgType,
+                                    @RequestParam("imgLocation") String imgLocation) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<PageImg> pageImgQueryWrapper = new QueryWrapper<>();
+        pageImgQueryWrapper.eq("img_type", imgType);
+        pageImgQueryWrapper.eq("img_location", imgLocation);
+        pageImgQueryWrapper.eq("status", 1);
+        List<PageImg> list = iPageImgService.list(pageImgQueryWrapper);
 
-        ResponseBean  responseBean = iPageImgService.apageImgSelect(id);
+        responseBean.addSuccess(list);
         return responseBean;
     }
 

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

@@ -0,0 +1,16 @@
+package com.example.wholeestate.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.wholeestate.model.CommentImg;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-22
+ */
+public interface CommentImgMapper extends BaseMapper<CommentImg> {
+
+}

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

@@ -0,0 +1,37 @@
+package com.example.wholeestate.model;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_comment_img")
+public class CommentImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String imgId;
+
+    private String commentId;
+
+    private String imgUrl;
+
+    private Integer status;
+
+    private Integer orderNo;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.example.wholeestate.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.model.CommentImg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-22
+ */
+public interface ICommentImgService extends IService<CommentImg> {
+
+}

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

@@ -375,6 +375,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         ResponseBean responseBean = new ResponseBean();
 
         QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
+        buildingQueryWrapper.eq("status", 1);
         List<Building> buildingList = buildingMapper.selectList(buildingQueryWrapper);
         responseBean.addSuccess(buildingList);
 

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

@@ -0,0 +1,20 @@
+package com.example.wholeestate.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.wholeestate.dao.CommentImgMapper;
+import com.example.wholeestate.model.CommentImg;
+import com.example.wholeestate.service.ICommentImgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-22
+ */
+@Service
+public class CommentImgServiceImpl extends ServiceImpl<CommentImgMapper, CommentImg> implements ICommentImgService {
+
+}

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

@@ -0,0 +1,5 @@
+<?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.CommentImgMapper">
+
+</mapper>