合并

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

@@ -54,7 +54,7 @@ public class ActivityController extends BaseController {
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
         CustomDateEditor editor = new CustomDateEditor(df, true);//true表示允许为空，false反之
         binder.registerCustomEditor(Date.class, editor);
     }
@@ -153,14 +153,18 @@ public class ActivityController extends BaseController {
     @ApiOperation(value = "删除活动", notes = "删除活动")
     public ResponseBean delete(@PathVariable String activityId) {
         ResponseBean responseBean = new ResponseBean();
-        Activity activity = iActivityService.getById(activityId);
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activityId);
+        Activity activity = iActivityService.getOne(activityQueryWrapper);
         if (null == activity) {
             responseBean.addError("活动不存在!");
             return responseBean;
         }
+        if (activity.getStatus() == 1) {
+            responseBean.addError("已发布的活动不能删除!");
+            return responseBean;
+        }
         activity.setStatus(-1);
-        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
-        activityQueryWrapper.eq("activity_id", activity.getActivityId());
         iActivityService.update(activity, activityQueryWrapper);
         responseBean.addSuccess("操作成功!");
         return responseBean;
@@ -191,4 +195,15 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/signUpActivity/{openid}", method = RequestMethod.POST)
+    @ApiOperation(value = "微信小程序活动报名", notes = "微信小程序活动报名")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;enrollDate报名时间"),
+    })
+    public ResponseBean wxSignUpActivity(@PathVariable("openid") String openid, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iActivityEnrollService.wxSignUpActivity(openid, parameter);
+        return responseBean;
+    }
+
 }

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

@@ -129,8 +129,6 @@ public class BuildingController extends BaseController {
     @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "id:楼盘id,status:状态," )
 
     })
-
-//    @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "token")
     @RequestMapping(value = "/building/update/status", method = RequestMethod.PUT)
     public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpSession session){
         ResponseBean  responseBean = iBuildingService.buildingUpdateStatus(parameter);
@@ -166,7 +164,7 @@ public class BuildingController extends BaseController {
             @ApiImplicitParam(paramType = "path",dataType = "String",name = "parameter",value = "id:楼盘id" )
 
     })
-    @RequestMapping(value = "/building/delete/status{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/building/delete/{id}", method = RequestMethod.DELETE)
     public ResponseBean buildingdelete(@PathVariable("id") String id, HttpSession session){
         ResponseBean  responseBean = iBuildingService.buildingdelete(id);
         return responseBean;

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

@@ -64,4 +64,14 @@ public class BuildingDynamicController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
+    @ApiOperation(value = "微信小程序项目动态详情", notes = "微信小程序项目动态详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass=String.class, name = "dynamicId", value = "项目动态dynamicId"),
+    })
+    public ResponseBean iBuildingDynamicSelectId(@PathVariable(value = "dynamicId") String dynamicId, HttpSession session){
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId);
+        return responseBean;
+    }
+
 }

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

@@ -99,5 +99,32 @@ public class CommentController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/wx/comment/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一页多少行"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "commentType", value = "评论类型"),
+            @ApiImplicitParam(paramType = "query", dataTypeClass = String.class, name = "mainId", value = "评论主体id"),
+    })
+    public ResponseBean wxCommentList(@RequestParam(defaultValue = "1") Integer pageNum,
+                                    @RequestParam(defaultValue = "10") Integer pageSize,
+                                    @RequestParam String commentType,
+                                    @RequestParam String mainId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCommentService.getWxCommentList(commentType, mainId, pageNum, pageSize);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/wx/comment/add/{openid}", method = RequestMethod.POST)
+    @ApiOperation(value = "微信小程序添加评论", notes = "微信小程序添加评论")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "commentType评论类型;mainId评论类型;parentId父级;commentContent评论内容")
+    })
+    public ResponseBean addWxComment(@PathVariable("openid") String openid,@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iCommentService.addWxComment(openid,parameter);
+        return responseBean;
+    }
 
 }

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

