From d132ccb2e8e8d92088b9c452a00087b1a8518417 Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期四, 18 三月 2021 16:56:43 +0800 Subject: [PATCH] 居民管理 --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 72 ++++++++++++++++++++++++++++++++++-- 1 files changed, 68 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java index 6c06874..baf7d0c 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java @@ -3,10 +3,7 @@ import com.panzhihua.common.model.dtos.PageDTO; import com.panzhihua.common.model.dtos.community.ExportUserDTO; import com.panzhihua.common.model.dtos.community.NoticeReadDTO; -import com.panzhihua.common.model.dtos.user.EexcelUserDTO; -import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; -import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO; -import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO; +import com.panzhihua.common.model.dtos.user.*; import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; @@ -602,4 +599,71 @@ public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone){ return userService.getSysUserVOByPhone(phone); } + + /** + *分页查询人口管理 + * @param pageInputUserDTO 查询参数 + * @return 分页数据 + */ + @PostMapping("/common/data/user/page") + public R pageInputUser(@RequestBody PageInputUserDTO pageInputUserDTO){ + return sysUserInputService.pageInputUser(pageInputUserDTO); + } + + /** + * 设置用户标签 + * @param inputUserTagsDTO 标签信息 + * @return 设置结果 + */ + @PostMapping("/common/data/user/tags") + public R setInputUserTag(@RequestBody InputUserTagsDTO inputUserTagsDTO){ + return sysUserInputService.putUserTag(inputUserTagsDTO); + } + + /** + * 批量导入居民用户 + * @param list 居民用户集合 + * @param areaName 小区名字 + * @return 导入结果 + */ + @PostMapping("/common/data/user/import") + public R batchSaveInputUser(@RequestBody List<EexcelUserDTO> list,@RequestParam("areaName")StringBuffer areaName){ + R r = null; + try { + r = sysUserInputService.batchSaveUser(list, areaName); + } catch (Exception e) { + String message = e.getMessage(); + log.error(message); + if (message.contains("unique_id_card")) { + int i = message.indexOf("'"); + String idcard = message.substring(i + 1, message.indexOf("'", i + 1)); +// System.out.println(idcard); + return R.fail("身份证存在重复"+idcard); + }else { + return R.fail(e.getMessage()); + } + } + return r; + } + + /** + * 居民管理》居民详情 + * @param id 人员id + * @return CommunityUserInfoVO + */ + @PostMapping("/common/data/user/detail") + public R inputUserDetail(@RequestParam("id")Long id){ + InputUserInfoVO inputUserInfoVO=sysUserInputService.inputUserDetail(id); + return R.ok(inputUserInfoVO); + } + + /** + * 用户搜索了就下载搜索的用户否则下载所有用户 + * @param exportUserDTO 用户搜索内容 + * @return List<EexcelUserDTO> excel内容 + */ + @PostMapping("/common/data/user/export") + public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){ + return sysUserInputService.export(exportUserDTO); + } } -- Gitblit v1.7.1