From e02c31644bd35a5ad0b3bd5367eacee7557fd0b3 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 26 Nov 2019 13:57:51 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiWorkUserController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 4671050c0..4b8d0a15d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -70,7 +70,7 @@ public class ApiWorkUserController { * @return */ @GetMapping("residentDetail") - public Result residentDetail(@RequestBody EpdcResidentDetailFormDTO formDto) { + public Result residentDetail(EpdcResidentDetailFormDTO formDto) { ValidatorUtils.validateEntity(formDto); return workUserService.residentDetail(formDto); } @@ -142,7 +142,7 @@ public class ApiWorkUserController { * @Date 2019/11/22 13:16 **/ @GetMapping("authenticateHistory") - public Result> authenticateHistory(@RequestBody EpdcAuthenticateHistoryFormDTO formDTO) { + public Result> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return workUserService.authenticateHistory(formDTO); } From dab8d66ee5a28a8571c3cd08e21d866a79d4b70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= Date: Tue, 26 Nov 2019 14:45:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 84da52b68..fc0fcd5a7 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -487,7 +487,7 @@ #{timestamp} ORDER BY ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC, - issue.DISTRIBUTE_TIME DESC + t1.DISTRIBUTE_TIME DESC LIMIT #{pageIndex},#{pageSize} ) temp ) From 1070d34d3a7a7757eeb09460409ec39f40f8bb64 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 26 Nov 2019 14:52:47 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B1=85=E6=B0=91=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=8D=E5=8F=82=E6=B7=BB=E5=8A=A0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E3=80=81=E8=AE=A4=E8=AF=81=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/result/EpdcResidentDetailResultDTO.java | 4 ++++ .../elink/esua/epdc/service/impl/UserServiceImpl.java | 10 +++++++++- .../src/main/resources/mapper/UserDao.xml | 4 +++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java index ba396c433..43921ea2c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java @@ -45,6 +45,10 @@ public class EpdcResidentDetailResultDTO implements Serializable { * 审核状态（1待认证 3已认证） */ private String state; + /** + * 用户手机号 + */ + private String mobile; /** * 扫码网格列表 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 90d4ea86a..bc8b6dc8c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -569,7 +569,15 @@ public class UserServiceImpl extends BaseServiceImpl implem } else { throw new RenException("是否认证通过数据不匹配"); } - this.update(userDTO); + //插入认证历史表 + UserAuthenticateHistoryEntity authenticateHistoryEntity=new UserAuthenticateHistoryEntity(); + authenticateHistoryEntity.setUserId(userDTO.getId()); + authenticateHistoryEntity.setMobile(userDTO.getMobile()); + authenticateHistoryEntity.setRealName(userDTO.getRealName()); + authenticateHistoryEntity.setAddress(userDTO.getAddress()); + authenticateHistoryEntity.setAuthenticatedFlag(formDTO.getAuthenticatedFlag());//是否认证通过 0未通过1通过 + //authenticateHistoryEntity.setRemark(userDTO.getRemark()); + userAuthenticateHistoryDao.insert(authenticateHistoryEntity); } return new Result(); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index d6e69cf1b..6166be296 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -105,6 +105,7 @@ + @@ -120,6 +121,7 @@ eu.DWELLING_PLACE, eu.PARTY_FLAG , eu.state, + eu.mobile, CONCAT_WS('-',eugr.STREET,eugr.COMMUNITY,eugr.GRID) as completeName, eugr.LEADER_FLAG as leaderFlag FROM @@ -306,4 +308,4 @@ AND ug_r.DEL_FLAG = '0' AND u.DEL_FLAG = '0' - \ No newline at end of file + From b67db51db5403e2e3f57d2105f9e2519e8f8a013 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Tue, 26 Nov 2019 15:09:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E8=AF=A6=E6=83=85=20=E6=B7=BB=E5=8A=A0=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AppMenuTemplateDao.xml | 1 - .../esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java | 4 ++++ .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml index c9dd0caca..686ad744a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/AppMenuTemplateDao.xml @@ -10,7 +10,6 @@ - diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java index 5bcb11eb4..510e5c994 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcPartyMemberDetailDto.java @@ -18,6 +18,10 @@ public class EpdcPartyMemberDetailDto implements Serializable { * 真实姓名 */ private String realName; + /** + * 手机号 + */ + private String mobile; /** * 身份证号 */ diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 6166be296..5745587cb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -192,6 +192,7 @@ eu.REAL_NAME AS realName, eu.IDENTITY_NO AS identityNo, eu.ROAD AS road, + eu.MOBILE as mobile, eu.VILLAGE_NAME AS villageName, eu.DWELLING_PLACE as dwellingPlace, '1' as authenticatedFlag, From f64d7a11870e70f353d256be63550663608b673a Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 26 Nov 2019 15:56:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiWorkUserController.java | 26 ++-- .../esua/epdc/service/WorkUserService.java | 136 ++++++++++-------- .../service/impl/WorkUserServiceImpl.java | 4 + 3 files changed, 96 insertions(+), 70 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 4b8d0a15d..3a24964e5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; /** * 工作端，用户登录，用户管理相关接口 @@ -34,11 +33,10 @@ public class ApiWorkUserController { private WorkUserService workUserService; /** - * * 工作端-获取token * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/19 17:23 */ @@ -49,11 +47,10 @@ public class ApiWorkUserController { } /** - * * 工作端-用户登录 * - * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] * @author liuchuang * @since 2019/11/19 23:03 */ @@ -101,7 +98,7 @@ public class ApiWorkUserController { /*** * 用户列表 * @param workUserFromDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/11/18 13:53 */ @@ -118,8 +115,8 @@ public class ApiWorkUserController { * @date 2019/11/19 10:54 */ @GetMapping("unauthorizedAmount") - public Result unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto){ - return workUserService.getUnauthorizedAmount(userDetail,fromDto); + public Result unauthorizedAmount(@LoginUser TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto) { + return workUserService.getUnauthorizedAmount(userDetail, fromDto); } /** @@ -146,4 +143,17 @@ public class ApiWorkUserController { ValidatorUtils.validateEntity(formDTO); return workUserService.authenticateHistory(formDTO); } + + /** + * 获取用户扫码的网格 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/11/26 15:52 + */ + @GetMapping("listGrid") + public Result> listUserGrid(String userId) { + return workUserService.listUserGrid(userId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index 5c9757cd9..9c52e7fa9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java @@ -19,47 +19,49 @@ import java.util.Map; */ public interface WorkUserService { - /** - * - * 工作端-获取token - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/11/19 17:28 - */ - Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto); + /** + * 工作端-获取token + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author liuchuang + * @since 2019/11/19 17:28 + */ + Result getMaToken(EpdcWorkAppUserMaTokenFormDTO formDto); + + /** + * 工作端-用户登录 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [formDto] + * @author liuchuang + * @since 2019/11/19 23:04 + */ + Result login(WorkUserLoginDTO formDto); - /** - * - * 工作端-用户登录 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/11/19 23:04 - */ - Result login(WorkUserLoginDTO formDto); + /** + * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户） + * + * @param formDto 用户Id + * @return + */ + Result residentDetail(EpdcResidentDetailFormDTO formDto); - /** - * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户） - * @param formDto 用户Id - * @return - */ - Result residentDetail(EpdcResidentDetailFormDTO formDto); - /** - * 认证用户（用户信息审核） - * @param formDTO - * @return - */ - Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); + /** + * 认证用户（用户信息审核） + * + * @param formDTO + * @return + */ + Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); - /** - * 获取党员详情（已认证或未认证的党员用户） - * @param userId - * @return - */ - Result partyMemberDetail(String userId); + /** + * 获取党员详情（已认证或未认证的党员用户） + * + * @param userId + * @return + */ + Result partyMemberDetail(String userId); /*** * 用户列表 @@ -70,30 +72,40 @@ public interface WorkUserService { */ Result> listWorkUser(TokenDto userDetail, EpdcWorkUserFromDTO workUserFromDto); - /*** - * 查询待认证用户数量 - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author qushutong - * @date 2019/11/19 10:56 - */ - Result getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto); + /*** + * 查询待认证用户数量 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2019/11/19 10:56 + */ + Result getUnauthorizedAmount(TokenDto userDetail, EpdcUnauthorizedAmountFromDTO fromDto); - /** - * @param userDetail - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 首页面板 获取工作端APP菜单 - * @Date 2019/11/20 10:43 - **/ - Result> indexPanel(TokenDto userDetail); + /** + * @param userDetail + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 首页面板 获取工作端APP菜单 + * @Date 2019/11/20 10:43 + **/ + Result> indexPanel(TokenDto userDetail); - /** - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 用户认证审核历史 - * @Date 2019/11/22 13:16 - **/ - Result> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO); + /** + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author yinzuomei + * @Description 用户认证审核历史 + * @Date 2019/11/22 13:16 + **/ + Result> authenticateHistory(EpdcAuthenticateHistoryFormDTO formDTO); + + /** + * 获取用户扫码的网格 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2019/11/26 15:52 + */ + Result> listUserGrid(String userId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 2dc9c6a28..e744f95c0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -178,4 +178,8 @@ public class WorkUserServiceImpl implements WorkUserService { return userFeignClient.authenticateHistory(formDTO); } + @Override + public Result> listUserGrid(String userId) { + return userFeignClient.listUserGrid(userId); + } } From 8510e4744b724f9dae5b71c39ab63ae4e349f3ba Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 26 Nov 2019 16:23:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9KPI=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-module/epdc-kpi/epdc-kpi-client/pom.xml | 11 +++++++++++ .../epdc-module/epdc-kpi/epdc-kpi-server/pom.xml | 2 ++ .../epdc-module/epdc-news/epdc-news-server/pom.xml | 5 ----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml index 0e6be7261..8663d5d04 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/pom.xml @@ -10,6 +10,17 @@ 4.0.0 epdc-kpi-client + jar + + + com.esua.epdc + epdc-commons-tools + 1.0.0 + + + + ${project.artifactId} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index 696114d91..0071e0dd0 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -10,6 +10,8 @@ 4.0.0 epdc-kpi-server + jar + com.esua.epdc diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index 9f6046fb4..e64a0c1d3 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -18,11 +18,6 @@ epdc-news-client 1.0.0 - - com.esua.epdc - epdc-commons-tools - 1.0.0 - com.esua.epdc epdc-commons-mybatis