@@ -3,6 +3,8 @@ package com.example.wholeestate.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.example.wholeestate.model.Activity;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -14,4 +16,12 @@ import com.example.wholeestate.model.Activity;
  */
 public interface ActivityMapper extends BaseMapper<Activity> {
 
+    /**
+     * 根据 活动id 查询报名人数
+     * @param activityId
+     * @return
+     */
+    @Select("select count(*) from ta_activity_enroll where activity_id = #{activityId}")
+    Integer signUpNumber(@Param("activityId") String activityId);
+
 }

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

@@ -121,4 +121,10 @@ public class Activity implements Serializable {
      */
     @TableField(exist = false)
     private String buildingName;
+
+    /**
+     * 活动已经报名的人数
+     */
+    @TableField(exist = false)
+    private Integer signUpNumber;
 }

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

@@ -1,5 +1,6 @@
 package com.example.wholeestate.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -7,6 +8,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -74,5 +76,10 @@ public class Comment implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 子评论
+     */
+    @TableField(exist = false)
+    private List<Comment> childComment;
 
 }

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

@@ -30,4 +30,11 @@ public interface IActivityEnrollService extends IService<ActivityEnroll> {
      */
     ResponseBean getOpenidActivityUpList(String openid, Integer pageNum, Integer pageSize);
 
+    /**
+     * 微信小程序 报名活动
+     * @param parameter
+     * @return
+     */
+    ResponseBean wxSignUpActivity(String openid,String parameter);
+
 }

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

@@ -28,9 +28,16 @@ public interface IBuildingDynamicService extends IService<BuildingDynamic> {
     ResponseBean iBuildingDynamicSelectId(Integer id);
 
     /**
-     * 项目动态管理列表
+     * 微信小程序 项目动态管理列表
      * @return
      */
     ResponseBean getWxBuildingDynamiceList(Integer pageNum,Integer pageSize);
 
+    /**
+     * 微信小程序 项目详情
+     * @param dynamicId
+     * @return
+     */
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId);
+
 }

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

@@ -62,6 +62,7 @@ public interface IBuildingService extends IService<Building> {
      */
     ResponseBean buildingdelete(String id);
 
+
     /**
      * 楼盘户型添加
      * @param parameter

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

@@ -32,4 +32,21 @@ public interface ICommentService extends IService<Comment> {
      */
     ResponseBean getCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize);
 
+    /**
+     * 根据 评论类型, 评论主体id 查询
+     * @param commentType
+     * @param mainId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    ResponseBean getWxCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize);
+
+    /**
+     * 微信小程序 回复评论
+     * @param openid
+     * @param parameter
+     * @return
+     */
+    ResponseBean addWxComment(String openid,String parameter);
 }

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

@@ -1,14 +1,18 @@
 package com.example.wholeestate.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+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.resp.ResponseBean;
+import com.example.wholeestate.common.uuid.IdGen;
 import com.example.wholeestate.dao.ActivityEnrollMapper;
 import com.example.wholeestate.dao.ActivityMapper;
+import com.example.wholeestate.dao.CustomerMapper;
 import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.ActivityEnroll;
+import com.example.wholeestate.model.Customer;
 import com.example.wholeestate.service.IActivityEnrollService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +34,11 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
     @Autowired
     private ActivityMapper activityMapper;
 
+    @Autowired
+    private CustomerMapper customerMapper;
+
+    private IdGen idGen = IdGen.get();
+
     @Override
     public ResponseBean getActivitySignUpList(String activityId, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -59,4 +68,28 @@ public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper,
         responseBean.addSuccess(activityIPage);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean wxSignUpActivity(String openid, String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<Customer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("openid", openid);
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+        if (null == customer) {
+            responseBean.addError("用户不存在!");
+            return responseBean;
+        }
+
+        ActivityEnroll activityEnroll = JSONObject.parseObject(parameter, ActivityEnroll.class);
+        activityEnroll.setCustomerId(customer.getCustomerId());
+        activityEnroll.setEnrollId(idGen.nextId()+"");
+        int row = activityEnrollMapper.insert(activityEnroll);
+        if (row <= 0) {
+            responseBean.addError("报名失败!");
+            return responseBean;
+        }
+        responseBean.addSuccess("报名成功!");
+        return responseBean;
+    }
 }

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

