54 changed files with 649 additions and 92 deletions
			
			
		| @ -0,0 +1,22 @@ | |||
| CREATE TABLE `event` ( | |||
|   `ID` varchar(64) NOT NULL COMMENT '主键', | |||
|   `CLASS_ID` varchar(32) DEFAULT NULL COMMENT '消息网关事件类别ID 从消息网关获取事件类型Id', | |||
|   `APP_ID` varchar(128) DEFAULT NULL COMMENT '消息网关APP_ID', | |||
|   `APP_NAME` varchar(32) DEFAULT NULL COMMENT '消息网关APP_NAME', | |||
|   `EVENT_CODE` varchar(32) DEFAULT NULL COMMENT '事件标识 与消息网关事件tag一致', | |||
|   `EVENT_NAME` varchar(32) DEFAULT NULL COMMENT '事件名称', | |||
|   `EVENT_DESC` varchar(64) DEFAULT NULL COMMENT '事件说明', | |||
|   `FUNCTION_ID` varchar(64) DEFAULT NULL COMMENT '功能ID 来自oper_customize.customer_function表', | |||
|   `IS_COMMON` varchar(1) DEFAULT NULL COMMENT '是否是通用事件 0-否,1-是;消息体内需要体现该字段,通用则说明由业务系统自己计算分值', | |||
|   `DEL_FLAG` varchar(1) DEFAULT NULL COMMENT '删除标识 0-否,1-是', | |||
|   `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁 查询时添加版本号,新加的事件需要更新版本号', | |||
|   `CREATED_BY` varchar(32) DEFAULT NULL COMMENT '创建人', | |||
|   `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', | |||
|   `UPDATED_BY` varchar(32) DEFAULT NULL COMMENT '更新人', | |||
|   `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', | |||
|   PRIMARY KEY (`ID`), | |||
|   UNIQUE KEY `unx_event_code` (`EVENT_CODE`) | |||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件表'; | |||
| INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'register_volunteer', '注册志愿者', '给注册志愿者的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17'); | |||
| INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'active_send_point', '活动发放积分', '给参加活动的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49'); | |||
| INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通开发测试', 'publist_active_live', '发布实况', '给发布实况的人发放积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49'); | |||
| @ -0,0 +1,63 @@ | |||
| package com.epmet.dto.form.work; | |||
| 
 | |||
| import com.alibaba.fastjson.JSON; | |||
| import lombok.Data; | |||
| 
 | |||
| import javax.validation.constraints.NotBlank; | |||
| import javax.validation.constraints.NotNull; | |||
| import java.io.Serializable; | |||
| 
 | |||
| /** | |||
|  * 描述一下 | |||
|  * | |||
|  * @author yinzuomei@elink-cn.com | |||
|  * @date 2020/7/30 12:15 | |||
|  */ | |||
| @Data | |||
| public class TestGrantFormDTO implements Serializable { | |||
|     private static final long serialVersionUID = -2643821406956680381L; | |||
|     public interface AddUserInternalGroup {} | |||
|     /** | |||
|      * 当前客户id | |||
|      */ | |||
|     @NotBlank(message = "客户id不能为空",groups = AddUserInternalGroup.class) | |||
|     private String customerId; | |||
|     /** | |||
|      * 居民id | |||
|      */ | |||
|     @NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) | |||
|     private String userId; | |||
|     /** | |||
|      * 分值 | |||
|      */ | |||
|     @NotNull(message = "分值不能为空",groups = AddUserInternalGroup.class) | |||
|     private Integer reward; | |||
|     /** | |||
|      * 业务id eg:活动id | |||
|      */ | |||
|     @NotBlank(message = "业务id不能为空",groups = AddUserInternalGroup.class) | |||
|     private String sourceId; | |||
|     /** | |||
|      * 备注 | |||
|      */ | |||
|     @NotBlank(message = "备注不能为空",groups = AddUserInternalGroup.class) | |||
|     private String remark; | |||
| 
 | |||
|     /** | |||
|      * 加减分标识 plus/minus | |||
|      */ | |||
|     @NotBlank(message = "加减分标识 plus/minus不能为空",groups = AddUserInternalGroup.class) | |||
|     private String actionFlag; | |||
| 
 | |||
|     TestGrantFormDTO(){ | |||
|         this.customerId=""; | |||
|         this.userId=""; | |||
|         this.sourceId="111"; | |||
|         this.reward=20; | |||
|         this.remark="test"; | |||
|         this.actionFlag="plus"; | |||
|     } | |||
|     public static void main(String[] args) { | |||
|         System.out.println(JSON.toJSON(new TestGrantFormDTO())); | |||
|     } | |||
| } | |||
| @ -0,0 +1,86 @@ | |||
| package com.epmet.dto.result.resi; | |||
| import lombok.Data; | |||
| 
 | |||
| import java.io.Serializable; | |||
| 
 | |||
| /** | |||
|  * 志愿者信息+用户基础信息 返回值 | |||
|  * @Auther: zhangyong | |||
|  * @Date: 2020-07-28 14:40 | |||
|  */ | |||
| 
 | |||
| @Data | |||
| public class ResiVolunteerInfoResultDTO implements Serializable { | |||
| 
 | |||
|     private static final long serialVersionUID = 1L; | |||
| 
 | |||
|     /** | |||
|      * 用户id | |||
|      */ | |||
|     private String userId; | |||
| 
 | |||
|     /** | |||
|      * 手机号(注册手机号) | |||
|      */ | |||
|     private String mobile; | |||
| 
 | |||
|     /** | |||
|      * 姓氏 | |||
|      */ | |||
|     private String surname; | |||
| 
 | |||
|     /** | |||
|      * 名 | |||
|      */ | |||
|     private String name; | |||
| 
 | |||
|     /** | |||
|      * 姓名 | |||
|      */ | |||
|     private String realName; | |||
| 
 | |||
|     /** | |||
|      * 身份证号 | |||
|      */ | |||
|     private String idNum; | |||
| 
 | |||
|     /** | |||
|      * 性别(1男2女0未知) | |||
|      */ | |||
|     private String gender; | |||
| 
 | |||
|     /** | |||
|      * 街道 | |||
|      */ | |||
|     private String street; | |||
| 
 | |||
|     /** | |||
|      * 小区名称 | |||
|      */ | |||
|     private String district; | |||
| 
 | |||
|     /** | |||
|      * 楼栋单元 | |||
|      */ | |||
|     private String buildingAddress; | |||
| 
 | |||
|     /** | |||
|      * 昵称(目前来源于微信昵称,后续系统可支持用户有昵称) | |||
|      */ | |||
|     private String nickname; | |||
| 
 | |||
|     /** | |||
|      * 头像(目前来源于微信,后续系统顾客支持上传头像) | |||
|      */ | |||
|     private String headImgUrl; | |||
| 
 | |||
|     /** | |||
|      * 志愿者签名 | |||
|      */ | |||
|     private String volunteerSignature; | |||
| 
 | |||
|     /** | |||
|      * 志愿者自我介绍 | |||
|      */ | |||
|     private String volunteerIntroduce; | |||
| } | |||
| @ -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.epmet.dao; | |||
| 
 | |||
| import com.epmet.commons.mybatis.dao.BaseDao; | |||
| import com.epmet.entity.ActGrantPointLogEntity; | |||
| import org.apache.ibatis.annotations.Mapper; | |||
| 
 | |||
| /** | |||
|  * 活动发放积分日志表 | |||
|  * | |||
|  * @author generator generator@elink-cn.com | |||
|  * @since v1.0.0 2020-07-30 | |||
|  */ | |||
| @Mapper | |||
| public interface ActGrantPointLogDao extends BaseDao<ActGrantPointLogEntity> { | |||
| 	 | |||
| } | |||
| @ -0,0 +1,73 @@ | |||
| /** | |||
|  * 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.epmet.entity; | |||
| 
 | |||
| import com.baomidou.mybatisplus.annotation.TableName; | |||
| import com.epmet.commons.mybatis.entity.BaseEpmetEntity; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| 
 | |||
| /** | |||
|  * 活动发放积分日志表 | |||
|  * | |||
|  * @author generator generator@elink-cn.com | |||
|  * @since v1.0.0 2020-07-30 | |||
|  */ | |||
| @Data | |||
| @EqualsAndHashCode(callSuper=false) | |||
| @TableName("act_grant_point_log") | |||
| public class ActGrantPointLogEntity extends BaseEpmetEntity { | |||
| 
 | |||
| 	private static final long serialVersionUID = 1L; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String customerId; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String actId; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private Integer reward; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String remark; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String operatorId; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String sendMsg; | |||
| 
 | |||
|     /** | |||
|      *  | |||
|      */ | |||
| 	private String responseMsg; | |||
| 
 | |||
| } | |||
| @ -0,0 +1,24 @@ | |||
| <?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.epmet.dao.ActGrantPointLogDao"> | |||
| 
 | |||
|     <resultMap type="com.epmet.entity.ActGrantPointLogEntity" id="actGrantPointLogMap"> | |||
|         <result property="id" column="ID"/> | |||
|         <result property="customerId" column="CUSTOMER_ID"/> | |||
|         <result property="actId" column="ACT_ID"/> | |||
|         <result property="reward" column="REWARD"/> | |||
|         <result property="remark" column="REMARK"/> | |||
|         <result property="operatorId" column="OPERATOR_ID"/> | |||
|         <result property="sendMsg" column="SEND_MSG"/> | |||
|         <result property="responseMsg" column="RESPONSE_MSG"/> | |||
|         <result property="revision" column="REVISION"/> | |||
|         <result property="delFlag" column="DEL_FLAG"/> | |||
|         <result property="createdBy" column="CREATED_BY"/> | |||
|         <result property="createdTime" column="CREATED_TIME"/> | |||
|         <result property="updatedBy" column="UPDATED_BY"/> | |||
|         <result property="updatedTime" column="UPDATED_TIME"/> | |||
|     </resultMap> | |||
| 
 | |||
| 
 | |||
| </mapper> | |||
					Loading…
					
					
				
		Reference in new issue