合并

whole-estate/pom.xml

@@ -42,11 +42,11 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.session</groupId>
-            <artifactId>spring-session-jdbc</artifactId>
-            <version>2.1.3.RELEASE</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.session</groupId>-->
+            <!--<artifactId>spring-session-jdbc</artifactId>-->
+            <!--<version>2.1.3.RELEASE</version>-->
+        <!--</dependency>-->
 
 
         <!-- 测试 -->

whole-estate/src/main/java/com/example/wholeestate/common/Constant.java

@@ -6,7 +6,9 @@ package com.example.wholeestate.common;
 public class Constant {
 
 
-    public static final String REQUEST_ERROR = "500";
+    public static final Integer REQUEST_ERROR = 500;
+
+    public static final Integer NOT_SESSION_USER = 401;
 
     /**
      * 用户 session

whole-estate/src/main/java/com/example/wholeestate/common/base/BaseController.java

@@ -36,4 +36,12 @@ public class BaseController {
         return sysUser;
     }
 
+    /**
+     * 移除 session 用户
+     * @param session
+     */
+    protected void removeSessionUser(HttpSession session) {
+        session.removeAttribute(Constant.USER_SESSION);
+    }
+
 }

whole-estate/src/main/java/com/example/wholeestate/common/resp/ResponseBean.java