@@ -1,6 +1,5 @@
 package com.example.wholeestate.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,9 +13,9 @@ 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;
+import java.util.List;
 
 /**
  * <p>
@@ -48,6 +47,12 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
         queryWrapper.ge(null != beginDate,"begin_date", beginDate);
         queryWrapper.le(null != endDate,"end_date", endDate);
         IPage<Activity> activityIPage = activityMapper.selectPage(page, queryWrapper);
+        List<Activity> records = activityIPage.getRecords();
+        records.forEach(e -> {
+            Integer signUpNumber = activityMapper.signUpNumber(e.getActivityId());
+            e.setSignUpNumber(null == signUpNumber ? 0 : signUpNumber);
+        });
+
         responseBean.addSuccess(activityIPage);
         return responseBean;
     }

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

@@ -86,4 +86,15 @@ public class BuildingDynamicServiceImpl extends ServiceImpl<BuildingDynamicMappe
         responseBean.addSuccess(buildingDynamicIPage);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        QueryWrapper<BuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
+        buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
+        BuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        responseBean.addSuccess(buildingDynamic);
+        return responseBean;
+    }
 }

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -83,4 +84,57 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         responseBean.addSuccess(commentIPage);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getWxCommentList(String commentType, String mainId, Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Page<Comment> page = new Page<>();
+        page.setCurrent(pageNum);
+        page.setSize(pageSize);
+
+        QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
+        commentQueryWrapper.eq("comment_type", commentType);
+        commentQueryWrapper.eq("main_id", mainId);
+        IPage<Comment> commentIPage = commentMapper.selectPage(page, commentQueryWrapper);
+        List<Comment> records = commentIPage.getRecords();
+        records.forEach(e -> {
+            QueryWrapper<Comment> childCommentQuery = new QueryWrapper<>();
+            childCommentQuery.eq("parent_id", e.getCommentId());
+            List<Comment> comments = commentMapper.selectList(childCommentQuery);
+            e.setChildComment(comments);
+        });
+
+        responseBean.addSuccess(commentIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean addWxComment(String openid, String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        Comment comment = JSONObject.parseObject(parameter, Comment.class);
+        comment.setCreateDate(LocalDateTime.now());
+        comment.setStatus(1);
+
+        QueryWrapper<Customer> customerQueryWrapper = new QueryWrapper<>();
+        customerQueryWrapper.eq("openid", openid);
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+        if (null == customer) {
+            responseBean.addError("评论用户不存在!");
+            return responseBean;
+        }
+
+        comment.setCommentId(idGen.nextId()+"");
+        comment.setCustomerName(customer.getCustomerName());
+        comment.setAvatar(customer.getAvatar());
+        comment.setCustomerId(customer.getCustomerId());
+
+        int insert = commentMapper.insert(comment);
+        if (insert <= 0) {
+            responseBean.addError("评论失败!");
+            return responseBean;
+        }
+        responseBean.addSuccess("评论成功!");
+        return responseBean;
+    }
 }

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

@@ -4,8 +4,9 @@
     <select id="buildingList" resultType="com.example.wholeestate.model.Building">
         SELECT * FROM ta_building
             <where>
+            status > -1
             <if test="Name != null and Name != ''">
-            and  ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%')
+            and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>
             <if test="Code != null and Code != ''">
             and  ta_building.code like concat('%',#{Code,jdbcType=VARCHAR},'%')