From 9905088cd27771e7837e9f1f6401fb5a4bef6ae4 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 19 May 2020 14:24:04 +0800 Subject: [PATCH 1/8] =?UTF-8?q?controller=E6=B7=BB=E5=8A=A0=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E5=88=A4=E6=96=AD=EF=BC=8C=E8=AE=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=BF=9B=E5=B1=95=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovOrgFeignClient.java | 2 +- .../dto/form/ShouldVoteCountFormDTO.java | 19 ++++++++++ .../com/epmet/dto/form/VoteRedisFormDTO.java | 35 +++++++++++++++++++ .../dto/result/ShouldVoteCountResultDTO.java | 18 ++++++++++ .../com/epmet/constant/IssueConstant.java | 5 +++ .../com/epmet/feign/ResiGroupFeignClient.java | 13 ++++++- .../ResiGroupFeignClientFallBack.java | 7 ++++ .../com/epmet/redis/IssueVoteDetailRedis.java | 27 +++++++++++--- .../impl/IssueVoteDetailServiceImpl.java | 31 ++++++++++++++++ .../impl/IssueVoteStatisticalServiceImpl.java | 20 ++++++++--- .../group/form/ShouldVoteCountFormDTO.java | 19 ++++++++++ .../result/ShouldVoteCountResultDTO.java | 18 ++++++++++ .../group/controller/ResiGroupController.java | 11 +++++- .../epmet/modules/group/dao/ResiGroupDao.java | 7 ++++ .../group/service/ResiGroupService.java | 8 ++++- .../service/impl/ResiGroupServiceImpl.java | 11 ++++++ .../resources/mapper/group/ResiGroupDao.xml | 13 +++++++ 17 files changed, 251 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 97c3ce6b7f..cfce4881b1 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -14,7 +14,7 @@ import java.util.List; * @Description * @Author sun */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class,url = "localhost:8092") public interface GovOrgFeignClient { /** diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java new file mode 100644 index 0000000000..3a4befde58 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountFormDTO implements Serializable { + + private static final long serialVersionUID = 413887792872039432L; + + /** + * 网格id + */ + private String gridId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java new file mode 100644 index 0000000000..30b9014016 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 表决数量缓存 + */ +@Data +public class VoteRedisFormDTO implements Serializable { + + private static final long serialVersionUID = -5046512100380206719L; + + /** + * 支持数量 + */ + private Integer supportAmount = 0; + + /** + * 反对数量 + */ + private Integer oppositionAmount = 0; + + /** + * 应表决数 + */ + private Integer shouldVoteCount = 0; + + /** + * 议题id + */ + private String issueId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java new file mode 100644 index 0000000000..7aa3c7cc15 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountResultDTO implements Serializable { + + private static final long serialVersionUID = 8811890380460710438L; + /** + * 应表决数 + */ + private Integer shouldVoteCount; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index b3b9381487..04a4bcbef2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -59,4 +59,9 @@ public interface IssueConstant { String GOV_PRJECT_EXCEPTION = "议题转项目，获取项目数据失败"; String ISSUE_VOTING_EXCEPTION = "非表决中议题，不允许转成项目"; String ISSUE_SHIFT_PROJECT_EXCEPTION = "议题已转项目，不允许再次操作"; + + String SUPPORT = "support"; + String OPPOSE = "opposition"; + + String REDIS_KEY = "epmet:issue:"; } 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 dafe24e28a..c4f5aa7f3a 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 @@ -2,7 +2,9 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -10,6 +12,7 @@ import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @Description 调用resi-group服务 @@ -37,4 +40,12 @@ public interface ResiGroupFeignClient { @PostMapping("/resi/group/topic/topicinfoforissuedetailgov") Result topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO); - } + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + @PostMapping("/resi/group/group/shouldvotecount") + Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO); + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index c2c18e977b..7a887029ea 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -3,7 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -25,4 +27,9 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { public Result topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicInfoForIssueDetailGov", govTopicIssueInfoFormDTO); } + + @Override + public Result shouldVoteCount(ShouldVoteCountFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "shouldVoteCount", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java index 89c8f04994..50c3132f24 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java @@ -17,10 +17,17 @@ package com.epmet.redis; +import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.constant.IssueConstant; +import com.epmet.dto.form.VoteRedisFormDTO; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Map; + /** * 议题表决记录表 * @@ -36,12 +43,24 @@ public class IssueVoteDetailRedis { } - public void set(){ - + public void set(VoteRedisFormDTO vote){ + String key = IssueConstant.REDIS_KEY +vote.getIssueId(); + //bean to map + Map map = BeanUtil.beanToMap(vote, false, true); + redisUtils.hMSet(key, map); } - public String get(String id){ - return null; + public VoteRedisFormDTO get(String issueId){ + VoteRedisFormDTO voteRedis = new VoteRedisFormDTO(); + String key = IssueConstant.REDIS_KEY + issueId; + Map stringObjectMap = redisUtils.hGetAll(key); + if (stringObjectMap.size()== NumConstant.ZERO || stringObjectMap == null){ + return new VoteRedisFormDTO(); + } + voteRedis.setShouldVoteCount(Integer.valueOf(stringObjectMap.get("shouldVoteCount").toString())); + voteRedis.setSupportAmount(Integer.valueOf(stringObjectMap.get("supportAmount").toString())); + voteRedis.setOppositionAmount(Integer.valueOf(stringObjectMap.get("oppositionAmount").toString())); + return voteRedis; } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index f58caca359..02cadd81cc 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -26,13 +27,20 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.constant.IssueConstant; import com.epmet.dao.IssueVoteDetailDao; +import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueVoteDetailDTO; import com.epmet.dto.form.CheckVoteFormDTO; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.form.VoteFormDTO; +import com.epmet.dto.form.VoteRedisFormDTO; import com.epmet.dto.result.JoinVoteResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.entity.IssueVoteDetailEntity; +import com.epmet.feign.ResiGroupFeignClient; import com.epmet.redis.IssueVoteDetailRedis; +import com.epmet.service.IssueService; import com.epmet.service.IssueVoteDetailService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -55,6 +63,10 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -118,6 +130,25 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -138,7 +143,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId); - votingTrendResultDTO.setPolyLine(polyLineDTOS); - } +// VotingTrendResultDTO votingTrendResultDTO = issueVoteStatisticalDao.votingTrend(issueId); + VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId()); + VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO(); + BeanUtils.copyProperties(voteRedisFormDTO,votingTrendResultDTO); + votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount()+voteRedisFormDTO.getOppositionAmount()); + List polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId); + votingTrendResultDTO.setPolyLine(polyLineDTOS); return votingTrendResultDTO; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java new file mode 100644 index 0000000000..512b4b3beb --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountFormDTO implements Serializable { + + private static final long serialVersionUID = 413887792872039432L; + + /** + * 网格id + */ + private String gridId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java new file mode 100644 index 0000000000..239e6cc6be --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.resi.group.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountResultDTO implements Serializable { + + private static final long serialVersionUID = 8811890380460710438L; + /** + * 应表决数 + */ + private Integer shouldVoteCount; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index da16e3fc25..4d2a9758bb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -22,7 +22,6 @@ 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.group.redis.ResiGroupRedis; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.form.*; @@ -321,4 +320,14 @@ public class ResiGroupController { public Result checkjointeam(@RequestBody GridIdFormDTO gridId){ return new Result().ok(resiGroupService.checkjointeam(gridId)); } + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + @PostMapping("shouldvotecount") + public Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO){ + return new Result().ok(resiGroupService.shouldVoteCount(formDTO)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 38dc060246..875163b278 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -155,4 +155,11 @@ public interface ResiGroupDao extends BaseDao { * @author zxc */ Integer checkjointeam(GridIdFormDTO gridId); + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 83a4a6e275..5859f46243 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -27,7 +27,6 @@ import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -268,4 +267,11 @@ public interface ResiGroupService extends BaseService { * @author zxc */ CheckJoinTeamResultDTO checkjointeam(GridIdFormDTO gridId); + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); } 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 0ff6d6a103..5a9950f577 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 @@ -58,6 +58,7 @@ import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.group.*; import com.epmet.resi.group.dto.group.form.*; +import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; @@ -832,6 +833,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl + + + From cbab01b492aa2ee213e460934fc50e66bd862b5c Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 19 May 2020 14:24:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovOrgFeignClient.java | 2 +- .../dto/form/ShouldVoteCountFormDTO.java | 19 ++++++++++ .../com/epmet/dto/form/VoteRedisFormDTO.java | 35 +++++++++++++++++++ .../dto/result/ShouldVoteCountResultDTO.java | 18 ++++++++++ .../com/epmet/constant/IssueConstant.java | 5 +++ .../com/epmet/feign/ResiGroupFeignClient.java | 13 ++++++- .../ResiGroupFeignClientFallBack.java | 7 ++++ .../com/epmet/redis/IssueVoteDetailRedis.java | 27 +++++++++++--- .../impl/IssueVoteDetailServiceImpl.java | 31 ++++++++++++++++ .../impl/IssueVoteStatisticalServiceImpl.java | 20 ++++++++--- .../group/form/ShouldVoteCountFormDTO.java | 19 ++++++++++ .../result/ShouldVoteCountResultDTO.java | 18 ++++++++++ .../group/controller/ResiGroupController.java | 11 +++++- .../epmet/modules/group/dao/ResiGroupDao.java | 7 ++++ .../group/service/ResiGroupService.java | 8 ++++- .../service/impl/ResiGroupServiceImpl.java | 11 ++++++ .../resources/mapper/group/ResiGroupDao.xml | 13 +++++++ 17 files changed, 251 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index 97c3ce6b7f..cfce4881b1 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -14,7 +14,7 @@ import java.util.List; * @Description * @Author sun */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class,url = "localhost:8092") public interface GovOrgFeignClient { /** diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java new file mode 100644 index 0000000000..3a4befde58 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/ShouldVoteCountFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountFormDTO implements Serializable { + + private static final long serialVersionUID = 413887792872039432L; + + /** + * 网格id + */ + private String gridId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java new file mode 100644 index 0000000000..30b9014016 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteRedisFormDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * 表决数量缓存 + */ +@Data +public class VoteRedisFormDTO implements Serializable { + + private static final long serialVersionUID = -5046512100380206719L; + + /** + * 支持数量 + */ + private Integer supportAmount = 0; + + /** + * 反对数量 + */ + private Integer oppositionAmount = 0; + + /** + * 应表决数 + */ + private Integer shouldVoteCount = 0; + + /** + * 议题id + */ + private String issueId; +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java new file mode 100644 index 0000000000..7aa3c7cc15 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/ShouldVoteCountResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountResultDTO implements Serializable { + + private static final long serialVersionUID = 8811890380460710438L; + /** + * 应表决数 + */ + private Integer shouldVoteCount; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java index b3b9381487..04a4bcbef2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/constant/IssueConstant.java @@ -59,4 +59,9 @@ public interface IssueConstant { String GOV_PRJECT_EXCEPTION = "议题转项目，获取项目数据失败"; String ISSUE_VOTING_EXCEPTION = "非表决中议题，不允许转成项目"; String ISSUE_SHIFT_PROJECT_EXCEPTION = "议题已转项目，不允许再次操作"; + + String SUPPORT = "support"; + String OPPOSE = "opposition"; + + String REDIS_KEY = "epmet:issue:"; } 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 dafe24e28a..c4f5aa7f3a 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 @@ -2,7 +2,9 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -10,6 +12,7 @@ import com.epmet.resi.group.dto.topic.result.GovTopicIssueInfoResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @Description 调用resi-group服务 @@ -37,4 +40,12 @@ public interface ResiGroupFeignClient { @PostMapping("/resi/group/topic/topicinfoforissuedetailgov") Result topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO); - } + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + @PostMapping("/resi/group/group/shouldvotecount") + Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO); + +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index c2c18e977b..7a887029ea 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -3,7 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -25,4 +27,9 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { public Result topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "topicInfoForIssueDetailGov", govTopicIssueInfoFormDTO); } + + @Override + public Result shouldVoteCount(ShouldVoteCountFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "shouldVoteCount", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java index 89c8f04994..50c3132f24 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueVoteDetailRedis.java @@ -17,10 +17,17 @@ package com.epmet.redis; +import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.constant.IssueConstant; +import com.epmet.dto.form.VoteRedisFormDTO; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.Map; + /** * 议题表决记录表 * @@ -36,12 +43,24 @@ public class IssueVoteDetailRedis { } - public void set(){ - + public void set(VoteRedisFormDTO vote){ + String key = IssueConstant.REDIS_KEY +vote.getIssueId(); + //bean to map + Map map = BeanUtil.beanToMap(vote, false, true); + redisUtils.hMSet(key, map); } - public String get(String id){ - return null; + public VoteRedisFormDTO get(String issueId){ + VoteRedisFormDTO voteRedis = new VoteRedisFormDTO(); + String key = IssueConstant.REDIS_KEY + issueId; + Map stringObjectMap = redisUtils.hGetAll(key); + if (stringObjectMap.size()== NumConstant.ZERO || stringObjectMap == null){ + return new VoteRedisFormDTO(); + } + voteRedis.setShouldVoteCount(Integer.valueOf(stringObjectMap.get("shouldVoteCount").toString())); + voteRedis.setSupportAmount(Integer.valueOf(stringObjectMap.get("supportAmount").toString())); + voteRedis.setOppositionAmount(Integer.valueOf(stringObjectMap.get("oppositionAmount").toString())); + return voteRedis; } } \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index f58caca359..02cadd81cc 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -26,13 +27,20 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.constant.IssueConstant; import com.epmet.dao.IssueVoteDetailDao; +import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueVoteDetailDTO; import com.epmet.dto.form.CheckVoteFormDTO; +import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.form.VoteFormDTO; +import com.epmet.dto.form.VoteRedisFormDTO; import com.epmet.dto.result.JoinVoteResultDTO; +import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.entity.IssueVoteDetailEntity; +import com.epmet.feign.ResiGroupFeignClient; import com.epmet.redis.IssueVoteDetailRedis; +import com.epmet.service.IssueService; import com.epmet.service.IssueVoteDetailService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -55,6 +63,10 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -118,6 +130,25 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -138,7 +143,10 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId); - votingTrendResultDTO.setPolyLine(polyLineDTOS); - } +// VotingTrendResultDTO votingTrendResultDTO = issueVoteStatisticalDao.votingTrend(issueId); + VoteRedisFormDTO voteRedisFormDTO = issueVoteDetailRedis.get(issueId.getIssueId()); + VotingTrendResultDTO votingTrendResultDTO = new VotingTrendResultDTO(); + BeanUtils.copyProperties(voteRedisFormDTO,votingTrendResultDTO); + votingTrendResultDTO.setRealityVoteCount(voteRedisFormDTO.getSupportAmount()+voteRedisFormDTO.getOppositionAmount()); + List polyLineDTOS = issueVoteStatisticalDao.polyLineData(issueId); + votingTrendResultDTO.setPolyLine(polyLineDTOS); return votingTrendResultDTO; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java new file mode 100644 index 0000000000..512b4b3beb --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ShouldVoteCountFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountFormDTO implements Serializable { + + private static final long serialVersionUID = 413887792872039432L; + + /** + * 网格id + */ + private String gridId; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java new file mode 100644 index 0000000000..239e6cc6be --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ShouldVoteCountResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.resi.group.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class ShouldVoteCountResultDTO implements Serializable { + + private static final long serialVersionUID = 8811890380460710438L; + /** + * 应表决数 + */ + private Integer shouldVoteCount; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index da16e3fc25..4d2a9758bb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -22,7 +22,6 @@ 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.group.redis.ResiGroupRedis; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.form.*; @@ -321,4 +320,14 @@ public class ResiGroupController { public Result checkjointeam(@RequestBody GridIdFormDTO gridId){ return new Result().ok(resiGroupService.checkjointeam(gridId)); } + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + @PostMapping("shouldvotecount") + public Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO){ + return new Result().ok(resiGroupService.shouldVoteCount(formDTO)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java index 38dc060246..875163b278 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java @@ -155,4 +155,11 @@ public interface ResiGroupDao extends BaseDao { * @author zxc */ Integer checkjointeam(GridIdFormDTO gridId); + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 83a4a6e275..5859f46243 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -27,7 +27,6 @@ import com.epmet.resi.group.dto.group.GroupProcessingCountResultDTO; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; -import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -268,4 +267,11 @@ public interface ResiGroupService extends BaseService { * @author zxc */ CheckJoinTeamResultDTO checkjointeam(GridIdFormDTO gridId); + + /** + * @Description 获取应表决数 + * @param formDTO + * @author zxc + */ + ShouldVoteCountResultDTO shouldVoteCount(ShouldVoteCountFormDTO formDTO); } 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 0ff6d6a103..5a9950f577 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 @@ -58,6 +58,7 @@ import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.dto.UserRoleDTO; import com.epmet.resi.group.dto.group.*; import com.epmet.resi.group.dto.group.form.*; +import com.epmet.resi.group.dto.group.form.ShouldVoteCountFormDTO; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; @@ -832,6 +833,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl + + + From 79e41e66f0855c66d3663112e23d9ce55f71acc5 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 19 May 2020 14:26:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/feign/GovOrgFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java index cfce4881b1..97c3ce6b7f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java @@ -14,7 +14,7 @@ import java.util.List; * @Description * @Author sun */ -@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class,url = "localhost:8092") +@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) public interface GovOrgFeignClient { /** From 485f43fca54e590c587ef095e60ba4fd4850d495 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 19 May 2020 15:21:04 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC?= =?UTF-8?q?=E7=9A=84=E8=8A=82=E7=82=B9=E4=B8=8A=E5=8F=AA=E8=A6=81=E6=9C=89?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=90=8D=E5=AD=97=EF=BC=8C=E9=83=BD=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E6=88=91=E5=8F=82=E4=B8=8E=E7=9A=84=E9=87=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectDao.xml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index e68776748e..530fe7583e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -91,7 +91,6 @@ AND pp.OPERATION != 'created' WHERE ps.DEL_FLAG = '0' - AND ps.IS_HANDLE = 'handle' AND ps.STAFF_ID = #{userId} GROUP BY ps.PROJECT_ID) psp ON p.ID = psp.PROJECT_ID LEFT JOIN ( @@ -105,18 +104,7 @@ GROUP BY PROJECT_ID) ps ON p.ID = ps.PROJECT_ID LEFT JOIN project_process pp ON p.ID = pp.PROJECT_ID AND pp.OPERATION = 'close' WHERE - NOT EXISTS ( - SELECT - PROJECT_ID - FROM - project_staff - WHERE - DEL_FLAG = '0' - AND PROJECT_ID = p.ID - AND STAFF_ID = #{userId} - AND IS_HANDLE = 'unhandled' - ) - AND p.DEL_FLAG = '0' + p.DEL_FLAG = '0' ORDER BY p.CREATED_TIME ASC LIMIT #{pageNo}, #{pageSize} From bd6bf92c6a59b414533ea12f71ef4da7b2450dff Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 19 May 2020 16:03:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=B7=B2=E8=BD=AC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue-server/src/main/resources/mapper/IssueDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index f4cce88a94..ca168fc5e6 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -53,6 +53,7 @@ DEL_FLAG = '0' AND GRID_ID = #{gridId} AND ISSUE_STATUS = 'shift_project' + ORDER BY UPDATED_TIME DESC From 49aa0e372a5fb58c32d765d24f428e107c1381b6 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 19 May 2020 16:21:59 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/CheckTopicPublisherFormDTO.java | 25 +++++++++++++++++++ .../java/com/epmet/dto/form/VoteFormDTO.java | 2 +- .../result/CheckTopicPublisherResultDTO.java | 19 ++++++++++++++ .../src/main/java/com/epmet/dao/IssueDao.java | 8 ++++++ .../com/epmet/feign/ResiGroupFeignClient.java | 11 ++++++++ .../ResiGroupFeignClientFallBack.java | 7 ++++++ .../impl/IssueVoteDetailServiceImpl.java | 20 +++++++++++---- .../src/main/resources/mapper/IssueDao.xml | 12 +++++++++ .../form/CheckTopicPublisherFormDTO.java | 25 +++++++++++++++++++ .../result/CheckTopicPublisherResultDTO.java | 22 ++++++++++++++++ .../topic/controller/ResiTopicController.java | 13 ++++++++++ .../epmet/modules/topic/dao/ResiTopicDao.java | 14 +++++++---- .../topic/service/ResiTopicService.java | 8 ++++++ .../service/impl/ResiTopicServiceImpl.java | 11 ++++++++ .../resources/mapper/topic/ResiTopicDao.xml | 12 +++++++++ 15 files changed, 198 insertions(+), 11 deletions(-) create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CheckTopicPublisherFormDTO.java create mode 100644 epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckTopicPublisherResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CheckTopicPublisherFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CheckTopicPublisherFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CheckTopicPublisherFormDTO.java new file mode 100644 index 0000000000..2e0e2276f2 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/CheckTopicPublisherFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class CheckTopicPublisherFormDTO implements Serializable { + + private static final long serialVersionUID = 2599592072265715951L; + /** + * 话题Id + */ + private String topicId; + + /** + * 创建人 + */ + private String createdBy; + + +} diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java index 126257e37d..44655fbb8b 100644 --- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/form/VoteFormDTO.java @@ -16,7 +16,7 @@ public class VoteFormDTO implements Serializable { /** * 话题Id */ - private String IssueId; + private String issueId; /** * 态度 - opposition（反对）support（赞成） diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckTopicPublisherResultDTO.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckTopicPublisherResultDTO.java new file mode 100644 index 0000000000..c8011713e2 --- /dev/null +++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/CheckTopicPublisherResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * @Auth zxc + */ +@Data +public class CheckTopicPublisherResultDTO implements Serializable { + + private static final long serialVersionUID = 9130115335145168458L; + /** + * 校验本人是不是话题发起人 + */ + private Integer checkTopicPublisher; +} diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index a5eeaa6497..709afb5f7c 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java @@ -22,6 +22,7 @@ import com.epmet.dto.IssueDTO; import com.epmet.dto.form.CommonIssueListFormDTO; import com.epmet.dto.form.IssueDetailFormDTO; import com.epmet.dto.form.ShiftProjectListFromDTO; +import com.epmet.dto.form.VoteFormDTO; import com.epmet.dto.result.ClosedIssueListGovResultDTO; import com.epmet.dto.result.ClosedIssueListResultDTO; import com.epmet.dto.result.IssueResultDTO; @@ -91,4 +92,11 @@ public interface IssueDao extends BaseDao { * @date 2020.05.14 13:34 **/ List selectClosedListGov(CommonIssueListFormDTO issueListFormDTO); + + /** + * @Description 判断某人是不是议题发起人 + * @param formDTO + * @author zxc + */ + Integer checkIssuePublisher(VoteFormDTO formDTO); } \ 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 c4f5aa7f3a..59fd426b87 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 @@ -2,8 +2,11 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CheckTopicPublisherFormDTO; import com.epmet.dto.form.ShouldVoteCountFormDTO; +import com.epmet.dto.form.VoteFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.CheckTopicPublisherResultDTO; import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; import com.epmet.resi.group.dto.topic.ResiTopicDTO; @@ -48,4 +51,12 @@ public interface ResiGroupFeignClient { @PostMapping("/resi/group/group/shouldvotecount") Result shouldVoteCount(@RequestBody ShouldVoteCountFormDTO formDTO); + /** + * @Description 校验本人是不是话题发起人 + * @param formDTO + * @author zxc + */ + @PostMapping("/resi/group/topic/checktopicpublisher") + Result checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO); + } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java index 7a887029ea..a822a0c4b7 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java @@ -3,8 +3,10 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.CheckTopicPublisherFormDTO; import com.epmet.dto.form.ShouldVoteCountFormDTO; import com.epmet.dto.result.AgencyGridResultDTO; +import com.epmet.dto.result.CheckTopicPublisherResultDTO; import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.feign.ResiGroupFeignClient; import com.epmet.resi.group.dto.topic.ResiTopicDTO; @@ -32,4 +34,9 @@ public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { public Result shouldVoteCount(ShouldVoteCountFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "shouldVoteCount", formDTO); } + + @Override + public Result checkTopicPublisher(CheckTopicPublisherFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "checkTopicPublisher", formDTO); + } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java index 02cadd81cc..c5274d4ad2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteDetailServiceImpl.java @@ -28,13 +28,12 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.constant.IssueConstant; +import com.epmet.dao.IssueDao; import com.epmet.dao.IssueVoteDetailDao; import com.epmet.dto.IssueDTO; import com.epmet.dto.IssueVoteDetailDTO; -import com.epmet.dto.form.CheckVoteFormDTO; -import com.epmet.dto.form.ShouldVoteCountFormDTO; -import com.epmet.dto.form.VoteFormDTO; -import com.epmet.dto.form.VoteRedisFormDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.CheckTopicPublisherResultDTO; import com.epmet.dto.result.JoinVoteResultDTO; import com.epmet.dto.result.ShouldVoteCountResultDTO; import com.epmet.entity.IssueVoteDetailEntity; @@ -67,6 +66,8 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -168,8 +169,17 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl NumConstant.ZERO){ + if (checkoutVoteCount > NumConstant.ZERO || issuePublisher > NumConstant.ZERO || publisherResult.getCheckTopicPublisher() > NumConstant.ZERO){ resultDTO.setJoinVote(true); }else { resultDTO.setJoinVote(false); diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml index ca168fc5e6..7107c16107 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml @@ -246,4 +246,16 @@ #{pageSize} + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CheckTopicPublisherFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CheckTopicPublisherFormDTO.java new file mode 100644 index 0000000000..e98662fc4f --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/CheckTopicPublisherFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.group.dto.topic.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + */ +@Data +public class CheckTopicPublisherFormDTO implements Serializable { + + private static final long serialVersionUID = 6574592704731427746L; + /** + * 话题Id + */ + private String topicId; + + /** + * 创建人 + */ + private String createdBy; + + +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java new file mode 100644 index 0000000000..33a4b24291 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/CheckTopicPublisherResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.group.dto.topic.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * @Auth zxc + */ +@Data +public class CheckTopicPublisherResultDTO implements Serializable { + + private static final long serialVersionUID = -6904613651832971580L; + + /** + * 校验本人是不是话题发起人 + */ + private Integer checkTopicPublisher; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java index da04df9797..bbee6b578f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java @@ -4,6 +4,7 @@ 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.dto.form.VoteFormDTO; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.TopicInfoDTO; @@ -192,6 +193,7 @@ public class ResiTopicController { */ @PostMapping(value = "selectdetail") public Result selectDetail(@RequestBody TopicInfoFormDTO topicInfo){ + ValidatorUtils.validateEntity(topicInfo); return new Result().ok(topicService.selectDetail(topicInfo)); } @@ -247,4 +249,15 @@ public class ResiTopicController { return new Result().ok(topicService.topicInfoForIssueDetailGov(govTopicIssueInfoFormDTO)); } + /** + * @Description 校验本人是不是话题发起人 + * @param formDTO + * @author zxc + */ + @PostMapping("checktopicpublisher") + public Result checkTopicPublisher(@RequestBody CheckTopicPublisherFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO); + return new Result().ok(topicService.checkTopicPublisher(formDTO)); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java index a4e516caf1..8f4b3fdfd1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/dao/ResiTopicDao.java @@ -20,15 +20,12 @@ package com.epmet.modules.topic.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.topic.entity.ResiTopicEntity; -import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.TopicInfoDTO; +import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicPageFormDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicAndGroupResultDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicAttachmentsResultDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicIncludeIssueInfoResultDTO; +import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.dto.topic.form.TopicInfoFormDTO; -import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -148,4 +145,11 @@ public interface ResiTopicDao extends BaseDao { * @date 2020.05.14 17:02 **/ ResiTopicAttachmentsResultDTO selectTopicAndAttachments(@Param("topicId")String topicId); + + /** + * @Description 校验本人是不是话题发起人 + * @param formDTO + * @author zxc + */ + CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 943aa5a47d..08b8e89fd9 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -30,6 +30,7 @@ import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.*; import com.epmet.resi.group.dto.topic.result.*; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -256,4 +257,11 @@ public interface ResiTopicService extends BaseService { **/ GovTopicIssueInfoResultDTO topicInfoForIssueDetailGov(GovTopicIssueInfoFormDTO govTopicIssueInfoFormDTO); + /** + * @Description 校验本人是不是话题发起人 + * @param formDTO + * @author zxc + */ + CheckTopicPublisherResultDTO checkTopicPublisher(CheckTopicPublisherFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 1e56b56073..f5bd09a849 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -69,6 +69,7 @@ import com.epmet.resi.group.dto.member.result.ResiGroupMemberInfoRedisResultDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.TopicInfoDTO; import com.epmet.resi.group.dto.topic.form.*; +import com.epmet.resi.group.dto.topic.form.CheckTopicPublisherFormDTO; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; import com.epmet.resi.group.dto.topic.result.*; import org.apache.commons.lang3.StringUtils; @@ -1140,6 +1141,16 @@ public class ResiTopicServiceImpl extends BaseServiceImpl + + + From 648a7d7d87155987c2711d1c6b60ec7addf2e7fa Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 May 2020 16:39:00 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E7=9A=84=E4=BB=A3=E7=A0=81=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index fe339b23bb..6137202eeb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -257,6 +257,25 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl staffList = dto.getStaffList(); List roleList = dto.getRoleList(); //有时间再优化成jdk8的遍历方式 + //5.0:先把在部门或网格下存在的人员在组织中去掉，组织中只展示在部门、网格下不存在的人员 + //部门 + Iterator itDept = agencyStaffList.iterator(); + while (itDept.hasNext()) { + for (CustomerStaffDepartmentDTO dept : deptStaffs) { + if (dept.getUserId().equals(itDept.next().getStaffId())) { + itDept.remove(); + } + } + } + //网格 + Iterator itGrid = agencyStaffList.iterator(); + while (itGrid.hasNext()) { + for (CustomerStaffGridDTO grid : gridStaffs) { + if (grid.getUserId().equals(itGrid.next().getStaffId())) { + itGrid.remove(); + } + } + } //5.1装载组织下人员数据 for(StaffListResultDTO sf : agencyStaffList){ //人员信息 From 4fba01c9eef863632c830ee4057703039f7b57ca Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 May 2020 17:11:47 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=BF=AD=E4=BB=A3=E5=99=A8Bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 6137202eeb..155cafd024 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -261,8 +261,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl itDept = agencyStaffList.iterator(); while (itDept.hasNext()) { + StaffListResultDTO stf = itDept.next(); for (CustomerStaffDepartmentDTO dept : deptStaffs) { - if (dept.getUserId().equals(itDept.next().getStaffId())) { + if (dept.getUserId().equals(stf.getStaffId())) { itDept.remove(); } } @@ -270,8 +271,9 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl itGrid = agencyStaffList.iterator(); while (itGrid.hasNext()) { + StaffListResultDTO stf = itGrid.next(); for (CustomerStaffGridDTO grid : gridStaffs) { - if (grid.getUserId().equals(itGrid.next().getStaffId())) { + if (grid.getUserId().equals(stf.getStaffId())) { itGrid.remove(); } }