@@ -9,10 +9,10 @@ public class ResponseBean<T> implements Serializable {
 
     private static final long serialVersionUID = 3593827217136880822L;
 
-    public static final String CODE_SUCCESS =  "0";
-    public static final String CODE_FAIL =  "1";
+    public static final Integer CODE_SUCCESS =  200;
+    public static final Integer CODE_FAIL =  400;
 
-    private String code = "0";
+    private Integer code = 200;
 
     private String message = "成功";
 
@@ -22,27 +22,27 @@ public class ResponseBean<T> implements Serializable {
     }
 
     public void addDefaultError() {
-        this.code = "1";
+        this.code = 400;
         this.message = "失败";
     }
 
     public void addError(String message) {
-        this.code = "1";
+        this.code = 400;
         this.message = message;
     }
 
-    public void addError(String code, String message) {
+    public void addError(Integer code, String message) {
         this.code = code;
         this.message = message;
     }
 
     public void addSuccess(String message) {
-        this.code = "0";
+        this.code = 200;
         this.message = message;
     }
 
     public void addSuccess(T data) {
-        this.code = "0";
+        this.code = 200;
         this.message = "成功";
         this.data = data;
     }
@@ -51,7 +51,7 @@ public class ResponseBean<T> implements Serializable {
         return this.data;
     }
 
-    public String getCode() {
+    public Integer getCode() {
         return this.code;
     }
 

whole-estate/src/main/java/com/example/wholeestate/common/uuid/IdGen.java

@@ -0,0 +1,108 @@
+package com.example.wholeestate.common.uuid;
+
+/**
+ * ID 生成策略
+ * @author  weiximei
+ */
+public class IdGen {
+
+    private long workerId;
+    private long datacenterId;
+    private long sequence = 0L;
+    private long twepoch = 1288834974657L;
+    //Thu, 04 Nov 2010 01:42:54 GMT
+    private long workerIdBits = 5L;
+    //节点ID长度
+    private long datacenterIdBits = 5L;
+    //数据中心ID长度
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits);
+    //最大支持机器节点数0~31，一共32个
+    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    //最大支持数据中心节点数0~31，一共32个
+    private long sequenceBits = 12L;
+    //序列号12位
+    private long workerIdShift = sequenceBits;
+    //机器节点左移12位
+    private long datacenterIdShift = sequenceBits + workerIdBits;
+    //数据中心节点左移17位
+    private long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+    //时间毫秒数左移22位
+    private long sequenceMask = -1L ^ (-1L << sequenceBits);
+    //最大为4095
+    private long lastTimestamp = -1L;
+
+    private static class IdGenHolder {
+        private static final IdGen instance = new IdGen();
+    }
+
+    public static IdGen get(){
+        return IdGenHolder.instance;
+    }
+
+    public IdGen() {
+        this(0L, 0L);
+    }
+
+    public IdGen(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+        //获取当前毫秒数
+        //如果服务器时间有问题(时钟后退) 报错。
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(String.format(
+                    "Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+        //如果上次生成时间和当前时间相同,在同一毫秒内
+        if (lastTimestamp == timestamp) {
+            //sequence自增，因为sequence只有12bit，所以和sequenceMask相与一下，去掉高位
+            sequence = (sequence + 1) & sequenceMask;
+            //判断是否溢出,也就是每毫秒内超过4095，当为4096时，与sequenceMask相与，sequence就等于0
+            if (sequence == 0) {
+                timestamp = tilNextMillis(lastTimestamp);
+                //自旋等待到下一毫秒
+            }
+        } else {
+            sequence = 0L;
+            //如果和上次生成时间不同,重置sequence，就是下一毫秒开始，sequence计数重新从0开始累加
+        }
+        lastTimestamp = timestamp;
+        // 最后按照规则拼出ID。
+        // 000000000000000000000000000000000000000000  00000            00000       000000000000
+        // time                                      datacenterId      workerId     sequence
+        // return ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift)
+        //        | (workerId << workerIdShift) | sequence;
+
+        long longStr= ((timestamp - twepoch) << timestampLeftShift) | (datacenterId << datacenterIdShift) | (workerId << workerIdShift) | sequence;
+        // System.out.println(longStr);
+        return longStr;
+    }
+
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+
+    public static void main(String[] args) {
+        IdGen idGen = IdGen.get();
+        System.out.println(idGen.nextId());
+    }
+
+}

whole-estate/src/main/java/com/example/wholeestate/config/SessionConfig.java

@@ -2,21 +2,21 @@ package com.example.wholeestate.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
-import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
-import org.springframework.session.web.http.HttpSessionIdResolver;
+//import org.springframework.session.jdbc.config.annotation.web.http.EnableJdbcHttpSession;
+//import org.springframework.session.web.http.HeaderHttpSessionIdResolver;
+//import org.springframework.session.web.http.HttpSessionIdResolver;
 
 /**
  * session 配置
  * @author weiximei
  */
- @Configuration
- @EnableJdbcHttpSession
+// @Configuration
+// @EnableJdbcHttpSession
 public class SessionConfig {
 
-    @Bean
-    public HttpSessionIdResolver httpSessionIdResolver() {
-        return HeaderHttpSessionIdResolver.xAuthToken();
-    }
+//    @Bean
+//    public HttpSessionIdResolver httpSessionIdResolver() {
+//        return HeaderHttpSessionIdResolver.xAuthToken();
+//    }
 
 }

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

@@ -1,18 +1,20 @@
 package com.example.wholeestate.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+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.common.uuid.IdGen;
+import com.example.wholeestate.model.Activity;
+import com.example.wholeestate.service.IActivityEnrollService;
 import com.example.wholeestate.service.IActivityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-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.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -27,9 +29,15 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "活动 API", description = "活动 API")
 public class ActivityController extends BaseController {
 
+    private IdGen idGen = IdGen.get();
+
     @Autowired
     private IActivityService iActivityService;
 
+    @Autowired
+    private IActivityEnrollService iActivityEnrollService;
+
+
     @RequestMapping(value = "/activity/list", method = RequestMethod.POST)
     @ApiOperation(value = "活动列表", notes = "活动列表")
     @ApiImplicitParams({
@@ -41,4 +49,72 @@ public class ActivityController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/activity/{activityId}", method = RequestMethod.GET)
+    @ApiOperation(value = "活动详情", notes = "活动详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "activityId", value = "activityId活动id")
+    })
+    public ResponseBean getById(@PathVariable String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iActivityService.getActivityId(activityId);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/activity/add", method = RequestMethod.POST)
+    @ApiOperation(value = "添加活动", notes = "添加活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址")
+    })
+    public ResponseBean add(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        Activity activity = JSONObject.parseObject(parameter, Activity.class);
+        activity.setActivityId(idGen.nextId()+"");
+        iActivityService.save(activity);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/activity/update", method = RequestMethod.PUT)
+    @ApiOperation(value = "修改活动", notes = "修改活动")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "activityId活动编号;title活动标题;activityDate活动时间;beginDate活动开始时间;endDate活动截止时间;maxNum人数限制;context内容;imgUrl图片地址")
+    })
+    public ResponseBean update(@RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        Activity activity = JSONObject.parseObject(parameter, Activity.class);
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activity.getActivityId());
+        iActivityService.update(activity, activityQueryWrapper);
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/activity/delete/{activityId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除活动", notes = "删除活动")
+    public ResponseBean delete(@PathVariable String activityId) {
+        ResponseBean responseBean = new ResponseBean();
+        Activity activity = iActivityService.getById(activityId);
+        if (null == activity) {
+            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;
+    }
+
+
+    @RequestMapping(value = "/activity/enroll/list/{activityId}", method = RequestMethod.POST)
+    @ApiOperation(value = "根据活动id查询活动报名列表", notes = "根据活动id查询活动报名列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "pageNum第几页;pageSize一页多少行")
+    })
+    public ResponseBean activityEnrollList(@PathVariable("activityId") String activityId, @RequestBody String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = iActivityEnrollService.getActivitySignUpList(activityId, parameter);
+        return responseBean;
+    }
+
+
 }

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

@@ -0,0 +1,65 @@
+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.Comment;
+import com.example.wholeestate.service.ICommentService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 评论表 前端控制器
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-20
+ */
+@RestController
+@RequestMapping("/")
+@Api(value = "评论 API", description = "评论 API")
+public class CommentController extends BaseController {
+
+    @Autowired
+    private ICommentService iCommentService;
+
+    @RequestMapping(value = "/comment/delete/{commentId}", method = RequestMethod.DELETE)
+    @ApiOperation(value = "删除评论", notes = "删除评论")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", dataTypeClass = String.class, name = "commentId",value = "评论编号")
+    })
+    public ResponseBean delete(@PathVariable("commentId") String commentId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<Comment> commentQueryWrapper = new QueryWrapper<>();
+        commentQueryWrapper.eq("comment_id", commentId);
+        Comment comment = iCommentService.getOne(commentQueryWrapper);
+        if (null == comment) {
+            responseBean.addError("评论不存在!");
+            return responseBean;
+        }
+
+        comment.setStatus(-1);
+        iCommentService.update(comment,commentQueryWrapper);
+
+        // 删除这个评论下的子评论
+        Comment  childComment = new Comment();
+        childComment.setStatus(-1);
+        QueryWrapper<Comment> childCommentQueryWrapper = new QueryWrapper<>();
+        childCommentQueryWrapper.eq("parent_id", commentId);
+        iCommentService.update(childComment, childCommentQueryWrapper);
+        responseBean.addSuccess("操作成功!");
+        return responseBean;
+    }
+
+
+
+}

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

