From a37cf749bb3267f0a334cd125437b44e6018185f Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 9 Jun 2020 11:09:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiNewsController.java | 14 +- .../ApiResidentConfigController.java | 8 +- .../elink/esua/epdc/service/NewsService.java | 8 ++ .../epdc/service/impl/NewsServiceImpl.java | 8 ++ .../esua/epdc/mq/PointsModifyConsumer.java | 8 +- .../elink/esua/epdc/dto/UserPointsDTO.java | 128 ++++++++++++++++++ .../esua/epdc/controller/UserController.java | 8 ++ .../java/com/elink/esua/epdc/dao/UserDao.java | 9 ++ .../elink/esua/epdc/service/UserService.java | 17 +-- .../epdc/service/impl/UserServiceImpl.java | 9 ++ .../src/main/resources/mapper/UserDao.xml | 46 +++++++ 11 files changed, 247 insertions(+), 16 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 881b3533..ac6a32b1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -151,11 +151,23 @@ public class ApiNewsController { * */ @PostMapping("news/browse") - @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") public Result modifyNewsBrowse(@LoginUser TokenDto userDetail,@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { ValidatorUtils.validateEntity(newsBrowseFromDTO); return newsService.modifyNewsBrowse(userDetail,newsBrowseFromDTO); } + /** + * @Description 新闻浏览有效加积分 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("news/browsePoints") + @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") + public Result browsePoints(@LoginUser TokenDto userDetail,@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + ValidatorUtils.validateEntity(newsBrowseFromDTO); + return newsService.browsePoints(userDetail,newsBrowseFromDTO); + } /** * 用户消息已读 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index bf6ce75d..5f2759a2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -24,7 +24,13 @@ public class ApiResidentConfigController { @Autowired private ResidentConfigService residentConfigService; - + /** + * @Description 新闻浏览积分有效浏览时长 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [residentType] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ @GetMapping("getResidentConfig/{residentType}") public Result> getImgUrlList(@PathVariable("residentType") String residentType){ return residentConfigService.listResidentConfig(residentType); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 24d25ddd..0b66eaa9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -144,4 +144,12 @@ public interface NewsService { * @Date 09:46 2020-05-19 **/ Result> listV2Notice(TokenDto userDetail, EpdcNoticeListV2FormDTO formDto); + /** + * @Description 新闻浏览有效时间内加积分接口 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 28872f6e..b527cd83 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -111,4 +111,12 @@ public class NewsServiceImpl implements NewsService { formDto.setDeptId(userDetail.getGridId()); return newsFeignClient.listV2Notice(formDto); } + + @Override + public Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + if(userDetail!=null){ + newsBrowseFromDTO.setUserId(userDetail.getUserId()); + } + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java index 78db59f7..01106fa3 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java @@ -21,13 +21,9 @@ import com.elink.esua.epdc.service.PointsRuleService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.spring.annotation.MessageModel; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import java.util.Date; import java.util.List; /** @@ -37,8 +33,8 @@ import java.util.List; * @Date：2020/4/28 13:44 */ @Slf4j -@Component -@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) +//@Component +//@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) public class PointsModifyConsumer implements RocketMQListener { @Autowired diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java new file mode 100644 index 00000000..8702c590 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java @@ -0,0 +1,128 @@ +/** + * 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.dto; + + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 用户信息表 + * + * @author songyunpeng + * @since v1.0.0 2019-09-02 + */ +@Data +public class UserPointsDTO implements Serializable { + + private static final long serialVersionUID = 915598602233599300L; + + /** + * 主键 + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + private String mobile; + + /** + * 电话 + */ + private String telephone; + + + + /** + * 真实姓名 + */ + private String realName; + + + + /** + * 居民住址 + */ + private String address; + + + + /** + * 用户积分 + */ + private Integer points; + + /** + * 用户累计积分 + */ + private Integer pointsTotle; + + + /** + * 社区 + */ + private String communityName; + + /** + * 社区ID + */ + private Long communityId; + + /** + * 网格 + */ + private String gridName; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 居住网格id + */ + private Long deptId; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 5ad1d17c..599b00e9 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -28,6 +28,7 @@ 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.UserDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.excel.UserExcel; @@ -178,4 +179,11 @@ public class UserController { return userService.handleUserPoints(formDTO); } + + @GetMapping("pageForPoints") + public Result> pageForPoints(@RequestParam Map params) { + PageData page = userService.pageForPoints(params); + return new Result>().ok(page); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 043cf3a7..38454599 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppUserRankingFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; @@ -215,4 +216,12 @@ public interface UserDao extends BaseDao { * @Date 14:56 2020-06-01 **/ EpdcAppRankingUserDTO selectCurrentUserRanking(EpdcAppUserRankingFormDTO formDto); + /** + * @Description 用户积分列表 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [params] + * @return java.util.List + **/ + List selectListUserPoints(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index a9bcd2b8..bd445b0f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -22,16 +22,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData; 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.EpdcUserGroupInviteFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO; -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.EpdcUserRegisterAuditMsgResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import com.elink.esua.epdc.entity.UserEntity; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; @@ -316,4 +309,12 @@ public interface UserService extends BaseService { * @Date 13:35 2020-06-01 **/ EpdcAppUserRankingResultDTO listUserPointsRanking(EpdcAppUserRankingFormDTO formDto); + /** + * @Description 积分模块用户列表 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData pageForPoints(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 4ebf39b4..57b4bcd0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1036,6 +1036,15 @@ public class UserServiceImpl extends BaseServiceImpl implem return rangking; } + @Override + public PageData pageForPoints(Map params) { + // 查询当前用户所具有的的数据权限 + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); + IPage page = getPage(params); + List list = baseDao.selectListUserPoints(params); + return new PageData<>(list, page.getTotal()); } + /** * 返回本次 积分排行 用户网格关系表中的用户id * @param formDto diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 89478077..2f4666d0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -544,4 +544,50 @@ ) userRanking WHERE instr(userRanking.tjid , #{userId}) > 0 +