From 14c16f352f2d8d083cd329da7fe2c065a4537c73 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期一, 26 四月 2021 14:01:47 +0800
Subject: [PATCH] fix:修改商家添加功能逻辑代码
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 556 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 545 insertions(+), 11 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 63c0cfb..fd73d64 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
@@ -1,17 +1,23 @@
package com.panzhihua.service_user.api;
+import com.panzhihua.common.model.dtos.PageDTO;
+import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
+import com.panzhihua.common.model.dtos.community.ExportUserDTO;
+import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+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.user.ChangePasswordVO;
-import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
-import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.service_user.service.SysUserInputService;
import com.panzhihua.service_user.service.UserService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -19,10 +25,13 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-24 09:00
**/
+@Slf4j
@RestController("/")
public class UserApi {
@Resource
private UserService userService;
+ @Resource
+ private SysUserInputService sysUserInputService;
/**
* 新增微信用户
@@ -67,9 +76,9 @@
*/
@PostMapping("/getUserInfo")
public R<LoginUserInfoVO> getUserInfo(@RequestParam("userName") String userName){
- int index = userName.indexOf("_");
+ int index = userName.lastIndexOf("_");
String type = userName.substring(index+1, userName.length());
- String name = userName.substring(0, userName.indexOf("_"));
+ String name = userName.substring(0, index);
return userService.getUserInfo(name,Integer.parseInt(type));
}
@@ -144,6 +153,15 @@
}
/**
+ * 查询当前社区所有标签以及预设标签
+ * @return 标签集合
+ */
+ @PostMapping("listtag/getTag")
+ public R listTags(@RequestParam("communityId") Long communityId){
+ return userService.listTags(communityId);
+ }
+
+ /**
* 人员详情
* @param userId 用户id
* @return 人员详情
@@ -209,7 +227,7 @@
* @return 修改结果
*/
@PostMapping("putuser")
- public R putUser(LoginUserInfoVO loginUserInfoVO){
+ public R putUser(@RequestBody LoginUserInfoVO loginUserInfoVO){
return userService.putUser(loginUserInfoVO);
}
@@ -229,7 +247,7 @@
* @return 增加结果
*/
@PostMapping("addFamily")
- public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO){
+ public R addFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){
return userService.addFamily(comMngFamilyInfoVO);
}
@@ -242,4 +260,520 @@
public R putFamily(@RequestBody ComMngFamilyInfoVO comMngFamilyInfoVO){
return userService.putFamily(comMngFamilyInfoVO);
}
+
+ /**
+ * 新增运营、社区后台账户
+ * @param administratorsUserVO 账户信息
+ * @return 新增结果
+ */
+ @PostMapping("adduserbackstage")
+ public R addUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+
+ return userService.addUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 编辑运营、社区后台账户
+ * @param administratorsUserVO 编辑账户内容
+ * @return 编辑结果
+ */
+ @PostMapping("putuserbackstage")
+ R putUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.putUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 删除后台用户
+ * @param administratorsUserVO 用户主键
+ * @return 删除结果
+ */
+ @PostMapping("deleteuserbackstage")
+ public R deleteUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.deleteUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 分页查询后台用户
+ * @param administratorsUserVO 查询参数
+ * @return 后台用户
+ */
+ @PostMapping("pageuserbackstage")
+ public R pageUserBackstage(@RequestBody AdministratorsUserVO administratorsUserVO){
+ return userService.pageUserBackstage(administratorsUserVO);
+ }
+
+ /**
+ * 保存操作日志
+ * @param operlog 日志内容
+ * @return 保存结果
+ */
+ @PostMapping("addoperlog")
+ public R addOperLog(@RequestBody SysOperLogVO operlog){
+ return userService.addOperLog(operlog);
+ }
+
+ /**
+ * 分页展示操作日志
+ * @param sysOperLogVO 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pageoperlog")
+ public R pageOperLog(@RequestBody SysOperLogVO sysOperLogVO){
+ return userService.pageOperLog(sysOperLogVO);
+ }
+
+ /**
+ * 用户协议
+ * @return 协议集合
+ */
+ @PostMapping("listagreement")
+ public R listAgreement(){
+ return userService.listAgreement();
+ }
+
+ /**
+ * 编辑用户协议
+ * @param sysUserAgreementVO 编辑内容
+ * @return 编辑结果
+ */
+ @PostMapping("putagreement")
+ public R putAgreement(@RequestBody SysUserAgreementVO sysUserAgreementVO){
+ return userService.putAgreement(sysUserAgreementVO);
+ }
+
+ /**
+ * 用户标签
+ * @param communityId 社区id
+ * @return 标签集合
+ */
+ @PostMapping("listcommngusertag")
+ public R listComMngUserTag(@RequestParam("communityId")Long communityId){
+ return userService.listComMngUserTag(communityId);
+ }
+
+ /**
+ * 新增删除用户标签
+ * @param systemmanagementConfigVO 操作内容
+ * @return 操作结果
+ */
+ @PostMapping("putcommngusertag")
+ public R putComMngUserTag(@RequestBody SystemmanagementConfigVO systemmanagementConfigVO){
+ return userService.putComMngUserTag(systemmanagementConfigVO);
+ }
+
+ /**
+ * 分页查询小程序用户
+ * @param pageUserAppletsBackstageDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("pageuserappletsbackstage")
+ public R pageUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
+ return userService.pageUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ /**
+ * 编辑用户状态
+ * @param pageUserAppletsBackstageDTO 启用或者禁用 1 启用 2 禁用
+ * @return 编辑结果
+ */
+ @PostMapping("putuserappletsbackstage")
+ public R putUserAppletsBackstage(@RequestBody PageUserAppletsBackstageDTO pageUserAppletsBackstageDTO){
+ return userService.putUserAppletsBackstage(pageUserAppletsBackstageDTO);
+ }
+
+ /**
+ * 调试接口--清除昵称、社区、小区
+ * @param userId 登录用户id
+ * @return 清除结果
+ */
+ @PostMapping("deleteusertest")
+ public R deleteUserTest(@RequestParam("userId")Long userId){
+ return userService.deleteUserTest(userId);
+ }
+
+ /**
+ * 用户协议和隐私政策
+ * @param type 所属app 1居民端app 2网格员端app 3商家端app
+ * @return 协议内容
+ */
+ @PostMapping("useragreement")
+ public R userAgreement(@RequestParam("type")int type){
+ return userService.userAgreement(type);
+ }
+
+ /**
+ * 意见反馈
+ * @param sysUserFeedbackDTO 反馈内容
+ * @return 反馈结果
+ */
+ @PostMapping("addfeedback")
+ public R addFeedback(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ /**
+ * 分页通知列表
+ * @param pageDTO 分页参数
+ * @return 分页结果
+ */
+ @PostMapping("pagenotice")
+ public R pageNotice(@RequestBody PageDTO pageDTO){
+ return userService.pageNotice(pageDTO);
+ }
+
+ /**
+ * 通知已读
+ * @param noticeReadDTO 通知已读
+ * @return 修改状态
+ */
+ @PostMapping("putnotice")
+ public R putNotice(@RequestBody NoticeReadDTO noticeReadDTO){
+ return userService.putNotice(noticeReadDTO);
+ }
+
+ /**
+ * 分页查询用户意见反馈
+ * @param pageFeedBackDTO 分页查询参数
+ * @return 意见集合
+ */
+ @PostMapping("pagefeedback")
+ public R pageFeedback(@RequestBody PageFeedBackDTO pageFeedBackDTO){
+ return userService.pageFeedback(pageFeedBackDTO);
+ }
+
+ /**
+ * 未读消息汇总
+ * @param userId 登录用户信息
+ * @return 未读汇总
+ */
+ @PostMapping("noticeunreadnum")
+ public R noticeUnreadNum(@RequestParam("userId")Long userId){
+ return userService.noticeUnreadNum(userId);
+ }
+
+ /**
+ * 反馈意见详情
+ * @param id 反馈主键
+ * @return 反馈详情
+ *
+ */
+ @PostMapping("detailfeedback")
+ public R detailFeedback(@RequestParam("id")Long id){
+ return userService.detailFeedback(id);
+ }
+
+ /**
+ * 数据看板
+ * @return 运营后台数据看板
+ */
+ @PostMapping("datakanban")
+ public R dataKanban(){
+ return userService.dataKanban();
+ }
+
+ /**
+ * 社区管理后台数据看板
+ * @param communityId 社区id
+ * @return 看板用户数据
+ */
+ @PostMapping("indexdatacommunitybackstage")
+ public R indexDataCommunityBackstage(@RequestParam("communityId")Long communityId){
+ return userService.indexDataCommunityBackstage(communityId);
+ }
+
+ /**
+ * 定时任务维护用户持续登录时间
+ * @return 维护结果
+ */
+ @PostMapping("timedtaskcontinuouslandingdays")
+ public R timedTaskContinuousLandingDays(){
+ return userService.timedTaskContinuousLandingDays();
+ }
+
+ /**
+ * 新增用户通知
+ * @param sysUserNoticeVO 通知内容
+ * @return 新增结果
+ */
+ @PostMapping("addnotice")
+ public R addNotice(@RequestBody SysUserNoticeVO sysUserNoticeVO){
+ return userService.addNotice(sysUserNoticeVO);
+ }
+
+ /**
+ * 修改用户的党员状态
+ * @param idCard 身份证号
+ * @return 修改结果
+ */
+ @PostMapping("updateuserispartymember")
+ public R updateUserIsPartymember(@RequestParam("idCard")String idCard){
+ return userService.updateUserIsPartymember(idCard);
+ }
+
+ /**
+ * 获取各种协议
+ * @param type 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
+ * @return 协议内容
+ */
+ @PostMapping("agreement")
+ public R agreement(@RequestParam("type")Integer type){
+ return userService.agreement(type);
+ }
+
+ /**
+ * 维护用户最后登录时间
+ * @param userId 用户主键
+ * @return 维护结果
+ */
+ @PostMapping("putuserlastlogintime")
+ public R putUserLastLoginTime(@RequestParam("userId")Long userId){
+ return userService.putUserLastLoginTime(userId);
+ }
+
+ /**
+ * 删除意见反馈
+ * @param id 主键
+ * @return 删除结果
+ */
+ @PostMapping("deletefeedback")
+ public R deleteFeedback(@RequestParam("id")Long id){
+ return userService.deleteFeedback(id);
+ }
+
+ /**
+ * 校验小区是否存在
+ * @param areaName 小区名字
+ * @return 校验结果
+ */
+ @PostMapping("checkaereaname")
+ public R checkAereaName(@RequestParam("areaName")String areaName){
+ return userService.checkAereaName(areaName);
+ }
+
+ /**
+ * 批量导入居民用户
+ * @param list 居民用户集合
+ * @param areaName 小区名字
+ * @return 导入结果
+ */
+ @PostMapping("batchsaveuser")
+ public R batchSaveUser(@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 userId 人员id
+ * @return CommunityUserInfoVO
+ */
+ @PostMapping("detailusercomunity")
+ public R detailUserComunity(@RequestParam("userId")Long userId){
+ CommunityUserInfoVO communityUserInfoVO=new CommunityUserInfoVO();
+ if(userId<100000000l){
+ communityUserInfoVO=userService.detailUserComunity(userId);
+ }else{
+ communityUserInfoVO=sysUserInputService.detailUserComunity(userId);
+ }
+ return R.ok(communityUserInfoVO);
+ }
+
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ * @param exportUserDTO 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @PostMapping("export")
+ public R export(@RequestBody ExportUserDTO exportUserDTO){
+ return userService.export(exportUserDTO);
+ }
+
+ /**
+ * 通过手机号码查询用户信息
+ * @param phone
+ * @return
+ */
+ @GetMapping("getUserByPhone")
+ public R getSysUserVOByPhone(@RequestParam(value = "phone") String phone){
+ return userService.getSysUserVOByPhone(phone);
+ }
+
+ /**
+ * 通过账号和渠道查询用户信息
+ * @param account
+ * @return
+ */
+ @GetMapping("getUserByAccount")
+ public R getSysUserVOByAccount(@RequestParam(value = "account") String account,@RequestParam(value = "type") Integer type){
+ return userService.getSysUserVOByAccount(account, type);
+ }
+
+ /**
+ *分页查询人口管理
+ * @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){
+ return sysUserInputService.inputUserDetail(id);
+ }
+
+ /**
+ * 用户搜索了就下载搜索的用户否则下载所有用户
+ * @param exportUserDTO 用户搜索内容
+ * @return List<EexcelUserDTO> excel内容
+ */
+ @PostMapping("common/data/user/export")
+ public R inputUserExport(@RequestBody ExportUserDTO exportUserDTO){
+ return sysUserInputService.exportInputUser(exportUserDTO);
+ }
+
+ /**
+ * 特殊群体
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
+ return sysUserInputService.specialInputUser(pageInputUserDTO);
+ }
+
+ /**
+ * 特殊群体
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id) {
+ return sysUserInputService.deleteSpecialInputUser(id);
+ }
+ /**
+ * 特殊群体标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/page")
+ R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO) {
+ return sysUserInputService.specialInputUserTags(comMngUserTagDTO);
+ }
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ @PostMapping("common/data/special/tags/save")
+ R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO) {
+ return sysUserInputService.saveSpecialInputUserTags(comMngTagVO);
+ }
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ @DeleteMapping("common/data/special/tags/delete")
+ R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id) {
+ return sysUserInputService.deleteSpecialInputUserTags(id);
+ }
+
+ /**
+ * 特殊群体导出
+ * @param exportSpecialUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/export")
+ R specialUserExport(@RequestBody ExportSpecialUserDTO exportSpecialUserDTO) {
+ return sysUserInputService.specialUserExport(exportSpecialUserDTO);
+ }
+
+ /**
+ * 创建SysUser用户信息以及权限
+ * @param storeVO 请求参数
+ * @return 创建结果
+ */
+ @PostMapping("addSysUser")
+ public R addSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.addSysUser(storeVO);
+ }
+
+ /**
+ * 修改SysUser用户信息
+ * @param storeVO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editSysUser")
+ public R editSysUser(@RequestBody ShopStoreVO storeVO){
+ return userService.editSysUser(storeVO);
+ }
+
+ /**
+ * 修改用户小程序首页活动提示
+ * @param userEditTipsDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("editUserTips")
+ public R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO) {
+ return userService.editUserTips(userEditTipsDTO);
+ }
}
--
Gitblit v1.7.1