@@ -47,4 +47,22 @@ public class SysUserController extends BaseController {
         return responseBean;
     }
 
+    @RequestMapping(value = "/user/loginOut", method = RequestMethod.GET)
+    @ApiOperation(value = "退出登陆", notes = "退出登陆")
+    public ResponseBean loginOut(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        removeSessionUser(session);
+        responseBean.addSuccess("退出登陆成功!");
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/user/info", method = RequestMethod.GET)
+    @ApiOperation(value = "获取登陆的用户信息", notes = "获取登陆的用户信息")
+    public ResponseBean loginInfo(HttpSession session) {
+        ResponseBean responseBean = new ResponseBean();
+        SysUser sessionUser = getSessionUser(session);
+        responseBean.addSuccess(sessionUser);
+        return responseBean;
+    }
+
 }

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

@@ -1,7 +1,10 @@
 package com.example.wholeestate.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.wholeestate.model.ActivityEnroll;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.example.wholeestate.model.ActivityEnroll;
  */
 public interface ActivityEnrollMapper extends BaseMapper<ActivityEnroll> {
 
+    @Select("SELECT tac.*,tacus.phone as phone,tacus.`name` as name,tacus.customer_name as customerName FROM ta_activity tac " +
+            "RIGHT JOIN ta_activity_enroll tace ON tac.activity_id = tace.activity_id " +
+            "LEFT JOIN ta_customer tacus ON tace.customer_id = tacus.customer_id " +
+            "WHERE tac.activity_id = #{activityId}")
+    IPage<ActivityEnroll> selectPageActivityEnroll(Page page, String activityId);
+
 }

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

