+
+ 4.0.0
+
+
+ com.esua.epdc.yushan
+ epdc-cloud-parent-yushan
+ 1.0.0
+ ../epdc-cloud-parent-yushan
+
+
+ epdc-cloud-user
+ jar
+ 榆山党群e事通微服务用户模块
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework
+ spring-context-support
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+
+
+ org.apache.rocketmq
+ rocketmq-spring-boot-starter
+ 2.0.3
+
+
+
+
+ com.esua.epdc.yushan
+ epdc-cloud-news-client
+ ${epdc-cloud-client.version}
+
+
+
+ com.esua.epdc.yushan
+ epdc-cloud-admin-client
+ ${epdc-cloud-client.version}
+
+
+
+ com.esua.epdc.yushan
+ epdc-cloud-user-client
+ ${epdc-cloud-client.version}
+
+
+
+
+
+ com.esua.epdc.yushan
+ epdc-commons-tools
+ ${epdc-cloud-commons.version}
+
+
+
+ com.esua.epdc.yushan
+ epdc-commons-dynamic-datasource
+ ${epdc-cloud-commons.version}
+
+
+
+ com.esua.epdc.yushan
+ epdc-commons-mybatis
+ ${epdc-cloud-commons.version}
+
+
+
+
+
+ ${project.artifactId}
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+
+ true
+
+
+
+ com.spotify
+ dockerfile-maven-plugin
+
+
+
+ ${project.basedir}/src/main/java
+
+
+
+ true
+ ${basedir}/src/main/resources
+
+ **/application*.yml
+ **/*.properties
+ logback-spring.xml
+ registry.conf
+
+
+
+ ${basedir}/src/main/resources
+
+ **/application*.yml
+ **/*.properties
+ logback-spring.xml
+ registry.conf
+
+
+
+
+
+
+
+
+ dev
+
+ true
+
+
+ dev
+ dev
+
+ 9068
+
+ 2
+ 47.104.224.45
+ 6379
+ elink@888
+
+
+
+
+ epdc
+ elink833066
+
+
+
+
+ epdc
+ elink833066
+
+ false
+ 47.104.224.45:8848
+
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+
+ 47.104.85.99:9876;114.215.125.123:9876
+ organizationGroup
+
+
+
+
+ test
+
+ test
+ test
+
+ 10014
+
+ 2
+ 114.215.125.123
+ 9603
+ epdc!redis@master1405
+
+
+
+
+ epdc
+ elink833066
+
+
+
+
+ epdc
+ elink833066
+
+ true
+ 47.104.224.45:8848
+ 47.104.85.99
+ 6a3577b4-7b79-43f6-aebb-9c3f31263f6a
+
+
+ 47.104.85.99:9876;114.215.125.123:9876
+ organizationGroup
+
+
+
+
+ prod
+
+ prod
+ prod
+
+ 9068
+
+
+ 0
+ 172.16.0.54
+ 6379
+ Elink833066
+
+
+
+
+ epdc
+ Elink@833066
+
+
+
+ epdc
+ Elink@833066
+
+ true
+ 172.16.0.52:8848
+
+
+
+ 172.16.0.52:9876;172.16.0.54:9876
+ organizationGroup
+
+
+
+
+
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/UserApplication.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/UserApplication.java
new file mode 100644
index 0000000..4407c63
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/UserApplication.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+
+/**
+ * APP用户模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.1.0
+ */
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
+public class UserApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(UserApplication.class, args);
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/NewsTask.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/NewsTask.java
new file mode 100644
index 0000000..256bb52
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/NewsTask.java
@@ -0,0 +1,33 @@
+package com.elink.esua.epdc.async;
+
+import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
+import com.elink.esua.epdc.feign.NewsFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+/**
+ * 志愿者审核结果通知消息模块 线程任务
+ *
+ * @author zy
+ * @date 2019/12/16 15:39
+ */
+@Component
+public class NewsTask {
+
+ @Autowired
+ private NewsFeignClient newsFeignClient;
+
+ /**
+ * 志愿者审核结果，消息推送到app
+ *
+ * @param informationDto
+ * @return void
+ * @author zy
+ * @date 2019/12/16 15:39
+ */
+ @Async
+ public void insertUserInformation(EpdcInformationFormDTO informationDto) {
+ newsFeignClient.saveInformation(informationDto);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/PartyTask.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/PartyTask.java
new file mode 100644
index 0000000..16b0967
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/async/PartyTask.java
@@ -0,0 +1,54 @@
+package com.elink.esua.epdc.async;
+
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.alibaba.fastjson.JSON;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.config.StreamUtils;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
+import com.elink.esua.epdc.excel.PartyMembersExcel;
+import com.elink.esua.epdc.service.PartyMembersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.util.List;
+
+
+/**
+ * @author: qushutong
+ * @Date: 2019/10/24 16:00
+ * @Description: 党员导入异步
+ */
+@Component
+public class PartyTask {
+
+ @Autowired
+ private PartyMembersService partyMembersService;
+
+ /***
+ * 批量插入党员
+ * @param file
+ * @return void
+ * @author qushutong
+ * @date 2019/10/24 16:02
+ */
+// @Async
+// public void insertPartyList(MultipartFile file) {
+// File f = StreamUtils.conversionFile(file);
+// ImportParams importParams = new ImportParams();
+// try {
+// List partyList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams);
+// partyMembersService.saveList(partyList);
+// for (PartyMembersExcel partyMembers : partyList) {
+// System.out.println("从Excel导入数据到数据库的详细为 ：{}" + JSON.toJSONString(partyMembers));
+// }
+// System.out.println("从Excel导入数据一共 {} 行 " + partyList.size());
+// } catch (Exception e1) {
+// throw new RuntimeException("导入失败：{}" + e1.getMessage());
+// }
+// }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
new file mode 100644
index 0000000..f4d2ecc
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.config.ModuleConfig;
+import org.springframework.stereotype.Service;
+
+/**
+ * 模块配置信息-生活服务模块
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Service
+public class ModuleConfigImpl implements ModuleConfig {
+ @Override
+ public String getName() {
+ return "user";
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/StreamUtils.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/StreamUtils.java
new file mode 100644
index 0000000..1caef31
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/config/StreamUtils.java
@@ -0,0 +1,56 @@
+package com.elink.esua.epdc.config;
+
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+
+/**
+ * 接收文件转化File
+ * Created by liuhongwei on 2019/6/21.
+ */
+public class StreamUtils {
+
+
+
+ public static File conversionFile(MultipartFile file){
+
+ File toFile =null;
+ InputStream ins = null;
+ try {
+ // 转化字节流
+ ins = file.getInputStream();
+ // 获取文件名字
+ toFile = new File(file.getOriginalFilename());
+ // 字节转化文件
+ inputStreamToFile(ins, toFile);
+ ins.close();
+ } catch (IOException e) {
+ new RenException(500,"文件转化失败");
+ }
+ return toFile;
+ }
+
+
+ /**
+ * 流转化
+ * @param ins file
+ * @return
+ * @author liuhongwei
+ * @date 2019/6/14 14:07
+ */
+ public static void inputStreamToFile(InputStream ins, File file) {
+ try {
+ OutputStream os = new FileOutputStream(file);
+ int bytesRead = 0;
+ byte[] buffer = new byte[8192];
+ while ((bytesRead = ins.read(buffer, 0, 8192)) != -1) {
+ os.write(buffer, 0, bytesRead);
+ }
+ os.close();
+ ins.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
new file mode 100644
index 0000000..250eead
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
@@ -0,0 +1,423 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.CachingUserInfoDTO;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.*;
+import com.elink.esua.epdc.dto.epdc.result.*;
+import com.elink.esua.epdc.service.UserInvitationRecordService;
+import com.elink.esua.epdc.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对移动端开放
+ *
+ * @author yujintao
+ * @email yujintao@elink-cn.com
+ * @date 2019/9/6 20:31
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "user")
+public class EpdcAppUserController {
+
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private UserInvitationRecordService userInvitationRecordService;
+
+ /**
+ * 根据用户openId获取用户信息(只查询已注册或审核中的用户)
+ *
+ * @param openId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/19 19:03
+ */
+ @GetMapping("getByOpenId/{openId}")
+ public Result getUserInfoByOpenId(@PathVariable("openId") String openId) {
+ return userService.getUserInfoByOpenId(openId);
+ }
+
+ /**
+ * 查询用户基础信息
+ *
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/10/26 15:13
+ */
+ @GetMapping("getById/{userId}")
+ public Result getUserInfoById(@PathVariable("userId") String userId) {
+ UserDTO dto = userService.get(userId);
+ return new Result().ok(dto);
+ }
+
+ /**
+ * 登录前，获取用户信息
+ *
+ * @param openId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/24 13:57
+ */
+ @GetMapping("getForLogin/{openId}")
+ public Result getUserForLoginByOpenId(@PathVariable("openId") String openId) {
+ return userService.getUserForLoginByOpenId(openId);
+ }
+
+ /**
+ * 根据用户unionId获取用户信息(只查询已注册或审核中的用户)
+ *
+ * @param unionId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/19 19:03
+ */
+ @GetMapping("getByUnionId/{unionId}")
+ public Result getUserInfoByUnionId(@PathVariable("unionId") String unionId) {
+ return userService.getUserInfoByUnionId(unionId);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 获取用户信息 合并上面的getByUnionId、getForLogin方法
+ * @Date 2019/12/7 13:57
+ **/
+ @PostMapping("queryUserDto")
+ public Result queryUserDto(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) {
+ return userService.queryUserDto(formDTO);
+ }
+
+ /**
+ * 移动端用户注册
+ *
+ * @param userDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author yujintao
+ * @date 2019/9/7 14:20
+ */
+ @PostMapping("regist")
+ public Result userRegister(@RequestBody UserDTO userDto) {
+ return userService.userRegister(userDto);
+ }
+
+ /**
+ * 网格长注册
+ *
+ * @param registerDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/10/23 09:34
+ */
+ @PostMapping("gridLeaderRegister")
+ public Result gridLeaderRegister(@RequestBody EpdcGridLeaderRegisterFormDTO registerDto) {
+ return userService.gridLeaderRegister(registerDto);
+ }
+
+ /***
+ * @Description 移动端获取用户信息
+ * @Author qushutong
+ * @Date 2019/9/9 17:00
+ * @Param [id]
+ * @Return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Exception
+ *
+ */
+ @GetMapping("getInfoById/{id}")
+ public Result getInfoById(@PathVariable("id") String id) {
+ return userService.getInfoById(id);
+ }
+
+ /***
+ * @Description 修改手机号 或者手机号
+ * @Author qushutong
+ * @Date 2019/9/9 17:12
+ * @Param [formDto]
+ * @Return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Exception
+ *
+ */
+ @PostMapping("updateMobileOrAvatar")
+ public Result updateMobileOrAvatar(@RequestBody UserDTO formDto) {
+ userService.updateMobileOrAvatar(formDto);
+ return new Result();
+ }
+
+ /**
+ * 验证用户提交的注册信息
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/21 11:03
+ */
+ @Deprecated
+ @GetMapping("verify")
+ public Result verifyUserRegisterData(@RequestBody EpdcUserRegistFormDTO formDto) {
+ return userService.verifyUserRegisterData(formDto);
+ }
+
+ /**
+ * 用户注册审核之后，查询用户审核结果，用于发送服务消息和短信消息
+ *
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/27 09:13
+ */
+ @GetMapping("registerResult/{userId}")
+ public Result getUserRegisterAuditResult(@PathVariable("userId") String userId) {
+ return userService.getUserRegisterAuditResult(userId);
+ }
+
+ /**
+ * 社群添加好友列表
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [formDto]
+ * @author liuchuang
+ * @since 2019/10/23 16:22
+ */
+ @GetMapping("getInviteUserList")
+ public Result> getInviteUserList(@RequestBody EpdcUserGroupInviteFormDTO formDto) {
+ List data = userService.listOfInviteUsers(formDto);
+ return new Result>().ok(data);
+ }
+
+ /**
+ * 检查用户注册状态
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [fromDto]
+ * @author liuchuang
+ * @since 2019/10/25 11:11
+ */
+ @GetMapping("checkUserRegister")
+ public Result getUserRegisterState(@RequestBody EpdcCheckUserRegisterFromDTO fromDto) {
+ return userService.checkUserRegisterState(fromDto);
+ }
+
+ /**
+ * 用户注册或绑定网格
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [fromDto]
+ * @author liuchuang
+ * @since 2019/10/25 14:30
+ */
+ @PostMapping("registerOrBindGrid")
+ public Result registerOrBindGrid(@RequestBody EpdcUserRegisterBindGridFormDTO fromDto) {
+ return userService.saveUserOrBindGrid(fromDto);
+ }
+
+ /**
+ * 更新用户微信信息
+ *
+ * @param userDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author liuchuang
+ * @since 2019/10/25 17:10
+ */
+ @PostMapping("updateWxInfo")
+ public Result updateWxInfo(@RequestBody UserDTO userDto) {
+ // userDto 包含用户id，昵称，头像，性别，unionid，openid
+ UserDTO user = userService.updateWxInfo(userDto);
+
+ return new Result().ok(user);
+ }
+
+ /**
+ * 更新用户信息
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [userDTO]
+ * @author liuchuang
+ * @since 2019/10/25 17:10
+ */
+ @PostMapping("updateUserInfo")
+ public Result updateUserInfo(@RequestBody UserDTO userDto) {
+ userService.update(userDto);
+ return new Result();
+ }
+
+ /**
+ * 验证用户完善个人信息时提交的数据，校验成功，返回用户当前状态
+ *
+ * @param userDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/9/21 11:03
+ */
+ @GetMapping("verifyComplete")
+ public Result verifyUserCompleteData(@RequestBody UserDTO userDto) {
+ return userService.verifyUserCompleteData(userDto);
+ }
+
+ /**
+ * 用户完善个人信息-保存
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/10/26 11:53
+ */
+ @PostMapping("completeInfo")
+ public Result completeUserInfo(@RequestBody EpdcAppUserCompleteInfoFormDTO formDto) {
+ return userService.completeUserInfo(formDto);
+ }
+
+ /**
+ * 获取居民详情（已认证或待认证（提交信息待审核）的居民用户）
+ *
+ * @param userId 用户Id
+ * @return
+ */
+ @GetMapping("residentDetail/{userId}")
+ public Result residentDetail(@PathVariable("userId") String userId) {
+ return userService.residentDetail(userId);
+ }
+
+ /**
+ * 获取党员详情（已认证或未认证的党员用户）
+ *
+ * @param userId
+ * @return
+ */
+ @GetMapping("partyMemberDetail/{userId}")
+ public Result partyMemberDetail(@PathVariable("userId") String userId) {
+ return userService.partyMemberDetail(userId);
+ }
+
+ /**
+ * 认证用户（用户信息审核）
+ *
+ * @param formDTO
+ * @return
+ */
+ @PostMapping("authenticateResident")
+ public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
+ return userService.authenticateResident(formDTO);
+ }
+
+ /***
+ * 用户列表
+ * @param workUserFromDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/11/18 13:47
+ */
+ @GetMapping("listForWork")
+ public Result> listUserForWork(@RequestBody EpdcWorkUserFromDTO workUserFromDto) {
+ return userService.getWorkUserList(workUserFromDto);
+ }
+
+
+ /***
+ * 查询待认证用户数量
+ * @param fromDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/11/19 13:25
+ */
+ @GetMapping("unauthorizedAmount")
+ public Result unauthorizedAmount(@RequestBody EpdcUnauthorizedAmountFromDTO fromDto) {
+ return userService.getUnauthorizedAmount(fromDto);
+ }
+
+ /**
+ * 获取邀请记录
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @params [formDto]
+ * @author liuchuang
+ * @since 2019/10/23 16:22
+ */
+ @GetMapping("invitationRecord")
+ public Result> invitationRecord() {
+ List data = userInvitationRecordService.invitationRecord(SecurityUser.getUserId());
+ return new Result>().ok(data);
+ }
+
+ /**
+ * 获取用户最后一次切换的网格信息
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [openId]
+ * @author liuchuang
+ * @since 2019/12/6 11:01
+ */
+ @GetMapping("lastSwitchGrid/{openId}")
+ public Result getUserLastSwitchGird(@PathVariable("openId") String openId) {
+ return userService.getUserLastSwitchGird(openId);
+ }
+
+ /**
+ * @param gridIdList
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 根据网格id查询网格下所有的用户
+ * @Date 2019/12/19 15:02
+ **/
+ @PostMapping("queryGroupUsers")
+ public Result> queryGroupUsers(@RequestBody List gridIdList) {
+ return userService.listGridUserResultDTO(gridIdList);
+ }
+
+ /***
+ * 居民在防疫哨卡进行登记时，上送数据并完善党群系统个人信息
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/2/15 11:06
+ */
+ @PostMapping("sentryPost/completeInfo")
+ public Result> sentPidemicInfo(@RequestBody EpdcAppPidemicCompleteInfoFromDTO formDTO) {
+ return userService.createPidemicInfo(formDTO);
+ }
+
+
+ /***
+ * 完善企业信息，必填表单 跟新用户
+ * @param
+ * @return Result
+ * @author qushutong
+ * @date 2020/2/28 13:34
+ */
+ @PostMapping("completeByEnterpriseInfo")
+ public Result completeRequisiteInfo(@RequestBody CompleteRequisiteUserInfoDTO fromDto) {
+ return userService.completeRequisiteInfo(fromDto);
+ }
+
+ /**
+ * 获取用户缓存信息
+ *
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author rongchao
+ * @since 2019-12-18
+ */
+ @PostMapping("needCachingUserInfo")
+ public Result needCachingUserInfo(@RequestBody EpdcAppQueryUserInfoFormDTO formDTO) {
+ return userService.queryCachingUserInfo(formDTO);
+ }
+
+ /**
+ * 根据用户ID获取用户缓存信息
+ *
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author rongchao
+ * @since 2019-12-19
+ */
+ @GetMapping("needCachingUserInfoByUserId/{userId}")
+ public Result needCachingUserInfoByUserId(@PathVariable("userId") String userId) {
+ return userService.cachingUserInfoByUserId(userId);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java
new file mode 100644
index 0000000..9bf96d6
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserWxFormIdController.java
@@ -0,0 +1,92 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcDeleteWxFormIdFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserSaveWxFormIdFormDTO;
+import com.elink.esua.epdc.service.UserWxFormIdService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 微信formId表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-26
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "wxformid")
+public class EpdcAppUserWxFormIdController {
+
+ @Autowired
+ private UserWxFormIdService userWxFormIdService;
+
+
+ /***
+ * 完成推送之后删除用过的formid
+ * @param dto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/9/26 14:15
+ */
+ @PostMapping("deleteById")
+ public Result deleteById(@RequestBody EpdcDeleteWxFormIdFormDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userWxFormIdService.deleteById(dto.getId());
+ return new Result();
+ }
+
+ /***
+ * 新增一条
+ * @param dto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/9/26 14:25
+ */
+ @PostMapping("save")
+ public Result save(@RequestBody EpdcUserSaveWxFormIdFormDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ UserWxFormIdDTO userWxFormIdDTO = new UserWxFormIdDTO();
+ BeanUtils.copyProperties(dto, userWxFormIdDTO);
+ userWxFormIdService.save(userWxFormIdDTO);
+ return new Result();
+ }
+
+
+ /***
+ * 查出最新一条记录
+ * @param openId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author qushutong
+ * @date 2019/9/26 14:11
+ */
+ @GetMapping("getByOpenId/{openId}")
+ public Result get(@PathVariable("openId") String openId) {
+ UserWxFormIdDTO data = userWxFormIdService.getByOpenId(openId);
+ return new Result().ok(data);
+ }
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java
new file mode 100644
index 0000000..99306f0
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java
@@ -0,0 +1,65 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
+import com.elink.esua.epdc.service.VolunteerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对移动端开放
+ *
+ * @author wanggongfeng
+ * @date 2019/9/6 20:31
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "volunteerinfo")
+public class EpdcAppVolunteerInfoController {
+ @Autowired
+ private VolunteerInfoService volunteerInfoService;
+
+ /**
+ * 根据用户id 进行志愿者认证
+ * @param userId
+ * @author wanggongfeng
+ * @return
+ */
+ @GetMapping("getVolunteerCountById/{userId}")
+ public Result getVolunteerCountById(@PathVariable("userId") String userId) {
+ return volunteerInfoService.getVolunteerCountById(userId);
+ }
+
+ /**
+ * 插入一条志愿者数据
+ * @param epdcCompleteVolunteerInfoFormDTO
+ * @author wanggongfeng
+ * @return
+ */
+ @GetMapping("insertVolunteerInfo")
+ public Result insertVolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) {
+ //效验数据
+ ValidatorUtils.validateEntity(epdcCompleteVolunteerInfoFormDTO, UpdateGroup.class, DefaultGroup.class);
+ Result result = volunteerInfoService.insertVolunteerInfo(epdcCompleteVolunteerInfoFormDTO);
+ return result;
+ }
+
+ /**
+ * 获取排行榜数据
+ *
+ * @return
+ */
+ @GetMapping("getRankingList")
+ public Result> getRankingList() {
+ return volunteerInfoService.getRankingList();
+ }
+
+
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
new file mode 100644
index 0000000..98bc550
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java
@@ -0,0 +1,83 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppRemoveGridFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcLeaderSwitchGridFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
+import com.elink.esua.epdc.service.UserGridRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 网格长与网格关系表
+ *
+ * @author work@yujt.net.cn
+ * @since v1.0.0 2019-10-23
+ */
+@RestController
+@RequestMapping(Constant.EPDC_APP + "usergrid")
+public class EpdcUserGridRelationController {
+
+ @Autowired
+ private UserGridRelationService userGridRelationService;
+
+ /**
+ * 网格长小程序端切换网格
+ *
+ * @param switchGridDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author work@yujt.net.cn
+ * @date 2019/10/23 11:04
+ */
+ @GetMapping("userSwitchGrid")
+ public Result userSwitchGrid(@RequestBody EpdcLeaderSwitchGridFormDTO switchGridDto) {
+ return userGridRelationService.userSwitchGrid(switchGridDto);
+ }
+
+ /**
+ * 获取网格长管理的网格列表
+ *
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author work@yujt.net.cn
+ * @date 2019/10/23 13:26
+ */
+ @GetMapping("listUserGrid/{userId}")
+ public Result> listGridForLeader(@PathVariable("userId") String userId) {
+ return userGridRelationService.listUserGridForApi(userId);
+ }
+
+ /**
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 解除与网格的关联
+ * @Date 2019/11/22 14:30
+ **/
+ @PostMapping("removeGrid")
+ public Result removeGrid(@RequestBody EpdcAppRemoveGridFormDTO formDto) {
+ return userGridRelationService.removeGrid(formDto);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java
new file mode 100644
index 0000000..2453cda
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyAuthenticationFailedController.java
@@ -0,0 +1,98 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
+import com.elink.esua.epdc.excel.PartyAuthenticationFailedExcel;
+import com.elink.esua.epdc.service.PartyAuthenticationFailedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员认证失败表 党员认证失败表
+ *
+ * @author gp gupeng@elink-cn.com
+ * @since v1.0.0 2019-11-15
+ */
+@RestController
+@RequestMapping("partyauthenticationfailed")
+public class PartyAuthenticationFailedController {
+
+ @Autowired
+ private PartyAuthenticationFailedService partyAuthenticationFailedService;
+
+ @GetMapping("page")
+ @DataFilter(tableAlias = "epaf", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+ public Result> page(@RequestParam Map params) {
+ PageData page = partyAuthenticationFailedService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ PartyAuthenticationFailedDTO data = partyAuthenticationFailedService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyAuthenticationFailedDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ partyAuthenticationFailedService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyAuthenticationFailedDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ partyAuthenticationFailedService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ partyAuthenticationFailedService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @DataFilter(tableAlias = "epaf", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyAuthenticationFailedService.list(params);
+ ExcelUtils.exportExcelToTarget(response, "认证失败党员", list, PartyAuthenticationFailedExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
new file mode 100644
index 0000000..3c092d0
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java
@@ -0,0 +1,179 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.excel.PartyMembersExcel;
+import com.elink.esua.epdc.service.PartyMembersService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@RestController
+@RequestMapping("/partymembers")
+public class PartyMembersController {
+
+ @Autowired
+ private PartyMembersService partyMembersService;
+
+ /**
+ * 党员库
+ *
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author
+ * @date 2020/2/24 15:16
+ */
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ return partyMembersService.pageDIY(params);
+ }
+
+ /**
+ * 已认证党员列表
+ *
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author
+ * @date 2020/2/21 19:06
+ */
+ @GetMapping("hasAuthenticationPartyPage")
+ @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
+ public Result> hasAuthenticationPartyPage(@RequestParam Map params) {
+ return partyMembersService.hasAuthenticationPartyPage(params);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ PartyMembersDTO data = partyMembersService.get(id);
+ if (null != data && data.getTagIds() != null) {
+ data.setTagIdsNew(data.getTagIds().split(","));
+ }
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyMembersDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ dto.setDeptId(SecurityUser.getDeptId());
+ partyMembersService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyMembersDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ partyMembersService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ return partyMembersService.delete(ids);
+ }
+
+ @GetMapping("export")
+// @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyMembersService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, "党员管理", list, PartyMembersExcel.class);
+ }
+
+ /***
+ * 批量导入
+ * @param file
+ * @return java.lang.String
+ * @author qushutong
+ * @date 2019/10/24 14:55
+ */
+ @PostMapping("importExcel")
+ public Result importExcel(@RequestParam("file") MultipartFile file) {
+ return partyMembersService.insertPartyList(file);
+ }
+
+ /***
+ * 导出模板
+ * @param params
+ * @param response
+ * @return void
+ * @author qushutong
+ * @date 2019/11/1 17:14
+ */
+ @GetMapping("exportMoudle")
+ public void exportMoudle(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyMembersService.exportMoudle();
+ ExcelUtils.exportExcelToTarget(response, "党员模板", list, PartyMembersExcel.class);
+ }
+
+
+ /***
+ * 已认证党员导出
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2019/12/29 14:43
+ */
+ @GetMapping("hasAuthenticationexport")
+ @DataFilter(tableAlias = "pm", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
+ public void hasAuthenticationexport(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ ExcelUtils.exportExcelToTarget(response, "已认证党员", partyMembersService.exportHasMoudle(params), PartyMembersExcel.class);
+ }
+
+ /***
+ * 已认证党员优化
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/3/19 13:34
+ */
+ @GetMapping("optimizeHasAuthenticationPartyPage")
+ @DataFilter(tableAlias = "eu", prefix = "AND", isPendingCreator = false)
+ public Result> optimizeHasAuthenticationPartyPage(@RequestParam Map params) {
+ return partyMembersService.optimizeHasAuthenticationPartyPage(params);
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java
new file mode 100644
index 0000000..afb4013
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/PartyTagRelationController.java
@@ -0,0 +1,102 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.PartyTagRelationDTO;
+import com.elink.esua.epdc.excel.PartyTagRelationExcel;
+import com.elink.esua.epdc.service.PartyTagRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 党员标签关系表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-04
+ */
+@RestController
+@RequestMapping("/partytagrelation")
+public class PartyTagRelationController {
+ @Autowired
+ private PartyTagRelationService partyTagRelationService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = partyTagRelationService.page(params);
+
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ PartyTagRelationDTO data = partyTagRelationService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody PartyTagRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ partyTagRelationService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody PartyTagRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ partyTagRelationService.update(dto);
+
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ partyTagRelationService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = partyTagRelationService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, PartyTagRelationExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java
new file mode 100644
index 0000000..94db73b
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserAuthenticateHistoryController.java
@@ -0,0 +1,126 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserAuthenticateHistoryDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAuthenticateHistoryFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAuthenticateHistoryResultDTO;
+import com.elink.esua.epdc.entity.UserAuthenticateHistoryEntity;
+import com.elink.esua.epdc.excel.UserAuthenticateHistoryExcel;
+import com.elink.esua.epdc.service.UserAuthenticateHistoryService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户认证历史表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-11-21
+ */
+@RestController
+@RequestMapping("userauthenticatehistory")
+public class UserAuthenticateHistoryController {
+
+ @Autowired
+ private UserAuthenticateHistoryService userAuthenticateHistoryService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userAuthenticateHistoryService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserAuthenticateHistoryDTO data = userAuthenticateHistoryService.get(id);
+ return new Result().ok(data);
+ }
+
+ /**
+ * @param userId 用户id
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 根据用户id查询认证历史记录
+ * @Date 2019/11/21 13:59
+ **/
+ @GetMapping("listUserAuthenticateHistory/{userId}")
+ public Result> listUserAuthenticateHistory(@PathVariable("userId") String userId) {
+ if (StringUtils.isBlank(userId)) {
+ return new Result().error("用户id不能为空");
+ }
+ List list = userAuthenticateHistoryService.listUserAuthenticateHistory(userId);
+ return new Result>().ok(list);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserAuthenticateHistoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userAuthenticateHistoryService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserAuthenticateHistoryDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userAuthenticateHistoryService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userAuthenticateHistoryService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userAuthenticateHistoryService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserAuthenticateHistoryExcel.class);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author yinzuomei
+ * @Description 用户认证审核历史
+ * @Date 2019/11/22 13:17
+ **/
+ @GetMapping("authenticateHistory")
+ public Result> authenticateHistory(@RequestBody EpdcAuthenticateHistoryFormDTO formDTO) {
+ return userAuthenticateHistoryService.authenticateHistory(formDTO);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java
new file mode 100644
index 0000000..34358f2
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserCarInfoController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO;
+import com.elink.esua.epdc.excel.UserCarInfoExcel;
+import com.elink.esua.epdc.service.UserCarInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户车辆信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-02-15
+ */
+@RestController
+@RequestMapping("usercarinfo")
+public class UserCarInfoController {
+
+ @Autowired
+ private UserCarInfoService userCarInfoService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userCarInfoService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserCarInfoDTO data = userCarInfoService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserCarInfoDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userCarInfoService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserCarInfoDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userCarInfoService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userCarInfoService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userCarInfoService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserCarInfoExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
new file mode 100644
index 0000000..1b1b695
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java
@@ -0,0 +1,286 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.mybatis.annotation.DataFilter;
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO;
+import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.enums.AppUserStatesEnum;
+import com.elink.esua.epdc.excel.UserExcel;
+import com.elink.esua.epdc.service.UserService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户信息表
+ *
+ * @author qu qu@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@RestController
+@RequestMapping("user")
+public class UserController {
+ @Autowired
+ private UserService userService;
+
+ @GetMapping("page")
+ @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+ public Result> page(@RequestParam Map params) {
+ PageData page = userService.page(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ *
+ * 待认证党员列表
+ *
+ * @params [params]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author liuchuang
+ * @since 2020/3/24 15:47
+ */
+ @GetMapping("waitPartyPage")
+ @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
+ public Result> waitPartyPage(@RequestParam Map params) {
+ PageData page = userService.waitPartyPage(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ UserDTO data = userService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ userService.save(dto);
+
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ userService.update(dto);
+
+ return new Result();
+ }
+
+ /**
+ * 审核
+ *
+ * @param dto
+ * @return
+ */
+ @PostMapping("audit")
+ public Result audit(@RequestBody UserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ userService.audit(dto);
+
+ return new Result();
+ }
+
+ /**
+ *
+ * 党员认证
+ *
+ * @params [dto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author liuchuang
+ * @since 2020/3/24 15:58
+ */
+ @PostMapping("partyReview")
+ public Result partyReview(@RequestBody UserDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ return userService.partyReview(dto);
+ }
+
+ /**
+ *
+ * 党员认证通过并更新党员库信息
+ *
+ * @params [dto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author liuchuang
+ * @since 2020/3/24 19:38
+ */
+ @PostMapping("updatePartyInfo")
+ public Result updatePartyInfo(@RequestBody PartyMemberModifyFormDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ if (StringUtils.isEmpty(dto.getPartyMemberId())) {
+ return new Result().error("党员ID不能为空");
+ }
+ return userService.modifyPartyInfo(dto);
+ }
+
+ /**
+ *
+ * 新增党员信息并认证通过
+ *
+ * @params [dto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author liuchuang
+ * @since 2020/3/25 14:31
+ */
+ @PostMapping("insertPartyInfo")
+ public Result insertPartyInfo(@RequestBody PartyMemberModifyFormDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ return userService.addPartyInfo(dto);
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ userService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userService.list(params);
+ String auditState = (String) params.get("state");
+ // 状态(0-未审核，1-审核通过，2-审核未通过)
+ String fileName = null;
+ if (AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value().equals(auditState)) {
+ fileName = "待认证居民";
+ } else if (AppUserStatesEnum.STATE_INFORMATION_PASSED.value().equals(auditState)) {
+ fileName = "已认证居民";
+ } else if (AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value().equals(auditState)) {
+ fileName = "居民认证失败";
+ } else if (AppUserStatesEnum.STATE_REGISTERED.value().equals(auditState)) {
+ fileName = "未认证居民";
+ }
+ ExcelUtils.exportExcelToTarget(response, fileName, list, UserExcel.class);
+ }
+
+ /**
+ *
+ * 待认证党员导出
+ *
+ * @params [params, response]
+ * @return void
+ * @author liuchuang
+ * @since 2020/3/24 16:00
+ */
+ @GetMapping("exportWaitParty")
+ @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
+ public void exportWaitParty(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userService.listOfWaitParty(params);
+ ExcelUtils.exportExcelToTarget(response, "待认证党员", list, UserExcel.class);
+ }
+
+ /***
+ * 未认证导出
+ * @param params
+ * @param response
+ * @return void
+ * @author qushutong
+ * @date 2020/3/18 15:59
+ */
+ @GetMapping("unauthorizedexport")
+ @DataFilter(tableAlias = "ug", isPendingCreator = false, deptId = "GRID_ID", prefix = "AND")
+ public void unauthorizedExport(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userService.list(params);
+ ExcelUtils.exportExcelToTarget(response, "未认证居民", list, UserExcel.class);
+ }
+
+ /***
+ * 批量导入
+ * @param file
+ * @return java.lang.String
+ * @author qushutong
+ * @date 2019/10/24 14:55
+ */
+ @PostMapping("importExcel")
+ public Result importExcel(@RequestParam("file") MultipartFile file, @RequestParam Map params) {
+ return userService.insertUserList(file, params);
+ }
+
+ /**
+ * @param formDTO
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据操作类型更新用户积分
+ * @Date 2019/12/13 15:01
+ **/
+ @PostMapping("handleUserPoints")
+ public Result handleUserPoints(@RequestBody @Valid EpdcUserPointsFormDTO formDTO) {
+ return userService.handleUserPoints(formDTO);
+ }
+
+ /***
+ * 展示所有的
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/3/16 10:51
+ */
+ @GetMapping("alluserpage")
+ public Result> alluserpage(@RequestParam Map params) {
+ PageData page = userService.allUserPage(params);
+ return new Result>().ok(page);
+ }
+
+
+ /***
+ * 已认证居民
+ * @param params
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author qushutong
+ * @date 2020/3/16 16:54
+ */
+ @GetMapping("authenticatedpage")
+ @DataFilter(tableAlias = "u", isPendingCreator = false, deptId = "DEPT_ID", prefix = "AND")
+ public Result> authenticatedpage(@RequestParam Map params) {
+ PageData page = userService.authenticatedpage(params);
+ return new Result>().ok(page);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java
new file mode 100644
index 0000000..c1b9035
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridInvitationCodeController.java
@@ -0,0 +1,135 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.UserGridInvitationCodeDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcUserGridInvitationCodeFormDTO;
+import com.elink.esua.epdc.excel.UserGridInvitationCodeExcel;
+import com.elink.esua.epdc.service.UserGridInvitationCodeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户网格邀请码表 用户网格邀请码表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-03-01
+ */
+@RestController
+@RequestMapping("usergridinvitationcode")
+public class UserGridInvitationCodeController {
+
+ @Autowired
+ private UserGridInvitationCodeService userGridInvitationCodeService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userGridInvitationCodeService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserGridInvitationCodeDTO data = userGridInvitationCodeService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserGridInvitationCodeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userGridInvitationCodeService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserGridInvitationCodeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userGridInvitationCodeService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userGridInvitationCodeService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userGridInvitationCodeService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserGridInvitationCodeExcel.class);
+ }
+
+ /**
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @param formDTO
+ * @Author yinzuomei
+ * @Description 查询用户邀请码生成记录
+ * @Date 2020/3/1 17:44
+ **/
+ @PostMapping("getUserGridInvitationCodeDTO")
+ public Result getUserGridInvitationCodeDTO(@RequestBody EpdcUserGridInvitationCodeFormDTO formDTO){
+ ValidatorUtils.validateEntity(formDTO);
+ return userGridInvitationCodeService.getUserGridInvitationCodeDTO(formDTO);
+ }
+
+ /**
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @param dto
+ * @Author yinzuomei
+ * @Description 回写用户网格邀请码表
+ * @Date 2020/3/1 18:00
+ **/
+ @PostMapping("updateInvitationCodeUrl")
+ public Result updateInvitationCodeUrl(@RequestBody UserGridInvitationCodeDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userGridInvitationCodeService.update(dto);
+ return new Result();
+ }
+
+ /**
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @param id
+ * @Author yinzuomei
+ * @Description 根据用户网格邀请码表主键查询记录
+ * @Date 2020/3/1 16:32
+ **/
+ @GetMapping("queryUserGridInvitationCodeDTO/{id}")
+ public Result queryUserGridInvitationCodeDTO(@PathVariable("id") String id){
+ UserGridInvitationCodeDTO data = userGridInvitationCodeService.get(id);
+ return new Result().ok(data);
+ }
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java
new file mode 100644
index 0000000..a4ca83a
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserGridRelationController.java
@@ -0,0 +1,105 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserGridRelationDTO;
+import com.elink.esua.epdc.service.UserGridRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 网格长与网格关系表
+ *
+ * @author work@yujt.net.cn
+ * @since v1.0.0 2019-10-23
+ */
+@RestController
+@RequestMapping("usergrid")
+public class UserGridRelationController {
+
+ @Autowired
+ private UserGridRelationService userGridRelationService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userGridRelationService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserGridRelationDTO data = userGridRelationService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserGridRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userGridRelationService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserGridRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userGridRelationService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userGridRelationService.delete(ids);
+ return new Result();
+ }
+
+
+ @GetMapping("listUserGrid/{userId}")
+ public Result> listUserGrid(@PathVariable("userId") String userId){
+ List data = userGridRelationService.listUserGrid(userId);
+ return new Result>().ok(data);
+ }
+
+ /**
+ * @param id epdc_user_grid_relation表主键
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 解绑
+ * @Date 2019/11/21 19:00
+ **/
+ @GetMapping("unbindGridHandle/{id}")
+ public Result unbindGridHandle(@PathVariable("id") String id) {
+ userGridRelationService.unbindGridHandle(id);
+ return new Result();
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java
new file mode 100644
index 0000000..abdb904
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
+import com.elink.esua.epdc.excel.UserInvitationRecordExcel;
+import com.elink.esua.epdc.service.UserInvitationRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户邀请记录表 用户邀请记录表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-02
+ */
+@RestController
+@RequestMapping("userinvitationrecord")
+public class UserInvitationRecordController {
+
+ @Autowired
+ private UserInvitationRecordService userInvitationRecordService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userInvitationRecordService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserInvitationRecordDTO data = userInvitationRecordService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserInvitationRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userInvitationRecordService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserInvitationRecordDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userInvitationRecordService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userInvitationRecordService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userInvitationRecordService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserInvitationRecordExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagController.java
new file mode 100644
index 0000000..2157e38
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagController.java
@@ -0,0 +1,103 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.UserTagDTO;
+import com.elink.esua.epdc.excel.UserTagExcel;
+import com.elink.esua.epdc.service.UserTagService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户标签表
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since v1.0.0 2019-09-02
+ */
+@RestController
+@RequestMapping("/usertag")
+public class UserTagController {
+ @Autowired
+ private UserTagService userTagService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userTagService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("list")
+ public Result> list(@RequestParam Map params){
+ List list = userTagService.list(params);
+ return new Result>().ok(list);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserTagDTO data = userTagService.get(id);
+
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserTagDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+ return userTagService.save(dto);
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserTagDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+ return userTagService.update(dto);
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+
+ userTagService.delete(ids);
+
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userTagService.list(params);
+
+ ExcelUtils.exportExcelToTarget(response, null, list, UserTagExcel.class);
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java
new file mode 100644
index 0000000..3f58de6
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserTagRelationController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserTagRelationDTO;
+import com.elink.esua.epdc.excel.UserTagRelationExcel;
+import com.elink.esua.epdc.service.UserTagRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户标签关系表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-30
+ */
+@RestController
+@RequestMapping("usertagrelation")
+public class UserTagRelationController {
+
+ @Autowired
+ private UserTagRelationService userTagRelationService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userTagRelationService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserTagRelationDTO data = userTagRelationService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserTagRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userTagRelationService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserTagRelationDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userTagRelationService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userTagRelationService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userTagRelationService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserTagRelationExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java
new file mode 100644
index 0000000..c32147d
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserWxFormIdController.java
@@ -0,0 +1,94 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.dto.UserWxFormIdDTO;
+import com.elink.esua.epdc.excel.UserWxFormIdExcel;
+import com.elink.esua.epdc.service.UserWxFormIdService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户标签表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-09-26
+ */
+@RestController
+@RequestMapping("userwxformid")
+public class UserWxFormIdController {
+
+ @Autowired
+ private UserWxFormIdService userWxFormIdService;
+
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params){
+ PageData page = userWxFormIdService.page(params);
+ return new Result>().ok(page);
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id){
+ UserWxFormIdDTO data = userWxFormIdService.get(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody UserWxFormIdDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ userWxFormIdService.save(dto);
+ return new Result();
+ }
+
+ @PutMapping
+ public Result update(@RequestBody UserWxFormIdDTO dto){
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ userWxFormIdService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids){
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ userWxFormIdService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = userWxFormIdService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, UserWxFormIdExcel.class);
+ }
+
+}
\ No newline at end of file
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
new file mode 100644
index 0000000..208eab2
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java
@@ -0,0 +1,183 @@
+/**
+ * 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.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
+import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
+import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
+import com.elink.esua.epdc.excel.VolunteerInfoExcel;
+import com.elink.esua.epdc.service.UserTagService;
+import com.elink.esua.epdc.service.VolunteerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 志愿者信息表
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2019-12-11
+ */
+@RestController
+@RequestMapping("volunteerinfo")
+public class VolunteerInfoController {
+
+ @Autowired
+ private VolunteerInfoService volunteerInfoService;
+
+ @Autowired
+ private UserTagService userTagService; //标签表
+
+ /**
+ * @Description: 查询志愿者列表数据
+ * @Param: [params]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result>
+ * @Author: zy
+ * @Date: 2019-12-17
+ */
+ @GetMapping("page")
+ public Result> page(@RequestParam Map params) {
+ PageData page = volunteerInfoService.volunteerInfo(params);
+ return new Result>().ok(page);
+ }
+
+ /**
+ * @Description: 根据志愿者ID，查询志愿者 信息详情
+ * 积分需要连user表查询
+ * @Param: [id]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2019-12-17
+ */
+ @GetMapping("getVolunteerDetail/{id}")
+ public Result getVolunteerDetail(@PathVariable("id") String id) {
+ VolunteerInfoDTO data = volunteerInfoService.getVolunteerDetail(id);
+ return new Result().ok(data);
+ }
+
+ @PostMapping
+ public Result save(@RequestBody VolunteerInfoDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+ volunteerInfoService.save(dto);
+ return new Result();
+ }
+
+ @GetMapping("{id}")
+ public Result get(@PathVariable("id") String id) {
+ VolunteerInfoDTO data = volunteerInfoService.get(id);
+ return new Result().ok(data);
+ }
+
+ /**
+ * @Description: 志愿者 申请审批
+ * 审批不通过、拉入黑名单，清除用户标签关系表,志愿者标签,并进行消息推送
+ * @Param: [dto]
+ * @return: com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author: zy
+ * @Date: 2019-12-17
+ */
+ @PostMapping("volunteerInfoCheck")
+ public Result volunteerInfoCheck(@RequestBody VolunteerInfoDTO dto) {
+ return volunteerInfoService.volunteerInfoCheck(dto);
+ }
+
+ @PutMapping
+ public Result update(@RequestBody VolunteerInfoDTO dto) {
+ //效验数据
+ ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+ volunteerInfoService.update(dto);
+ return new Result();
+ }
+
+ @DeleteMapping
+ public Result delete(@RequestBody String[] ids) {
+ //效验数据
+ AssertUtils.isArrayEmpty(ids, "id");
+ volunteerInfoService.delete(ids);
+ return new Result();
+ }
+
+ @GetMapping("export")
+ public void export(@RequestParam Map params, HttpServletResponse response) throws Exception {
+ List list = volunteerInfoService.list(params);
+ ExcelUtils.exportExcelToTarget(response, null, list, VolunteerInfoExcel.class);
+ }
+
+ /**
+ * @param id
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 积分调整按钮按下, 查询用户信息
+ * @Date 2019/12/16 17:48
+ **/
+ @GetMapping("queryById/{id}")
+ public Result queryByUserId(@PathVariable("id") String id) {
+ return volunteerInfoService.getAdjustVolunteerPointsDTO(id);
+ }
+
+ /**
+ * @param userId 用户主键
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据用户主键获取用用户认证志愿者标识（0-待审核，1-认证通过，2-待认证，3-黑名单）
+ * @Date 2020/2/5 16:48
+ **/
+ @GetMapping("queryUserVolunteerFlag/{userId}")
+ public Result queryUserVolunteerFlag(@PathVariable("userId") String userId) {
+ return volunteerInfoService.queryUserVolunteerFlag(userId);
+ }
+
+ /**
+ * @param userId
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @Author yinzuomei
+ * @Description 根据用户id查询志愿者信息
+ * @Date 2020/2/6 12:23
+ **/
+ @GetMapping("getVolunteerInfoDTOByUserId/{userId}")
+ public Result getVolunteerInfoDTOByUserId(@PathVariable("userId") String userId) {
+ return volunteerInfoService.getVolunteerInfoDTOByUserId(userId);
+ }
+
+ /**
+ * 增加志愿者爱心时长
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @params [formDto]
+ * @author liuchuang
+ * @since 2020/2/7 18:40
+ */
+ @PostMapping("addKindnessTime")
+ public Result addKindnessTime(@RequestBody EpdcVolunteerKindnessTimeFormDTO formDto) {
+ return volunteerInfoService.modifyVolunteerKindnessTime(formDto);
+ }
+
+}
diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java
new file mode 100644
index 0000000..aa36909
--- /dev/null
+++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/PartyAuthenticationFailedDao.java
@@ -0,0 +1,67 @@
+/**
+ * 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.elink.esua.epdc.dao;
+
+import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PartyAuthenticationFailedDTO;
+import com.elink.esua.epdc.entity.PartyAuthenticationFailedEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 党员认证失败表 党员认证失败表
+ *
+ * @author gp gupeng@elink-cn.com
+ * @since v1.0.0 2019-11-15
+ */
+@Mapper
+public interface PartyAuthenticationFailedDao extends BaseDao {
+
+ /**
+ * 查询认证失败的党员列表
+ * @params params
+ * @return java.util.List
+ * @author gp
+ * @date 2019-11-18
+ */
+ List selectListDto(Map params);
+
+ /**
+ *
+ * 查询需要修改的组织机构信息
+ *
+ * @params [deptId]
+ * @return java.util.List
+ * @author liuchuang
+ * @since 2020/3/7 15:31
+ */
+ List
+