diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
index 7e5ea539d..72ff9ae17 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/pom.xml
@@ -12,5 +12,13 @@
     <artifactId>epdc-events-client</artifactId>
     <packaging>jar</packaging>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-commons-tools</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+
 
 </project>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
new file mode 100644
index 000000000..14988bb40
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDTO.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.events;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import java.math.BigDecimal;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Data
+public class EpdcEventsDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	private String id;
+
+	private String userId;
+
+	private String issueContent;
+
+	private String area;
+
+	private String areaId;
+
+	private String street;
+
+	private String streetId;
+
+	private String community;
+
+	private String communityId;
+
+	private String grid;
+
+	private String gridId;
+
+	private String issueAddress;
+
+	private String issueCategoryId;
+
+	private BigDecimal issusLatitude;
+
+	private BigDecimal issueLongitude;
+
+	private String friendlyCommunityId;
+
+	private Integer eventState;
+
+	private Integer approveNum;
+
+	private Integer opposeNum;
+
+	private Integer commentNum;
+
+	private Integer browseNum;
+
+	private String delFlag;
+
+	private Integer revision;
+
+	private String createdBy;
+
+	private Date createdTime;
+
+	private String updatedBy;
+
+	private Date updatedTime;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index bca64010c..2bfb86ff7 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -86,10 +86,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -109,10 +109,10 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
@@ -132,7 +132,7 @@
                 <spring.redis.password>elink@888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink888</spring.datasource.druid.password>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
