Browse Source

邀请列表接口调整

dev
李鹏飞 6 years ago
parent
commit
50890968bf
  1. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
  2. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  3. 3
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java
  4. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
  5. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  6. 91
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java
  7. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserInvitationRecordResultDTO.java
  8. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  9. 94
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java
  10. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
  11. 47
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserInvitationRecordDao.java
  12. 66
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserInvitationRecordEntity.java
  13. 68
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserInvitationRecordExcel.java
  14. 47
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserInvitationRecordRedis.java
  15. 105
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserInvitationRecordService.java
  16. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
  17. 109
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserInvitationRecordServiceImpl.java
  18. 6
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  19. 24
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
  20. 45
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@ -7,7 +7,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.InvitationUserRecordResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@ -245,12 +245,12 @@ public class ApiAppUserController {
/**
* 获取邀请记录
*
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.InvitationUserRecordResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO>>
* @author lipengfei
* @date 2019/12/02 15:58
*/
@GetMapping("user/invitationRecord")
public Result<List<InvitationUserRecordResultDTO>> invitationRecord() {
public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
return appUserService.invitationRecord();
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@ -14,7 +14,6 @@ import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* appuser端接口
@ -321,10 +320,10 @@ public interface UserFeignClient {
/**
* 获取邀请记录
*
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.InvitationUserRecordResultDTO < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List.UserInvitationRecordResultDTO < com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO>>
* @author work@yujt.net.cn
* @date 2019/10/23 13:34
*/
@GetMapping("app-user/epdc-app/user/invitationRecord")
Result<List<InvitationUserRecordResultDTO>> invitationRecord();
Result<List<UserInvitationRecordResultDTO>> invitationRecord();
}

3
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@ -12,7 +12,6 @@ import com.elink.esua.epdc.feign.UserFeignClient;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
/**
* @author yujintao
@ -157,7 +156,7 @@ public class UserFeignClientFallback implements UserFeignClient {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "removeGrid", formDto);
}
@Override
public Result<List<InvitationUserRecordResultDTO>> invitationRecord() {
public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "invitationRecord");
}
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.InvitationUserRecordResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
@ -206,6 +206,6 @@ public interface AppUserService {
* @author work@yujt.net.cn
* @date 2019/10/23 15:58
*/
Result<List<InvitationUserRecordResultDTO>> invitationRecord();
Result<List<UserInvitationRecordResultDTO>> invitationRecord();
}

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -20,7 +20,7 @@ import com.elink.esua.epdc.dto.epdc.form.*;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.InvitationUserRecordResultDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.dto.form.*;
import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO;
import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO;
@ -134,7 +134,9 @@ public class AppUserServiceImpl implements AppUserService {
public Result createQRCode(InvitedQRCodeFormDTO formDto) {
File wxaCodeUnlimit;
try {
wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCodeUnlimit(formDto.getGridId().toString()+"-"+formDto.getInviteUserId(), "pages/index/index");
String url = "pages/index/index?gridId=" + formDto.getGridId().toString();
url = url+"&inviteUserId=" + formDto.getInviteUserId();
wxaCodeUnlimit = wxMaServiceUtils.normalWxMaService().getQrcodeService().createWxaCodeUnlimit("", url);
} catch (WxErrorException e) {
throw new RenException("请求微信接口失败");
}
@ -951,7 +953,7 @@ public class AppUserServiceImpl implements AppUserService {
groupTask.joinGridPartyGroup(formDto);
}
@Override
public Result<List<InvitationUserRecordResultDTO>> invitationRecord() {
public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
return userFeignClient.invitationRecord();
}
}

91
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserInvitationRecordDTO.java

@ -0,0 +1,91 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Data
public class UserInvitationRecordDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 用户ID
*/
private String userId;
/**
* 邀请人ID
*/
private String inviteUserId;
/**
* 网格
*/
private String grid;
/**
* 网格ID
*/
private Long gridId;
/**
* 注册时间
*/
private Date registerTime;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
/**
* 删除标记
*/
private String delFlag;
}

2
esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/InvitationUserRecordResultDTO.java → esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/UserInvitationRecordResultDTO.java

@ -8,7 +8,7 @@ import lombok.Data;
* @Description: 用户列表
*/
@Data
public class InvitationUserRecordResultDTO {
public class UserInvitationRecordResultDTO {
private static final long serialVersionUID = 1L;
/**

9
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -14,6 +14,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
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.*;
@ -33,6 +34,8 @@ public class EpdcAppUserController {
@Autowired
private UserService userService;
@Autowired
private UserInvitationRecordService userInvitationRecordService;
/**
* 根据用户openId获取用户信息(只查询已注册或审核中的用户)
@ -319,8 +322,8 @@ public class EpdcAppUserController {
* @since 2019/10/23 16:22
*/
@GetMapping("invitationRecord")
public Result<List<InvitationUserRecordResultDTO>> invitationRecord() {
List<InvitationUserRecordResultDTO> data = userService.invitationRecord(SecurityUser.getUserId());
return new Result<List<InvitationUserRecordResultDTO>>().ok(data);
public Result<List<UserInvitationRecordResultDTO>> invitationRecord() {
List<UserInvitationRecordResultDTO> data = userInvitationRecordService.invitationRecord(SecurityUser.getUserId());
return new Result<List<UserInvitationRecordResultDTO>>().ok(data);
}
}

94
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserInvitationRecordController.java

@ -0,0 +1,94 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
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<PageData<UserInvitationRecordDTO>> page(@RequestParam Map<String, Object> params){
PageData<UserInvitationRecordDTO> page = userInvitationRecordService.page(params);
return new Result<PageData<UserInvitationRecordDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<UserInvitationRecordDTO> get(@PathVariable("id") String id){
UserInvitationRecordDTO data = userInvitationRecordService.get(id);
return new Result<UserInvitationRecordDTO>().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<String, Object> params, HttpServletResponse response) throws Exception {
List<UserInvitationRecordDTO> list = userInvitationRecordService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, UserInvitationRecordExcel.class);
}
}

9
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java

@ -148,14 +148,5 @@ public interface UserDao extends BaseDao<UserEntity> {
*/
int selectOneAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
/**
* 获取邀请记录
*
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:25
*/
List<InvitationUserRecordResultDTO> invitationRecord(@Param("userId") Long userId);
}

47
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserInvitationRecordDao.java

@ -0,0 +1,47 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Mapper
public interface UserInvitationRecordDao extends BaseDao<UserInvitationRecordEntity> {
/**
* 获取邀请记录
*
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:25
*/
List<UserInvitationRecordResultDTO> invitationRecord(@Param("userId") Long userId);
}

66
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserInvitationRecordEntity.java

@ -0,0 +1,66 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("epdc_user_invitation_record")
public class UserInvitationRecordEntity extends BaseEpdcEntity {
private static final long serialVersionUID = 1L;
/**
* 用户ID
*/
private String userId;
/**
* 邀请人ID
*/
private String inviteUserId;
/**
* 网格
*/
private String grid;
/**
* 网格ID
*/
private Long gridId;
/**
* 注册时间
*/
private Date registerTime;
}

68
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/UserInvitationRecordExcel.java

@ -0,0 +1,68 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Data
public class UserInvitationRecordExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "用户ID")
private String userId;
@Excel(name = "邀请人ID")
private String inviteUserId;
@Excel(name = "网格")
private String grid;
@Excel(name = "网格ID")
private Long gridId;
@Excel(name = "注册时间")
private Date registerTime;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
@Excel(name = "删除标记")
private String delFlag;
}

