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/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/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/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/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-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/dao/IssueDao.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueDao.java index dddd6d4118..d40377e231 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,11 @@ 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; +import com.epmet.dto.result.VotingIssueListResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.IssueEntity; import org.apache.ibatis.annotations.Mapper; @@ -88,7 +93,14 @@ public interface IssueDao extends BaseDao { * @date 2020.05.14 13:34 **/ List selectClosedListGov(CommonIssueListFormDTO issueListFormDTO); - + + /** + * @Description 判断某人是不是议题发起人 + * @param formDTO + * @author zxc + */ + Integer checkIssuePublisher(VoteFormDTO formDTO); + /** * @Description 生成昨日的议题日统计信息 * @param 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..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,7 +2,12 @@ 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; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -10,6 +15,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 +43,20 @@ 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); + + /** + * @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 c2c18e977b..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,7 +3,11 @@ 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; import com.epmet.resi.group.dto.topic.form.GovTopicIssueInfoFormDTO; @@ -25,4 +29,14 @@ 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); + } + + @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/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..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 @@ -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,19 @@ 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.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.VoteFormDTO; +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; +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 +62,12 @@ public class IssueVoteDetailServiceImpl extends BaseServiceImpl page(Map params) { @@ -118,6 +131,25 @@ 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/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 5fa16e9c84..ea992c476e 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 @@ -34,15 +34,18 @@ import com.epmet.dto.PolyLineDTO; import com.epmet.dto.form.EvaluationListFormDTO; import com.epmet.dto.form.IssueIdFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; +import com.epmet.dto.form.VoteRedisFormDTO; import com.epmet.dto.result.EvaluationListResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.dto.result.VoteResultDTO; import com.epmet.dto.result.VotingTrendResultDTO; import com.epmet.entity.IssueVoteStatisticalEntity; import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.redis.IssueVoteDetailRedis; import com.epmet.redis.IssueVoteStatisticalRedis; import com.epmet.service.IssueVoteStatisticalService; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -70,6 +73,8 @@ public class IssueVoteStatisticalServiceImpl 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/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 6c3651d9a9..4546d8da07 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 @@ -245,6 +246,18 @@ #{pageSize} + + + 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-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/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 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 + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 40a791819e..e742be69e8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -434,5 +434,17 @@ ORDER BY attachment.SORT ASC + + +