new file mode 100644
index 000000000..48c6d332a
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
+import com.elink.esua.epdc.modules.events.excel.EpdcEventsExcel;
+import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@RestController
+@RequestMapping("epdcevents")
+public class EpdcEventsController {
+    @Autowired
+    private EpdcEventsService epdcEventsService;
+
+    @GetMapping("page")
+    public Result<PageData<EpdcEventsDTO>> page(@RequestParam Map<String, Object> params){
+        PageData<EpdcEventsDTO> page = epdcEventsService.page(params);
+
+        return new Result<PageData<EpdcEventsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    public Result<EpdcEventsDTO> get(@PathVariable("id") String id){
+        EpdcEventsDTO data = epdcEventsService.get(id);
+
+        return new Result<EpdcEventsDTO>().ok(data);
+    }
+
+    @PostMapping
+    public Result save(@RequestBody EpdcEventsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        epdcEventsService.save(dto);
+
+        return new Result();
+    }
+
+    @PutMapping
+    public Result update(@RequestBody EpdcEventsDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        epdcEventsService.update(dto);
+
+        return new Result();
+    }
+
+    @DeleteMapping
+    public Result delete(@RequestBody String[] ids){
+        //效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        epdcEventsService.delete(ids);
+
+        return new Result();
+    }
+
+    @GetMapping("export")
+    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+        List<EpdcEventsDTO> list = epdcEventsService.list(params);
+
+        ExcelUtils.exportExcelToTarget(response, null, list, EpdcEventsExcel.class);
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
new file mode 100644
index 000000000..cabc90183
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Mapper
+public interface EpdcEventsDao extends BaseDao<EpdcEventsEntity> {
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
new file mode 100644
index 000000000..c0bd0aec5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity;
+import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("epdc_events")
+public class EpdcEventsEntity extends BaseEpdcEntity {
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+	private String id;
+    /**
+     * 用户ID
+     */
+	private String userId;
+    /**
+     * 议题内容
+     */
+	private String issueContent;
+    /**
+     * 区
+     */
+	private String area;
+    /**
+     * 区ID
+     */
+	private String areaId;
+    /**
+     * 街道
+     */
+	private String street;
+    /**
+     * 街道ID
+     */
+	private String streetId;
+    /**
+     * 社区
+     */
+	private String community;
+    /**
+     * 社区ID
+     */
+	private String communityId;
+    /**
+     * 网格
+     */
+	private String grid;
+    /**
+     * 网格ID
+     */
+	private String gridId;
+    /**
+     * 议题位置地址
+     */
+	private String issueAddress;
+    /**
+     * 议题分类ID
+     */
+	private String issueCategoryId;
+    /**
+     * 议题位置纬度
+     */
+	private BigDecimal issusLatitude;
+    /**
+     * 议题位置经度
+     */
+	private BigDecimal issueLongitude;
+    /**
+     * 友邻社区ID
+     */
+	private String friendlyCommunityId;
+    /**
+     * 事件状态 0-待审核，2-驳回，4-审核通过
+     */
+	private Integer eventState;
+	/**
+	 * 点赞次数
+	 */
+	private Integer approveNum;
+	/**
+	 * 踩次数
+	 */
+	private Integer opposeNum;
+	/**
+	 * 评论数
+	 */
+	private Integer commentNum;
+	/**
+	 * 浏览数
+	 */
+	private Integer browseNum;
+    /**
+     * 删除标识 0：未删除，1：已删除
+     */
+	private String delFlag;
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+    /**
+     * 创建人
+     */
+	private String createdBy;
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java
new file mode 100644
index 000000000..020c6c889
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/excel/EpdcEventsExcel.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.excel;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Data
+public class EpdcEventsExcel {
+    @Excel(name = "ID")
+    private String id;
+    @Excel(name = "用户ID")
+    private String userId;
+    @Excel(name = "议题内容")
+    private String issueContent;
+    @Excel(name = "区")
+    private String area;
+    @Excel(name = "区ID")
+    private String areaId;
+    @Excel(name = "街道")
+    private String street;
+    @Excel(name = "街道ID")
+    private String streetId;
+    @Excel(name = "社区")
+    private String community;
+    @Excel(name = "社区ID")
+    private String communityId;
+    @Excel(name = "网格")
+    private String grid;
+    @Excel(name = "网格ID")
+    private String gridId;
+    @Excel(name = "议题位置地址")
+    private String issueAddress;
+    @Excel(name = "议题分类ID")
+    private String issueCategoryId;
+    @Excel(name = "议题位置纬度")
+    private BigDecimal issusLatitude;
+    @Excel(name = "议题位置经度")
+    private BigDecimal issueLongitude;
+    @Excel(name = "友邻社区ID")
+    private String friendlyCommunityId;
+    @Excel(name = "事件状态 0-待审核，2-驳回，4-审核通过")
+    private Integer eventState;
+    @Excel(name = "删除标识 0：未删除，1：已删除")
+    private String delFlag;
+    @Excel(name = "乐观锁")
+    private Integer revision;
+    @Excel(name = "创建人")
+    private String createdBy;
+    @Excel(name = "创建时间")
+    private Date createdTime;
+    @Excel(name = "更新人")
+    private String updatedBy;
+    @Excel(name = "更新时间")
+    private Date updatedTime;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/redis/EpdcEventsRedis.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/redis/EpdcEventsRedis.java
new file mode 100644
index 000000000..844582646
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/redis/EpdcEventsRedis.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.redis;
+
+import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Component
+public class EpdcEventsRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
new file mode 100644
index 000000000..7fddbd249
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.service;
+
+import com.elink.esua.epdc.commons.mybatis.service.BaseService;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
+import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+public interface EpdcEventsService extends BaseService<EpdcEventsEntity> {
+
+    PageData<EpdcEventsDTO> page(Map<String, Object> params);
+
+    List<EpdcEventsDTO> list(Map<String, Object> params);
+
+    EpdcEventsDTO get(String id);
+
+    void save(EpdcEventsDTO dto);
+
+    void update(EpdcEventsDTO dto);
+
+    void delete(String[] ids);
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
new file mode 100644
index 000000000..4dc2e1757
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.modules.events.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.elink.esua.epdc.commons.mybatis.enums.DelFlagEnum;
+import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dto.events.EpdcEventsDTO;
+import com.elink.esua.epdc.modules.events.dao.EpdcEventsDao;
+import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
+import com.elink.esua.epdc.modules.events.redis.EpdcEventsRedis;
+import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 事件表 事件表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@Service
+public class EpdcEventsServiceImpl extends BaseServiceImpl<EpdcEventsDao, EpdcEventsEntity> implements EpdcEventsService {
+    @Autowired
+    private EpdcEventsRedis epdcEventsRedis;
+
+    @Override
+    public PageData<EpdcEventsDTO> page(Map<String, Object> params) {
+        IPage<EpdcEventsEntity> page = baseDao.selectPage(
+                getPage(params, Constant.CREATED_TIME, false),
+                getWrapper(params)
+        );
+
+        return getPageData(page, EpdcEventsDTO.class);
+    }
+
+    @Override
+    public List<EpdcEventsDTO> list(Map<String, Object> params) {
+        List<EpdcEventsEntity> entityList = baseDao.selectList(getWrapper(params));
+
+        return ConvertUtils.sourceToTarget(entityList, EpdcEventsDTO.class);
+    }
+
+    private QueryWrapper<EpdcEventsEntity> getWrapper(Map<String, Object> params){
+        String startTime = (String)params.get("startTime");
+        String endTime = (String)params.get("endTime");
+
+        QueryWrapper<EpdcEventsEntity> wrapper = new QueryWrapper<>();
+        wrapper.between(StringUtils.isNotBlank(startTime), Constant.CREATED_TIME, startTime, endTime);
+        wrapper.eq(Constant.DEL_FLAG, DelFlagEnum.NORMAL.value());
+
+        return wrapper;
+    }
+
+    @Override
+    public EpdcEventsDTO get(String id) {
+        EpdcEventsEntity entity = baseDao.selectById(id);
+
+        return ConvertUtils.sourceToTarget(entity, EpdcEventsDTO.class);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void save(EpdcEventsDTO dto) {
+        EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
+
+        insert(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(EpdcEventsDTO dto) {
+        EpdcEventsEntity entity = ConvertUtils.sourceToTarget(dto, EpdcEventsEntity.class);
+
+        updateById(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void delete(String[] ids) {
+        //逻辑删除
+        //logicDelete(ids, EpdcEventsEntity.class);
+
+        //物理删除
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+}
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
index 5fbb1cb04..4216b3d4e 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
@@ -49,12 +49,12 @@ management:
 mybatis-plus:
   mapper-locations: classpath:/mapper/**/*.xml
   #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: io.renren.entity;com.elink.esua.epdc.entity
+  typeAliasesPackage: com.elink.esua.epdc.modules.*.entity
   global-config:
     #数据库相关配置
     db-config:
       #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: ID_WORKER
+      id-type: UUID
       #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
       field-strategy: NOT_NULL
       #驼峰下划线转换
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
new file mode 100644
index 000000000..05191f8be
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -0,0 +1,6 @@
+<?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.elink.esua.epdc.modules.events.dao.EpdcEventsDao">
+
+</mapper>