From e3182f4a1520d26416690d615a94f3e86acf0272 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 31 Mar 2020 10:40:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=A1=B5=E9=9D=A2=E5=88=9D=E5=A7=8B=E5=8C=96-?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=98=AF=E5=90=A6=E5=B7=B2=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=A1=8C=E4=B8=BA=E8=AE=B0=E5=BD=95=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/ResiPartymemberFeignClient.java | 1 - .../ResiPartymemberFeignClientFallBack.java | 4 - .../controller/ResiWarmheartedController.java | 11 ++ .../partymember/PartymemberBaseInfoDTO.java | 102 ------------ .../PartymemberConfirmAutoDTO.java | 138 ---------------- .../PartymemberConfirmManualDTO.java | 102 ------------ .../dto/partymember/PartymemberInfoDTO.java | 147 ------------------ .../PartymemberRegisterRelationDTO.java | 102 ------------ .../dto/partymember/PartymemberVisitDTO.java | 102 ------------ .../partymember/dto/partymember/form/.gitkeep | 0 .../dto/partymember/result/.gitkeep | 0 .../warmhearted/ResiWarmheartedApplyDTO.java | 107 ------------- .../warmhearted/ResiWarmheartedVisitDTO.java | 102 ------------ .../partymember/dto/warmhearted/form/.gitkeep | 0 .../form/ResiWarmheartedFormDTO.java | 59 ------- .../dto/warmhearted/result/.gitkeep | 0 .../result/ResiWarmheartedResultDTO.java | 45 ------ .../service/ResiWarmheartedVisitService.java | 1 - 18 files changed, 11 insertions(+), 1012 deletions(-) delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep delete mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java index 052a1c0cd0..2c372af455 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java @@ -2,7 +2,6 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.fallback.ResiPartymemberFeignClientFallBack; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java index 2f5d1c91c4..6580756d0e 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java @@ -3,10 +3,6 @@ package com.epmet.modules.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.ResiRegisterFormDTO; -import com.epmet.dto.result.LatestGridInfoResultDTO; -import com.epmet.dto.result.ResiRegisterResultDTO; -import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.ResiPartymemberFeignClient; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO; import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO; diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java index 46033e7952..1d16ebf454 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java @@ -33,4 +33,15 @@ public class ResiWarmheartedController { return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO); } + /** + * @param + * @Author sun + * @Description 居民端-热心居民申请-提交申请数据 + **/ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) { + return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java deleted file mode 100644 index 64c423c0ca..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberBaseInfoDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员库基本信息表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberBaseInfoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 姓名 - */ - private String name; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 手机号 - */ - private String mobile; - - /** - * 所在党组织 - */ - private String organization; - - /** - * 所在党支部 - */ - private String branch; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java deleted file mode 100644 index bd17f2582b..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java +++ /dev/null @@ -1,138 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员认证自动审核表 -只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberConfirmAutoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 党员认证信息表Id - */ - private String partymemberInfoId; - - /** - * 党员库Id - */ - private String patryMemberBaseInfoId; - - /** - * 录入姓名 - */ - private String inputName; - - /** - * 党员库姓名 - */ - private String baseName; - - /** - * 姓名比对结果 - */ - private String nameResult; - - /** - * 录入手机号 - */ - private String inputMobile; - - /** - * 党员库手机号 - */ - private String baseMobile; - - /** - * 手机号比对结果 - */ - private String mobileResult; - - /** - * 录入身份证号 - */ - private String inputIdCard; - - /** - * 党员库身份证号 - */ - private String baseIdCard; - - /** - * 身份证比对结果 - */ - private String idCardResult; - - /** - * 整体结果 【11:完全匹配 10:大部分匹配 01:小部分匹配 00:完全不匹配】 - */ - private String result; - - /** - * 比对时间 - */ - private Date contrastTime; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java deleted file mode 100644 index 0622ced8b3..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmManualDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员认证人工审核表 人工审核时要展示自动审核的结果，同事允许前台去修改党员认证信息表的数据 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberConfirmManualDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 用户Id (user.id) - */ - private String userId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * partymember_info表Id (partymember_info.id) - */ - private String partymemberInfoId; - - /** - * 审核状态 【key:audit_status,value:(under_auditting:待审核，approved:通过，rejected :未通过)】 - */ - private String auditStatus; - - /** - * 拒绝理由 - */ - private String refuseReason; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java deleted file mode 100644 index 21b7eb5bac..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java +++ /dev/null @@ -1,147 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员认证信息表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberInfoDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 用户Id (user.id) - */ - private String userId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * partymember_visit.id - */ - private String partymemberVisitId; - - /** - * 认证结果(0:成功 1:失败) - */ - private String confirmResult; - - /** - * 姓氏 - */ - private String surname; - - /** - * 名称 - */ - private String name; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 手机号 - */ - private String mobile; - - /** - * 街道 - */ - private String street; - - /** - * 小区名称 - */ - private String estate; - - /** - * 楼栋单元 - */ - private String building; - - /** - * 党组织关系(工作单位或其他街道) - */ - private String extraOrganization; - - /** - * 证明人姓名 - */ - private String extraCertifierName; - - /** - * 证明人电话 - */ - private String extraCertifierMobile; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java deleted file mode 100644 index dc2e9d5fa8..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员注册关系表 用于统计客户网格的认证党员数 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberRegisterRelationDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * 用户Id (user.id) - */ - private String userId; - - /** - * 首次注册用户 (0表示不参与计数 1表示参与计数) - */ - private String firstRegister; - - /** - * 注册用户 (0表示不参与计数 1表示参与计数) - */ - private String register; - - /** - * 参与用户 (0表示不参与计数 1表示参与计数) - */ - private String partake; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java deleted file mode 100644 index f63dc2917a..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberVisitDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.partymember; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 党员认证行为记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class PartymemberVisitDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 用户Id (user.id) - */ - private String userId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * 认证来源(value:feature+action) - */ - private String visitFrom; - - /** - * 访问时间 - */ - private Date visitTime; - - /** - * 操作行为 【key:operate_visit value:（initialize:初始化 sms_Code:获取验证码 success:提交成功 faild:提交失败）【页面初始化、手机号验证码获取、提交后(验证码是否正确，数据库数据保存是否成功)成功，提交后(验证码输入错误或者数据保存错误)失败四种行为】 - */ - private String operateVisit; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java deleted file mode 100644 index 31c92d0a34..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedApplyDTO.java +++ /dev/null @@ -1,107 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.warmhearted; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 热心居民申请表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class ResiWarmheartedApplyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * 用户Id (user.id) - */ - private String userId; - - /** - * 热心居民申请理由 (300字) - */ - private String reason; - - /** - * 审核状态 【key:audit_status,value:(under_auditting:待审核，approved:通过，rejected :未通过)】 - */ - private String auditStatus; - - /** - * 拒绝理由 - */ - private String refuseReason; - - /** - * 热心居民申请行为记录表Id (resi_warmhearted_visit.id) - */ - private String resiWarmVisitId; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人（审核人ID） - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java deleted file mode 100644 index 9c3ed1b6e0..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/ResiWarmheartedVisitDTO.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.warmhearted; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 热心居民申请行为记录表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-03-30 - */ -@Data -public class ResiWarmheartedVisitDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 唯一标识 - */ - private String id; - - /** - * 客户Id (customer.id) - */ - private String customerId; - - /** - * 网格Id (customer_grid.id) - */ - private String gridId; - - /** - * 用户Id user.id - */ - private String userId; - - /** - * 申请来源(value:feature+action) - */ - private String visitFrom; - - /** - * 访问时间 - */ - private Date visitTime; - - /** - * 操作行为 【key:operate_visit value:（initialize:初始化 success:提交成功 faild:提交失败）】 - */ - private String operateVisit; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java deleted file mode 100644 index 4c05ab5391..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.warmhearted.form; - -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import java.io.Serializable; - - -/** - * 居民端-居民注册页面初始化-居民访问记录表新增数据-配置入参 - * @author sun - */ -@Data -public class ResiWarmheartedFormDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 客户Id CUSTOMER.id - */ - @NotBlank(message = "客户ID不能为空") - private String customerId; - - /** - * 网格Id - */ - @NotBlank(message = "网格ID不能为空") - private String gridId; - - /** - * 访问来源 指的是用户点的那个功能进入到的注册页面，就是一个功能模块的Id（value:feature+action） - */ - @NotBlank(message = "访问来源不能为空") - private String visitFrom; - - /** - * 用户Id - */ - @NotBlank(message = "用户ID不能为空") - private String userId; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java deleted file mode 100644 index d6338f9b26..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * 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. - *

- * 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. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.resi.partymember.dto.warmhearted.result; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据-配置入参 - * @author sun - */ -@Data -public class ResiWarmheartedResultDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 是否已申请热心居民 0：否， 1：是 - */ - private String isApplied; - - /** - * 热心居民申请访问记录表(resi_warmhearted_visit)Id - */ - private String resiWarmheartedVisitId; - -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java index 6295386850..5547cfa243 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java @@ -19,7 +19,6 @@ package com.epmet.modules.warmhearted.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity; import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO; import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;