合并

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

@@ -26,13 +26,14 @@ import javax.servlet.http.HttpSession;
 @RequestMapping("/")
 @Api(value = "项目动态管理API",description = "项目动态管理API")
 public class BuildingDynamicController extends BaseController {
+
     @Autowired
     private IBuildingDynamicService iBuildingDynamicService;
+
     @ApiOperation(value = "项目动态管理列表", notes = "项目动态管理列表")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
-            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度"
-                   )
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度")
 
     })
     @RequestMapping(value = "/iBuildingDynamicList", method = RequestMethod.POST)
@@ -40,6 +41,7 @@ public class BuildingDynamicController extends BaseController {
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize);
         return responseBean;
     }
+
     @RequestMapping(value = "/iBuildingDynamicSelectId/{id}", method = RequestMethod.GET)
     @ApiOperation(value = "项目动态详情", notes = "项目动态详情")
     @ApiImplicitParams({
@@ -49,4 +51,17 @@ public class BuildingDynamicController extends BaseController {
         ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectId(id);
         return responseBean;
     }
+
+    @ApiOperation(value = "微信小程序端项目动态管理列表", notes = "微信小程序端项目动态管理列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageNum",value = "分页第几页" ),
+            @ApiImplicitParam(paramType = "Query",dataType = "Integer",name = "pageSize",value = "pageSize:每页长度")
+
+    })
+    @RequestMapping(value = "/wx/buildingDynamiceList", method = RequestMethod.GET)
+    public ResponseBean wxBuildingDynamiceList(@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize);
+        return responseBean;
+    }
+
 }

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

@@ -92,7 +92,7 @@ public class Building implements Serializable {
     /**
      * 楼盘code
      */
-    private  Integer code;
+    private  String code;
 
     /**
      * 图片

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

@@ -1,5 +1,6 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -68,5 +69,10 @@ public class BuildingDynamic implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 楼盘
+     */
+    @TableField(exist = false)
+    private Building building;
 
 }

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

@@ -31,4 +31,13 @@ public interface IActivityService extends IService<Activity> {
      */
     ResponseBean getActivityId(String activityId);
 
+    /**
+     * 微信 精彩活动列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getWxActivityList(Integer pageNum, Integer pageSize);
+
+
 }

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

@@ -26,4 +26,11 @@ public interface IBuildingDynamicService extends IService<BuildingDynamic> {
      * @return
      */
     ResponseBean iBuildingDynamicSelectId(Integer id);
+
+    /**
+     * 项目动态管理列表
+     * @return
+     */
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum,Integer pageSize);
+
 }

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

@@ -14,6 +14,7 @@ import com.example.wholeestate.service.IActivityService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.security.krb5.internal.PAData;
 
 import java.util.Date;
 
@@ -70,4 +71,20 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
         responseBean.addSuccess(activity);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getWxActivityList(Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<Activity> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("status", "1");
+        IPage<Activity> activityIPage = activityMapper.selectPage(page, activityQueryWrapper);
+
+        responseBean.addSuccess(activityIPage);
+        return responseBean;
+    }
 }

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

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.wholeestate.common.base.BaseController;
 import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.dao.BuildingDynamicMapper;
+import com.example.wholeestate.dao.BuildingMapper;
 import com.example.wholeestate.model.Building;
 import com.example.wholeestate.model.BuildingDynamic;
 import com.example.wholeestate.service.IBuildingDynamicService;
@@ -27,8 +29,13 @@ import java.util.List;
  */
 @Service
 public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMapper, BuildingDynamic> implements IBuildingDynamicService {
+
     @Autowired
     private BuildingDynamicMapper buildingDynamicMapper;
+
+    @Autowired
+    private BuildingMapper buildingMapper;
+
     @Override
     public ResponseBean iBuildingDynamicList(Integer pageNum,Integer pageSize) {
         ResponseBean response= new ResponseBean();
@@ -57,4 +64,26 @@ public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMappe
         response.addSuccess(buildingDynamicList);
         return response;
     }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<BuildingDynamic> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+        QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("status", "1");
+        IPage<BuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
+        List<BuildingDynamic> records = buildingDynamicIPage.getRecords();
+        records.forEach(e -> {
+            QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
+            buildingQueryWrapper.eq("building_id", e.getBuildingId());
+            Building building = buildingMapper.selectOne(buildingQueryWrapper);
+            e.setBuilding(building);
+        });
+
+        responseBean.addSuccess(buildingDynamicIPage);
+        return responseBean;
+    }
 }

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

@@ -211,10 +211,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         Building  building= new Building();
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         Integer  status= jsonobject.getInteger("status");
-        Integer id= jsonobject.getInteger("id");
+        String id= jsonobject.getString("id");
         QueryWrapper<Building> buildingIdQueryWrapper = new QueryWrapper<>();
         buildingIdQueryWrapper.eq("building_id", id);
-        building.setBuildingId(String.valueOf(id));
+        building.setBuildingId(id);
         building.setStatus(status);
         buildingMapper.update(building,buildingIdQueryWrapper);
          ResponseBean ResponseBean= new ResponseBean<>();