From 31d8c965f1fccf24da9d043a50958d7130354352 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 22 May 2020 21:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=8C=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/util/UserTokenValidateUtil.java | 38 ++++++ .../epmet/dto/form/CommonGridIdFormDTO.java | 25 ++++ .../IssueVoteStatisticalController.java | 13 ++ .../dao/IssueVoteStatisticalDailyDao.java | 3 +- .../epmet/dao/IssueVoteStatisticalDao.java | 27 ++++ .../com/epmet/feign/ResiGroupFeignClient.java | 4 +- .../impl/IssueVoteStatisticalServiceImpl.java | 47 +++++-- .../mapper/IssueVoteStatisticalDailyDao.xml | 19 ++- .../mapper/IssueVoteStatisticalDao.xml | 119 ++++++++++++++++++ .../member/result/VotableCountResultDTO.java | 20 +++ .../service/impl/ResiGroupServiceImpl.java | 4 +- .../controller/ResiGroupMemberController.java | 1 - .../member/dao/ResiGroupMemberDao.java | 12 ++ .../impl/ResiGroupMemberServiceImpl.java | 43 +++---- .../epmet/modules/utils/ModuleConstant.java | 10 ++ .../mapper/member/ResiGroupMemberDao.xml | 40 ++++++ .../mine/dto/from/MyResiUserInfoFormDTO.java | 23 ++++ .../dto/result/MyResiUserInfoResultDTO.java | 46 +++++++ .../modules/feign/EpmetUserFeignClient.java | 13 ++ .../EpmetUserFeignClientFallBack.java | 14 +++ .../mine/controller/MineController.java | 43 +++++++ .../epmet/dto/form/MyResiUserInfoFormDTO.java | 23 ++++ .../dto/result/MyResiUserInfoResultDTO.java | 46 +++++++ .../epmet/dto/result/MyselfMsgResultDTO.java | 41 ++++++ .../com/epmet/controller/UserController.java | 20 ++- .../src/main/java/com/epmet/dao/UserDao.java | 11 +- .../main/java/com/epmet/dao/UserRoleDao.java | 9 ++ .../java/com/epmet/service/UserService.java | 15 ++- .../epmet/service/impl/UserServiceImpl.java | 62 ++++++++- .../src/main/resources/mapper/UserDao.xml | 26 ++++ .../src/main/resources/mapper/UserRoleDao.xml | 36 ++++++ 31 files changed, 782 insertions(+), 71 deletions(-) create mode 100644 epmet-gateway/src/main/java/com/epmet/util/UserTokenValidateUtil.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonGridIdFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyResiUserInfoFormDTO.java create mode 100644 epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java create mode 100644 epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/MineController.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyResiUserInfoFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java diff --git a/epmet-gateway/src/main/java/com/epmet/util/UserTokenValidateUtil.java b/epmet-gateway/src/main/java/com/epmet/util/UserTokenValidateUtil.java new file mode 100644 index 0000000000..b19a5c6a6e --- /dev/null +++ b/epmet-gateway/src/main/java/com/epmet/util/UserTokenValidateUtil.java @@ -0,0 +1,38 @@ +package com.epmet.util; + +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.security.dto.BaseTokenDto; +import com.epmet.commons.tools.utils.CpUserDetailRedis; +import com.epmet.jwt.JwtTokenUtils; +import io.jsonwebtoken.Claims; +import org.springframework.stereotype.Component; + +/** + * @Description + * @ClassName UserTokenValidateUtil + * @Auth wangc + * @Date 2020-05-21 17:47 + */ +@Component +public class UserTokenValidateUtil { + public BaseTokenDto getBaseTokenDto(String token, JwtTokenUtils jwtTokenUtils) { + //是否过期 + Claims claims = jwtTokenUtils.getClaimByToken(token); + if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) { + throw new RenException(EpmetErrorCode.ERR401.getCode()); + } + //获取用户ID + String app = (String) claims.get("app"); + String client = (String) claims.get("client"); + String userId = (String) claims.get("userId"); + return new BaseTokenDto(app, client, userId, token); + } + + public T getLoginUserInfoByToken(String token, JwtTokenUtils jwtTokenUtils, CpUserDetailRedis cpUserDetailRedis, Class clz) { + BaseTokenDto baseTokenDto = getBaseTokenDto(token, jwtTokenUtils); + //查询Redis + return cpUserDetailRedis.get(baseTokenDto.getApp(), baseTokenDto.getClient(), baseTokenDto.getUserId(), clz); + } + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonGridIdFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonGridIdFormDTO.java new file mode 100644 index 0000000000..93dcda291b --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CommonGridIdFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName CommonGridIdFormDTO + * @Author wangc + * @date 2020.04.24 14:17 + */ +@Data +public class CommonGridIdFormDTO implements Serializable { + private static final long serialVersionUID = 2496019865436084805L; + + /** + * 网格Id + * */ + @NotBlank(message = "网格Id不能为空") + private String gridId; + + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java index a1d69e59d9..83832274e6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalController.java @@ -118,4 +118,17 @@ public class IssueVoteStatisticalController { return new Result().ok(issueVoteStatisticalService.votingTrend(formDTO)); } + /** + * @Description 将所有表决中的投票数从缓存同步到数据库，要进行数据对比，若数据一致无需更新 + * @param + * @return + * @author wangc + * @date 2020.05.21 09:07 + **/ + @PostMapping("syncvotingcacheanddb") + public Result syncVotingCacheAndDb(){ + issueVoteStatisticalService.syncVotingCacheToDb(); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java index c6a6a36e1b..6b500ad3fd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDailyDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.result.IssuesToBeCountedResultDTO; import com.epmet.entity.IssueVoteStatisticalDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -76,5 +77,5 @@ public interface IssueVoteStatisticalDailyDao extends BaseDao list); + void updateBatch(@Param("list") List list); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java index b83a80dffb..949d0c14fa 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueVoteStatisticalDao.java @@ -101,4 +101,31 @@ public interface IssueVoteStatisticalDao extends BaseDao selectListByIds(@Param("ids") Set ids); + + /** + * @Description 批量新增 + * @param list + * @return + * @author wangc + * @date 2020.05.22 14:16 + **/ + void insertBatch(List list); + + /** + * @Description 批量更新 ByIssueId + * @param list + * @return + * @author wangc + * @date 2020.05.22 14:16 + **/ + void updateBatchByIssueId(List list); + + /** + * @Description 通过issueId更新 + * @param vote + * @return + * @author wangc + * @date 2020.05.22 15:52 + **/ + void updateBtIssueId(IssueVoteStatisticalDTO vote); } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java index 8637cd9493..d42dd3804f 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java @@ -25,7 +25,7 @@ import java.util.List; * @Author sun * , url = "localhost:8095" */ -@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) +@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class, url = "http://localhost:8095") public interface ResiGroupFeignClient { /** @@ -87,6 +87,6 @@ public interface ResiGroupFeignClient { * @author wangc * @date 2020.05.22 10:12 **/ - @PostMapping("votablecounts") + @PostMapping("/resi/group/member/votablecounts") Result votableCounts(@RequestBody CommonGridIdListFormDTO gridList); } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java index 3f6145db28..458718bb6c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dto.IssueVoteStatisticalDTO; import com.epmet.dto.PolyLineDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.entity.IssueEntity; import com.epmet.entity.IssueVoteStatisticalEntity; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.ResiGroupFeignClient; @@ -268,6 +269,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl notExistedIds = new HashSet(); notExistedIds.addAll(ids); notExistedIds.removeAll(statisiticalIds); + //交集 Set existedIds = new HashSet<>(); existedIds.addAll(ids); existedIds.retainAll(statisiticalIds); @@ -281,8 +283,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl NumConstant.ZERO) { //新增 @@ -293,6 +295,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl> entry : summaryMap.entrySet()) { IssueVoteStatisticalDTO obj = new IssueVoteStatisticalDTO(); + obj.setCreatedBy("system"); obj.setIssueId(entry.getKey()); List v = entry.getValue(); if (v.size() > NumConstant.ONE) { @@ -328,6 +331,7 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl> entry : gridIssueMap.entrySet()){ - String k = entry.getKey(); - List v = entry.getValue(); - - } - //TODO 批量插入 + // 批量插入 + baseDao.insertBatch(summary); } } else if (ids.size() < statisiticalIds.size()) { @@ -383,21 +383,24 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl listToAdd = new ArrayList<>(); + setVotableCountsAndUpdateCache(listToAdd,issues,votableCountMap); + // 批量新增listToAdd + baseDao.insertBatch(listToAdd); } } /** - * @Description 对指定的issueId的议题表决统计数缓存与Db同步 + * @Description 对指定的issueId的议题表决统计数缓存与Db同步 在关闭议题以及议题转项目时调用 * @param issueId * @return * @author wangc @@ -405,6 +408,22 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl votableCount = + resiGroupFeignClient.votableCount(gridId); + if(votableCount.success() && null != votableCount.getData()){ + toUpd.setVotableCount(votableCount.getData()); + + } + } + toUpd.setVotableCount(NumConstant.ZERO); } @@ -441,6 +460,8 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl @@ -190,7 +190,7 @@ - + UPDATE issue_vote_statistical_daily @@ -242,14 +242,6 @@ - - - - when id = #{item.id} then #{item.updatedBy} - - - - @@ -278,7 +270,10 @@ updated_time = now() - WHERE id = #{id} - + WHERE + DEL_FLAG = '0' + + id = #{item.id} + \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml index 834b873253..5d48526dfd 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDao.xml @@ -125,4 +125,123 @@ ISSUE_ID = #{issueId} + + + + + INSERT INTO issue_vote_statistical + ( + id, + + issue_id, + + SUPPORT_COUNT, + + OPPOSITION_COUNT, + + VOTABLE_COUNT, + + created_by, + + created_time, + + updated_by, + + updated_time + + ) values + + ( + (SELECT REPLACE(UUID(), '-', '') AS id), + + #{item.issueId}, + + #{item.supportCount}, + + #{item.oppositionCount}, + + #{item.votableCount}, + + #{item.createdBy}, + + now(), + + #{item.createdBy}, + + now() + ) + + + + + + UPDATE issue_vote_statistical + + + + + + when issue_id = #{item.issueId} then #{item.supportCount} + + + + + + + + when issue_id = #{item.issueId} then #{item.oppositionCount} + + + + + + + + when issue_id = #{item.issueId} then #{item.updatedBy} + + + + + + + + when id = #{item.id} then #{item.votableCount} + + + + + + + + when id = #{item.id} then #{item.delFlag} + + + + + updated_time = now() + + + WHERE + del_flag = '0' + + issue_id = #{item.issueId} + + + + + + UPDATE + issue_vote_statistical + + support_count = #{supportCount} + opposition_count = #{oppositionCount} + votable_count = #{votableCount} + updated_by = #{updatedBy} + UPDATED_TIME = NOW () + + WHERE + DEL_FLAG = '0' + AND + ISSUE_ID = #{issueId} + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java new file mode 100644 index 0000000000..7101ffb77b --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/VotableCountResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.resi.group.dto.member.result; + +import lombok.Data; + + +import java.io.Serializable; + +/** + * @Description + * @ClassName VotableCountResultDTO + * @Auth wangc + * @Date 2020-05-22 18:10 + */ +@Data +public class VotableCountResultDTO implements Serializable { + private static final long serialVersionUID = -4901865119510991968L; + private String gridId; + + private Integer votableCount; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 56722cce41..c7cecbc6be 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -478,6 +478,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl list = baseDao.selectGroupsByGridId(formDTO); - list.forEach(i -> { + list.stream().filter(group -> StringUtils.equals(ModuleConstant.GROUP_STATUS_APPROVED,group.getState())).collect(Collectors.toList()).forEach(i -> { //缓存中获取组信息 ResiGroupInfoRedisDTO resiGroupInfoRedisDTO = resiGroupRedis.get(i.getId()); GroupsInGridResultDTO groupsInGridResultDTO = new GroupsInGridResultDTO(); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index 8d31858bff..4a248767e8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -26,7 +26,6 @@ import com.epmet.resi.group.dto.member.form.*; import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO; import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO; import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index 737474d53d..57916ee6de 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -26,6 +26,7 @@ import com.epmet.resi.group.dto.member.form.ApplyingMemberFormDTO; import com.epmet.resi.group.dto.member.form.GroupMemberListFormDTO; import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO; import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO; +import com.epmet.resi.group.dto.member.result.VotableCountResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -96,4 +97,15 @@ public interface ResiGroupMemberDao extends BaseDao { * @Date 2020/3/31 16:06 **/ ResiGroupMemberDTO selectGroupMemberInfo(@Param("groupId") String groupId, @Param("userId")String userId); + + /** + * @Description 一个网格的应表决数 + * @param + * @return + * @author wangc + * @date 2020.05.22 18:02 + **/ + Integer getMembersCountInGrid(@Param("gridId")String gridId); + + List getMembersCountInGrids(@Param("gridIds")List gridIds); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 36ca53f060..6504aec8b9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -65,7 +65,9 @@ import com.epmet.resi.group.dto.member.form.*; import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO; import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO; import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO; +import com.epmet.resi.group.dto.member.result.VotableCountResultDTO; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -567,20 +569,9 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl groupIds = resiGroupService.getGroupIdByGridId(gridId); - //2.去缓存中拿取这些组的信息 - if(null != groupIds && groupIds.size() > NumConstant.ZERO){ - Set set = new HashSet<>(); - groupIds.forEach( id -> { - Set members = resiGroupMemberRedis.getGroupMemberIds(id); - if(null != members && members.size() > NumConstant.ZERO){ - set.addAll(members); - } - }); - return set.size(); - } - return NumConstant.ZERO; + + Integer votable = baseDao.getMembersCountInGrid(gridId); + return null == votable ? NumConstant.ZERO : votable; } /** @@ -594,20 +585,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl votableCountMap = new HashMap<>(); - Map> gridGroups = - resiGroupService.getGroupIdsByGridIdList(gridList.getGridIds()); - gridGroups.forEach((k,v)->{ - Set set = new HashSet<>(); - v.forEach(groupId -> { - Set members = resiGroupMemberRedis.getGroupMemberIds(groupId); - if(null != members && members.size() > NumConstant.ZERO){ - set.addAll(members); - } - }); - votableCountMap.put(k,set.size()); + gridList.getGridIds().forEach(gridId -> { + votableCountMap.put(gridId, NumConstant.ZERO ); }); - GridVotableCountResultDTO result = new GridVotableCountResultDTO(); + List list = baseDao.getMembersCountInGrids(gridList.getGridIds()); + if(null == list || list.size() < NumConstant.ZERO){ + result.setVotableCountMap(votableCountMap); + return result; + } + list.forEach( obj ->{ + votableCountMap.put(obj.getGridId(),null == obj.getVotableCount()? NumConstant.ZERO : obj.getVotableCount()); + }); + result.setVotableCountMap(votableCountMap); return result; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java index a48bb08861..e152122a75 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java @@ -301,4 +301,14 @@ public interface ModuleConstant extends Constant { * 议题来源 话题 * */ String ISSUE_SOURCE_TYPE = "resi_topic"; + + /** + * 组状态 通过 + * */ + String GROUP_STATUS_APPROVED = "approved"; + + /** + * 组状态 审核中 + * */ + String GROUP_STATUS_UNDER_AUDITTING = "under_auditting"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index 2ae5acd289..5791303423 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -94,4 +94,44 @@ AND rgm.RESI_GROUP_ID = #{groupId} AND rgm.CUSTOMER_USER_ID=#{userId} + + + + diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyResiUserInfoFormDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyResiUserInfoFormDTO.java new file mode 100644 index 0000000000..edcde03d9b --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/MyResiUserInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.mine.dto.from; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName MyResiUserInfoFormDTO + * @Auth wangc + * @Date 2020-05-22 17:27 + */ +@Data +public class MyResiUserInfoFormDTO implements Serializable { + private static final long serialVersionUID = -6534841370041338474L; + @NotBlank(message = "客户Id不能为空") + private String customerId; + @NotBlank(message = "网格Id不能为空") + private String gridId; + @NotBlank(message = "用户Id不能为空") + private String userId; +} diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java new file mode 100644 index 0000000000..35c8d0203c --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.resi.mine.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @ClassName MyResiUserInfoResultDTO + * @Auth wangc + * @Date 2020-05-22 18:26 + */ +@Data +public class MyResiUserInfoResultDTO implements Serializable { + private static final long serialVersionUID = -1269738324822294380L; + /** + * 用户id + * */ + private String userId; + /** + * 是否已注册居民，true ,false + * */ + private Boolean registerFlag; + /** + * 微信昵称，可为空“” + * */ + private String nickName; + /** + * 注册姓名，可为空“” + * */ + private String userRealName; + /** + * 头像，可为空“” + * */ + private String userHeadPhoto; + /** + * 首次注册的网格，可为空“” + * */ + private String registerGridName; + /** + * 拥有角色名称列表，可为空[] + * */ + private List roleList; + +} diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index d2b2dab8b2..985b869cc8 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -8,10 +8,13 @@ import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack; +import com.epmet.resi.mine.dto.from.MyResiUserInfoFormDTO; +import com.epmet.resi.mine.dto.result.MyResiUserInfoResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -62,4 +65,14 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/gridlatest/getgridsbyuserid/{userId}") Result> getGridsByUserId(@PathVariable("userId") String userId); + + /** + * @Description 居民端获取个人信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 19:24 + **/ + @PostMapping("epmetuser/user/resimyselfmsg") + Result resiMyselfMsg(@RequestBody MyResiUserInfoFormDTO myResiUserInfoFormDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index 1753af5ba0..d4e41a1bf7 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -9,6 +9,8 @@ import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.resi.mine.dto.from.MyResiUserInfoFormDTO; +import com.epmet.resi.mine.dto.result.MyResiUserInfoResultDTO; import org.springframework.stereotype.Component; import java.util.List; @@ -73,4 +75,16 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result> getGridsByUserId(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getGridsByUserId", userId); } + + /** + * @Description 居民端获取个人信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 19:24 + **/ + @Override + public Result resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiMyselfMsg", myResiUserInfoFormDTO); + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/MineController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/MineController.java new file mode 100644 index 0000000000..174126f074 --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/controller/MineController.java @@ -0,0 +1,43 @@ +package com.epmet.modules.mine.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.resi.mine.dto.from.MyResiUserInfoFormDTO; +import com.epmet.resi.mine.dto.result.MyResiUserInfoResultDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description + * @ClassName MineController + * @Auth wangc + * @Date 2020-05-22 18:33 + */ +@RestController +@RequestMapping("mine") +public class MineController { + + @Autowired + EpmetUserFeignClient epmetUserFeignClient; + + /** + * @Description 居民端获取我的信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 18:37 + **/ + @PostMapping("profile") + Result getMyResiInfo(@LoginUser TokenDto tokenDto, @RequestBody MyResiUserInfoFormDTO myResiUserInfoFormDTO){ + myResiUserInfoFormDTO.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(myResiUserInfoFormDTO); + return epmetUserFeignClient.resiMyselfMsg(myResiUserInfoFormDTO); + } + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyResiUserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyResiUserInfoFormDTO.java new file mode 100644 index 0000000000..722b93eddd --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/MyResiUserInfoFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @ClassName MyResiUserInfoFormDTO + * @Auth wangc + * @Date 2020-05-22 17:27 + */ +@Data +public class MyResiUserInfoFormDTO implements Serializable { + private static final long serialVersionUID = -6534841370041338474L; + @NotBlank(message = "客户Id不能为空") + private String customerId; + @NotBlank(message = "网格Id不能为空") + private String gridId; + @NotBlank(message = "用户Id不能为空") + private String userId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java new file mode 100644 index 0000000000..bd9bd52e5b --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @ClassName MyResiUserInfoResultDTO + * @Auth wangc + * @Date 2020-05-22 18:26 + */ +@Data +public class MyResiUserInfoResultDTO implements Serializable { + private static final long serialVersionUID = -1269738324822294380L; + /** + * 用户id + * */ + private String userId; + /** + * 是否已注册居民，true ,false + * */ + private Boolean registerFlag; + /** + * 微信昵称，可为空“” + * */ + private String nickName; + /** + * 注册姓名，可为空“” + * */ + private String userRealName; + /** + * 头像，可为空“” + * */ + private String userHeadPhoto; + /** + * 首次注册的网格，可为空“” + * */ + private String registerGridName; + /** + * 拥有角色名称列表，可为空[] + * */ + private List roleList; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java new file mode 100644 index 0000000000..b46c665dfc --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyselfMsgResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @ClassName MyselfMsgResultDTO + * @Auth wangc + * @Date 2020-05-22 19:15 + */ +@Data +public class MyselfMsgResultDTO implements Serializable { + private static final long serialVersionUID = 1862775055704168458L; + /** + * 用户id + * */ + private String userId; + /** + * 是否已注册居民 + * */ + private String resiId; + /** + * 微信昵称 + * */ + private String nickName; + /** + * 注册姓名 + * */ + private String userRealName; + /** + * 头像 + * */ + private String userHeadPhoto; + /** + * 首次注册的网格 + * */ + private String gridId; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 5a310b3a87..d7f0f28dde 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -8,14 +8,13 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; -import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; -import com.epmet.dto.form.WxLoginUserInfoFormDTO; -import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; +import com.epmet.dto.result.MyResiUserInfoResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.service.UserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.PropertySource; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -99,4 +98,17 @@ public class UserController { return new Result().ok(userService.createdTimeByUserId(formDTO)); } + /** + * @Description 居民端获取个人信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 19:24 + **/ + @PostMapping("resimyselfmsg") + public Result resiMyselfMsg(@RequestBody MyResiUserInfoFormDTO myResiUserInfoFormDTO){ + ValidatorUtils.validateEntity(myResiUserInfoFormDTO); + return new Result().ok(userService.resiMyselfMsg(myResiUserInfoFormDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java index 62a09ab69e..64f5d8fd8b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserDao.java @@ -3,9 +3,11 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; +import com.epmet.dto.result.MyselfMsgResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @Description 用户DAO @@ -34,5 +36,12 @@ public interface UserDao extends BaseDao { */ CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); - + /** + * @Description 获取居民端个人信息 + * @param userId + * @return + * @author wangc + * @date 2020.05.22 19:19 + **/ + MyselfMsgResultDTO getMyselfMsg(@Param("userId")String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index 5fdd6ca3db..989c20b2f1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -43,4 +43,13 @@ public interface UserRoleDao extends BaseDao { **/ List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + /** + * @Description 根据用户Id、网格Id、客户Id查询用户角色key列表 + * @param userRoleFormDTO + * @return List + * @author wangc + * @date 2020.05.22 19:44 + **/ + List getUserRoleList(UserRoleFormDTO userRoleFormDTO); + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 6a9ea0b96a..a7bafa437e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -5,11 +5,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; -import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; -import com.epmet.dto.form.WxLoginUserInfoFormDTO; -import com.epmet.dto.form.WxUserInfoFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; +import com.epmet.dto.result.MyResiUserInfoResultDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; @@ -66,4 +64,13 @@ public interface UserService extends BaseService { * @CreatedTime 2020/4/27 16:14 */ CreatedTimeByUserIdResultDTO createdTimeByUserId(CreatedTimeByUserIdFormDTO formDTO); + + /** + * @Description 居民端获取个人信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 19:24 + **/ + MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 76529d39eb..c6da2a677e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -5,23 +5,26 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserConstant; import com.epmet.dao.UserDao; +import com.epmet.dao.UserRoleDao; import com.epmet.dao.UserWechatDao; +import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; -import com.epmet.dto.form.CreatedTimeByUserIdFormDTO; -import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; -import com.epmet.dto.form.WxLoginUserInfoFormDTO; -import com.epmet.dto.form.WxUserInfoFormDTO; -import com.epmet.dto.result.CreatedTimeByUserIdResultDTO; -import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; +import com.epmet.feign.GovOrgFeignClient; import com.epmet.service.UserService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; +import java.util.List; /** @@ -34,6 +37,12 @@ import java.util.Date; public class UserServiceImpl extends BaseServiceImpl implements UserService { @Autowired private UserWechatDao userWechatDao; + @Autowired + private GovOrgFeignClient govOrgFeignClient; + @Autowired + private UserRoleDao userRoleDao; + + private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class); /** * 根据openId、app查询对应终端用户信息 @@ -125,4 +134,45 @@ public class UserServiceImpl extends BaseServiceImpl implem // registerTime.setRegisterTime(registerTime.getRegisterTime() * 1000L); return registerTime; } + + /** + * @Description 居民端获取个人信息 + * @param myResiUserInfoFormDTO + * @return MyResiUserInfoResultDTO + * @author wangc + * @date 2020.05.22 19:24 + **/ + @Override + public MyResiUserInfoResultDTO resiMyselfMsg(MyResiUserInfoFormDTO myResiUserInfoFormDTO) { + MyselfMsgResultDTO myselfMsg = baseDao.getMyselfMsg(myResiUserInfoFormDTO.getUserId()); + if(null != myselfMsg){ + MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg,MyResiUserInfoResultDTO.class); + //registerFlag 是否已注册居民，true ,false + result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()) ? true : false); + + if(StringUtils.isNotBlank(myselfMsg.getGridId())){ + //registerGridName 首次注册的网格 + CustomerGridFormDTO gridId = new CustomerGridFormDTO(); + gridId.setGridId(myselfMsg.getGridId()); + Result gridResult = govOrgFeignClient.getCustomerGridByGridId(gridId); + if(gridResult.success() && null != gridResult.getData()){ + result.setRegisterGridName(gridResult.getData().getGridName()); + }else{ + if(StringUtils.isNotBlank(gridResult.getMsg())) log.warn(gridResult.getMsg()); + } + } + + //拥有角色名称列表 + UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO(); + userRoleFormDTO.setUserId(myResiUserInfoFormDTO.getUserId()); + userRoleFormDTO.setCustomerId(myResiUserInfoFormDTO.getCustomerId()); + userRoleFormDTO.setGridId(myResiUserInfoFormDTO.getGridId()); + result.setRoleList(userRoleDao.getUserRoleList(userRoleFormDTO)); + userRoleDao.getUserRoleList(userRoleFormDTO); + userRoleDao.getUserRoleList(userRoleFormDTO); + return result; + } + + return null; + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml index 5d34b7878d..6822515ed6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml @@ -26,4 +26,30 @@ AND del_flag = 0 + + diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index c41c2685f2..c8392d4c32 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -53,4 +53,40 @@ + + \ No newline at end of file