47
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/redis/UserInvitationRecordRedis.java

@ -0,0 +1,47 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.redis;
import com.elink.esua.epdc.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Component
public class UserInvitationRecordRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

105
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserInvitationRecordService.java

@ -0,0 +1,105 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
import java.util.List;
import java.util.Map;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
public interface UserInvitationRecordService extends BaseService<UserInvitationRecordEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<UserInvitationRecordDTO>
* @author generator
* @date 2019-12-02
*/
PageData<UserInvitationRecordDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<UserInvitationRecordDTO>
* @author generator
* @date 2019-12-02
*/
List<UserInvitationRecordDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return UserInvitationRecordDTO
* @author generator
* @date 2019-12-02
*/
UserInvitationRecordDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2019-12-02
*/
void save(UserInvitationRecordDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2019-12-02
*/
void update(UserInvitationRecordDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2019-12-02
*/
void delete(String[] ids);
/**
* 获取邀请记录
*
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:24
*/
List<UserInvitationRecordResultDTO> invitationRecord(Long userId);
}

9
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@ -239,13 +239,4 @@ public interface UserService extends BaseService<UserEntity> {
*/
Result<Integer> getAnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
/**
* 获取邀请记录
*
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO>
* @params [formDto]
* @author liuchuang
* @since 2019/10/23 16:24
*/
List<InvitationUserRecordResultDTO> invitationRecord(Long userId);
}

109
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserInvitationRecordServiceImpl.java

@ -0,0 +1,109 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* 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.
* <p>
* 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.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.elink.esua.epdc.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.dao.UserInvitationRecordDao;
import com.elink.esua.epdc.dto.UserInvitationRecordDTO;
import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO;
import com.elink.esua.epdc.entity.UserInvitationRecordEntity;
import com.elink.esua.epdc.redis.UserInvitationRecordRedis;
import com.elink.esua.epdc.service.UserInvitationRecordService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 用户邀请记录表 用户邀请记录表
*
* @author qu qu@elink-cn.com
* @since v1.0.0 2019-12-02
*/
@Service
public class UserInvitationRecordServiceImpl extends BaseServiceImpl<UserInvitationRecordDao, UserInvitationRecordEntity> implements UserInvitationRecordService {
@Autowired
private UserInvitationRecordRedis userInvitationRecordRedis;
@Override
public PageData<UserInvitationRecordDTO> page(Map<String, Object> params) {
IPage<UserInvitationRecordEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, UserInvitationRecordDTO.class);
}
@Override
public List<UserInvitationRecordDTO> list(Map<String, Object> params) {
List<UserInvitationRecordEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, UserInvitationRecordDTO.class);
}
private QueryWrapper<UserInvitationRecordEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<UserInvitationRecordEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public UserInvitationRecordDTO get(String id) {
UserInvitationRecordEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, UserInvitationRecordDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(UserInvitationRecordDTO dto) {
UserInvitationRecordEntity entity = ConvertUtils.sourceToTarget(dto, UserInvitationRecordEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(UserInvitationRecordDTO dto) {
UserInvitationRecordEntity entity = ConvertUtils.sourceToTarget(dto, UserInvitationRecordEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
@Override
public List<UserInvitationRecordResultDTO> invitationRecord(Long userId) {
return baseDao.invitationRecord(userId);
}
}

6
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -59,7 +59,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.stream.Collectors;
/**
* 用户信息表
@ -646,9 +645,4 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
return new Result<Integer>().ok(baseDao.selectOneAnauthorizedAmount(fromDto));
}
@Override
public List<InvitationUserRecordResultDTO> invitationRecord(Long userId) {
return baseDao.invitationRecord(userId);
}
}

24
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@ -310,29 +310,5 @@
</choose>
</select>
<resultMap id="InvitationUserRecordResultMap"
type="com.elink.esua.epdc.dto.epdc.result.InvitationUserRecordResultDTO">
<id column="USER_ID" property="userId"/>
<result column="FACE_IMG" property="nickname"/>
<result column="NICKNAME" property="userFace"/>
<result column="CREATED_TIME" property="createdTime"/>
<result column="GRID" property="grid"/>
</resultMap>
<!--获取居民详情-->
<select id="invitationRecord" resultMap="InvitationUserRecordResultMap">
SELECT
record.USER_ID,
USER.FACE_IMG,
USER.NICKNAME,
record.CREATED_TIME,
record.GRID
FROM
epdc_user_invitation_record record
LEFT JOIN epdc_user USER ON USER.id = record.INVITE_USER_ID
AND record.DEL_FLAG = '0'
WHERE
record.DEL_FLAG = '0'
AND record.INVITE_USER_ID =#{userId}
</select>
</mapper>

45
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserInvitationRecordDao.xml

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.elink.esua.epdc.dao.UserInvitationRecordDao">
<resultMap type="com.elink.esua.epdc.entity.UserInvitationRecordEntity" id="userInvitationRecordMap">
<result property="id" column="ID"/>
<result property="userId" column="USER_ID"/>
<result property="inviteUserId" column="INVITE_USER_ID"/>
<result property="grid" column="GRID"/>
<result property="gridId" column="GRID_ID"/>
<result property="registerTime" column="REGISTER_TIME"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="delFlag" column="DEL_FLAG"/>
</resultMap>
<resultMap id="InvitationUserRecordResultMap"
type="com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO">
<id column="USER_ID" property="userId"/>
<result column="FACE_IMG" property="nickname"/>
<result column="NICKNAME" property="userFace"/>
<result column="CREATED_TIME" property="createdTime"/>
<result column="GRID" property="grid"/>
</resultMap>
<!--获取居民详情-->
<select id="invitationRecord" resultMap="InvitationUserRecordResultMap">
SELECT
record.USER_ID,
USER.FACE_IMG,
USER.NICKNAME,
record.CREATED_TIME,
record.GRID
FROM
epdc_user_invitation_record record
LEFT JOIN epdc_user USER ON USER.id = record.INVITE_USER_ID
AND record.DEL_FLAG = '0'
WHERE
record.DEL_FLAG = '0'
AND record.INVITE_USER_ID =#{userId}
</select>
</mapper>
Loading…
Cancel
Save