@@ -1,6 +1,7 @@
 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;
 
 /**

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

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

whole-estate/src/main/java/com/example/wholeestate/exception/ExceptionHandleAdice.java

@@ -34,7 +34,12 @@ public class ExceptionHandleAdice {
     public ResponseBean handleException(WholeEstateException e) {
         log.error(e.getMessage(),e);
         ResponseBean response = new ResponseBean();
-        response.addError(e.getMessage());
+        String message = e.getMessage();
+        if (message.equals("用户 session 不存在!")) {
+            response.addError(Constant.NOT_SESSION_USER, message);
+            return response;
+        }
+        response.addError(message);
         return response;
     }
 

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

@@ -92,4 +92,28 @@ public class Activity implements Serializable {
     private Integer maxNum;
 
 
+    /**
+     * 楼盘
+     */
+    @TableField(exist = false)
+    private Building building;
+
+    /**
+     * 客户手机号
+     */
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 微信昵称
+     */
+    @TableField(exist = false)
+    private String name;
+
+    /**
+     * 客户姓名
+     */
+    @TableField(exist = false)
+    private String customerName;
+
 }

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

@@ -0,0 +1,78 @@
+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;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 评论表
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_comment")
+public class Comment implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评论ID
+     */
+    private String commentId;
+
+    /**
+     * 用户ID
+     */
+    private String customerId;
+
+    /**
+     * 用户姓名
+     */
+    private String customerName;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 评论主题类型
+     */
+    private String commentType;
+
+    /**
+     * 评论主体
+     */
+    private String mainId;
+
+    /**
+     * 父级
+     */
+    private String parentId;
+
+    /**
+     * 评论
+     */
+    private String commentContent;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 0正常，-1删除
+     */
+    private Integer status;
+
+
+}

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

@@ -1,6 +1,7 @@
 package com.example.wholeestate.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.common.resp.ResponseBean;
 import com.example.wholeestate.model.ActivityEnroll;
 
 /**
@@ -13,4 +14,11 @@ import com.example.wholeestate.model.ActivityEnroll;
  */
 public interface IActivityEnrollService extends IService<ActivityEnroll> {
 
+    /**
+     * 根据活动id 查询 活动报名列表
+     * @param parameter
+     * @return
+     */
+    ResponseBean getActivitySignUpList(String activityId,String parameter);
+
 }

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

@@ -26,6 +26,6 @@ public interface IActivityService extends IService<Activity> {
      * @param activityId
      * @return
      */
-    ResponseBean getById(String activityId);
+    ResponseBean getActivityId(String activityId);
 
 }

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

@@ -0,0 +1,25 @@
+package com.example.wholeestate.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.model.Comment;
+import com.example.wholeestate.model.SysUser;
+
+/**
+ * <p>
+ * 评论表 服务类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-20
+ */
+public interface ICommentService extends IService<Comment> {
+
+    /**
+     * 回复评论
+     * @param parameter
+     * @return
+     */
+    ResponseBean addComment(SysUser user, String parameter);
+
+}

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

@@ -1,9 +1,16 @@
 package com.example.wholeestate.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+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.dao.ActivityEnrollMapper;
+import com.example.wholeestate.dao.ActivityMapper;
+import com.example.wholeestate.model.Activity;
 import com.example.wholeestate.model.ActivityEnroll;
 import com.example.wholeestate.service.IActivityEnrollService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +24,32 @@ import org.springframework.stereotype.Service;
 @Service
 public class ActivityEnrollServiceImpl extends ServiceImpl<ActivityEnrollMapper, ActivityEnroll> implements IActivityEnrollService {
 
+    @Autowired
+    private ActivityEnrollMapper activityEnrollMapper;
+
+    @Autowired
+    private ActivityMapper activityMapper;
+
+    @Override
+    public ResponseBean getActivitySignUpList(String activityId,String parameter) {
+        ResponseBean responseBean = new ResponseBean();
+
+        Activity activity = activityMapper.selectById(activityId);
+        if (null == activity) {
+            responseBean.addError("活动不存在!");
+            return responseBean;
+        }
+
+        JSONObject jsonObject = JSONObject.parseObject(parameter);
+        Integer pageNum = jsonObject.getInteger("pageNum");
+        Integer pageSize = jsonObject.getInteger("pageSize");
+
+        Page<Activity> page = new Page<>();
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        page.setSize(pageSize == null ? 10 : pageSize);
+        IPage<ActivityEnroll> activityEnrollIPage = activityEnrollMapper.selectPageActivityEnroll(page, activityId);
+
+        responseBean.addSuccess(activityEnrollIPage);
+        return responseBean;
+    }
 }

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

@@ -7,7 +7,9 @@ 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.dao.ActivityMapper;
+import com.example.wholeestate.dao.BuildingMapper;
 import com.example.wholeestate.model.Activity;
+import com.example.wholeestate.model.Building;
 import com.example.wholeestate.service.IActivityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +28,9 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     @Autowired
     private ActivityMapper activityMapper;
 
+    @Autowired
+    private BuildingMapper buildingMapper;
+
     @Override
     public ResponseBean getList(String parameter) {
         ResponseBean responseBean = new ResponseBean();
@@ -35,8 +40,8 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
         Integer pageSize = jsonObject.getInteger("pageSize");
 
         Page<Activity> page = new Page<>();
-        page.setCurrent(pageNum);
-        page.setSize(pageSize);
+        page.setCurrent(pageNum == null ? 1 : pageNum);
+        page.setSize(pageSize == null ? 10 : pageSize);
         QueryWrapper<Activity> queryWrapper = new QueryWrapper<>();
         IPage<Activity> activityIPage = activityMapper.selectPage(page, queryWrapper);
         responseBean.addSuccess(activityIPage);
@@ -44,16 +49,22 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
     }
 
     @Override
-    public ResponseBean getById(String activityId) {
+    public ResponseBean getActivityId(String activityId) {
         ResponseBean responseBean = new ResponseBean();
 
-        Activity activity = activityMapper.selectById(activityId);
+        QueryWrapper<Activity> activityQueryWrapper = new QueryWrapper<>();
+        activityQueryWrapper.eq("activity_id", activityId);
+        Activity activity = activityMapper.selectOne(activityQueryWrapper);
         if (null == activity) {
             responseBean.addError("活动不存在!");
             return responseBean;
         }
 
-        responseBean.addSuccess(activityId);
+        QueryWrapper<Building> buildingQueryWrapper = new QueryWrapper<>();
+        buildingQueryWrapper.eq("building_id", activity.getBuildingId());
+        Building building = buildingMapper.selectOne(buildingQueryWrapper);
+        activity.setBuilding(building);
+        responseBean.addSuccess(activity);
         return responseBean;
     }
 }

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

@@ -0,0 +1,60 @@
+package com.example.wholeestate.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.wholeestate.common.resp.ResponseBean;
+import com.example.wholeestate.dao.CommentMapper;
+import com.example.wholeestate.dao.CustomerMapper;
+import com.example.wholeestate.model.Activity;
+import com.example.wholeestate.model.Comment;
+import com.example.wholeestate.model.Customer;
+import com.example.wholeestate.model.SysUser;
+import com.example.wholeestate.service.ICommentService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 评论表 服务实现类
+ * </p>
+ *
+ * @author weiximei
+ * @since 2019-03-20
+ */
+@Service
+public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> implements ICommentService {
+
+    @Autowired
+    private CommentMapper commentMapper;
+
+    @Autowired
+    private CustomerMapper customerMapper;
+
+    @Override
+    public ResponseBean addComment(SysUser user, 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("customer_id", comment.getCustomerId());
+        Customer customer = customerMapper.selectOne(customerQueryWrapper);
+        if (null == customer) {
+            responseBean.addError("用户不存在!");
+            return responseBean;
+        }
+
+        int insert = commentMapper.insert(comment);
+        if (insert <= 0) {
+            responseBean.addError("评论失败!");
+            return responseBean;
+        }
+        responseBean.addSuccess("评论成功!");
+        return responseBean;
+    }
+}

whole-estate/src/main/java/com/example/wholeestate/utils/MD5Utils.java

@@ -0,0 +1,51 @@
+package com.example.wholeestate.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+
+/**
+ * 用户密码加密
+ * Created by Administrator on 2015/8/9.
+ */
+public class MD5Utils {
+    /**
+     * MD5加密
+     *
+     * @param s 字符串
+     * @return MD5加密 字符串
+     */
+    public static String encode(String s) {
+        try {
+            return encode(s.getBytes("utf-8"));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static String encode(byte[] b) {
+        char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+                'a', 'b', 'c', 'd', 'e', 'f'};
+        try {
+            byte[] strTemp;
+            strTemp = b;
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(strTemp);
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char str[] = new char[j * 2];
+            int k = 0;
+            for (byte byte0 : md) {
+                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+                str[k++] = hexDigits[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    public static void main(String[] arge) throws Exception {
+       System.out.println(MD5Utils.encode("123456"));
+    }
+}