zxc
5 years ago
42 changed files with 795 additions and 23 deletions
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询所属网格 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class BelongGridNameFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 网格id |
||||
|
*/ |
||||
|
private String gridId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,21 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @CreateTime 2020/5/11 18:30 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class BelongGridNameResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -5513674274570554563L; |
||||
|
|
||||
|
/** |
||||
|
* 所属网格(网格所属机关单位名称-网格名称) |
||||
|
*/ |
||||
|
private String BelongsGridName; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,43 @@ |
|||||
|
package com.epmet.resi.group.dto.topic; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 话题详情(议题详情中的) |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class TopicInfoDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 话题id |
||||
|
*/ |
||||
|
private String topicId; |
||||
|
|
||||
|
/** |
||||
|
* 话题内容 |
||||
|
*/ |
||||
|
private String topicContent; |
||||
|
|
||||
|
/** |
||||
|
* 图片列表 |
||||
|
*/ |
||||
|
private List<String> topicImgs; |
||||
|
|
||||
|
/** |
||||
|
* 话题发表人（山东路168-尹女士） |
||||
|
*/ |
||||
|
private String publishedUser; |
||||
|
|
||||
|
/** |
||||
|
* 话题发表时间 (时间戳 毫秒级) |
||||
|
*/ |
||||
|
private Long publishedTime; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.resi.group.dto.topic.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询话题信息 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class TopicInfoFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 话题id |
||||
|
*/ |
||||
|
private String topicId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,43 @@ |
|||||
|
package com.epmet.dto; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 投票折线数据 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class PolyLineDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 话题id |
||||
|
*/ |
||||
|
private String topicId; |
||||
|
|
||||
|
/** |
||||
|
* 话题内容 |
||||
|
*/ |
||||
|
private String topicContent; |
||||
|
|
||||
|
/** |
||||
|
* 图片列表 |
||||
|
*/ |
||||
|
private List<String> topicImgs; |
||||
|
|
||||
|
/** |
||||
|
* 话题发表人（山东路168-尹女士） |
||||
|
*/ |
||||
|
private String publishedUser; |
||||
|
|
||||
|
/** |
||||
|
* 话题发表时间 (时间戳 毫秒级) |
||||
|
*/ |
||||
|
private Long publishedTime; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询所属网格 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class BelongGridNameFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 网格id |
||||
|
*/ |
||||
|
private String gridId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,21 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Description 议题Id |
||||
|
* @Author zxc |
||||
|
* @Date 2020/5/11 9:30 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueIdFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = 4859779755214503489L; |
||||
|
|
||||
|
@NotBlank(message = "议题id不能为空") |
||||
|
private String issueId; |
||||
|
|
||||
|
} |
||||
|
|
||||
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询话题信息 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class TopicInfoFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 话题id |
||||
|
*/ |
||||
|
private String topicId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询所属网格 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class BelongGridNameResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -1L; |
||||
|
|
||||
|
/** |
||||
|
* 所属网格名称 eg:所属网格(网格所属机关单位名称-网格名称) |
||||
|
*/ |
||||
|
private String belongsGridName; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,48 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 议题详情回参 |
||||
|
* @CreateTime 2020/5/11 9:31 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -1L; |
||||
|
|
||||
|
/** |
||||
|
* 议题标题 |
||||
|
*/ |
||||
|
private String issueTitle; |
||||
|
|
||||
|
/** |
||||
|
* 议题状态(voting 已转项目：shift_project 已关闭：closed) |
||||
|
*/ |
||||
|
private String issueStatus; |
||||
|
|
||||
|
/** |
||||
|
* 议题建议 |
||||
|
*/ |
||||
|
private String issueSuggestion; |
||||
|
|
||||
|
/** |
||||
|
* 网格Id |
||||
|
*/ |
||||
|
private String gridId; |
||||
|
|
||||
|
/** |
||||
|
* 用户id |
||||
|
*/ |
||||
|
private String userId; |
||||
|
|
||||
|
/** |
||||
|
* 话题Id |
||||
|
*/ |
||||
|
private String topicId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,38 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 议题表决折线图 |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class VotingTrendResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -1L; |
||||
|
|
||||
|
/** |
||||
|
* 应表决数量 |
||||
|
*/ |
||||
|
private Integer shouldVoteCount; |
||||
|
|
||||
|
/** |
||||
|
* 实际表决数量 |
||||
|
*/ |
||||
|
private Integer realityVoteCount; |
||||
|
|
||||
|
/** |
||||
|
* 截至今日赞成票总数 |
||||
|
*/ |
||||
|
private Integer supportAmount; |
||||
|
|
||||
|
/** |
||||
|
* 截至今日反对票总数 |
||||
|
*/ |
||||
|
private Integer oppositionAmount; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,29 @@ |
|||||
|
package com.epmet.feign; |
||||
|
|
||||
|
import com.epmet.commons.tools.constant.ServiceConstant; |
||||
|
import com.epmet.commons.tools.utils.Result; |
||||
|
import com.epmet.dto.form.IssueDetailFormDTO; |
||||
|
import com.epmet.dto.result.IssueResultDTO; |
||||
|
import com.epmet.feign.fallback.GovIssueFeignClientFallBack; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description Feign调用gov-issue-server模块 |
||||
|
* @ClassName GovIssueFeignFallBack |
||||
|
* url = "localhost:8101" |
||||
|
*/ |
||||
|
@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueFeignClientFallBack.class) |
||||
|
public interface GovIssueFeignClient { |
||||
|
|
||||
|
/** |
||||
|
* @Description 议题详情 |
||||
|
* @param issueDetail |
||||
|
* @author zxc |
||||
|
* @date 2020/5/11 16:50 |
||||
|
*/ |
||||
|
@PostMapping("/gov/issue/issue/issuedetail") |
||||
|
Result<IssueResultDTO> issueDetail(@RequestBody IssueDetailFormDTO issueDetail); |
||||
|
} |
||||
@ -0,0 +1,24 @@ |
|||||
|
package com.epmet.feign; |
||||
|
|
||||
|
import com.epmet.commons.tools.constant.ServiceConstant; |
||||
|
import com.epmet.commons.tools.utils.Result; |
||||
|
import com.epmet.dto.form.BelongGridNameFormDTO; |
||||
|
import com.epmet.dto.result.BelongGridNameResultDTO; |
||||
|
import com.epmet.feign.fallback.GovOrgFeignClientFallBack; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
import org.springframework.web.bind.annotation.RequestBody; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description Feign调用gov-org-server模块 |
||||
|
* @ClassName GovOrgFeginFallBack |
||||
|
* url = "localhost:8092" |
||||
|
*/ |
||||
|
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class) |
||||
|
public interface GovOrgFeignClient { |
||||
|
|
||||
|
|
||||
|
@PostMapping("/gov/org/customergrid/getgridnamebygridid") |
||||
|
Result<BelongGridNameResultDTO> getGridNameByGridId(@RequestBody BelongGridNameFormDTO formDTO); |
||||
|
} |
||||
@ -0,0 +1,28 @@ |
|||||
|
package com.epmet.feign; |
||||
|
|
||||
|
import com.epmet.commons.tools.constant.ServiceConstant; |
||||
|
import com.epmet.commons.tools.utils.Result; |
||||
|
import com.epmet.dto.TopicInfoDTO; |
||||
|
import com.epmet.dto.form.TopicInfoFormDTO; |
||||
|
import com.epmet.feign.fallback.ResiGroupFeignClientFallBack; |
||||
|
import org.springframework.cloud.openfeign.FeignClient; |
||||
|
import org.springframework.web.bind.annotation.PostMapping; |
||||
|
|
||||
|
/** |
||||
|
* @author zxc |
||||
|
* url = "localhost:8095" |
||||
|
*/ |
||||
|
@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupFeignClientFallBack.class) |
||||
|
public interface ResiGroupFeignClient { |
||||
|
|
||||
|
/** |
||||
|
* @Description 获取话题详情 |
||||
|
* @param formDTO |
||||
|
* @author zxc |
||||
|
* @date 2020/5/11 15:42 |
||||
|
*/ |
||||
|
@PostMapping("/resi/group/topic/selectdetail") |
||||
|
Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO); |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,22 @@ |
|||||
|
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.IssueDetailFormDTO; |
||||
|
import com.epmet.dto.result.IssueResultDTO; |
||||
|
import com.epmet.feign.GovIssueFeignClient; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
|
||||
|
/** |
||||
|
* @Description Feign |
||||
|
* @ClassName GovIssueFeginFallBack |
||||
|
*/ |
||||
|
@Component |
||||
|
public class GovIssueFeignClientFallBack implements GovIssueFeignClient { |
||||
|
|
||||
|
@Override |
||||
|
public Result<IssueResultDTO> issueDetail(IssueDetailFormDTO issueDetail) { |
||||
|
return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "issueDetail", issueDetail); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,23 @@ |
|||||
|
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.BelongGridNameFormDTO; |
||||
|
import com.epmet.dto.result.BelongGridNameResultDTO; |
||||
|
import com.epmet.feign.GovOrgFeignClient; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
|
||||
|
/** |
||||
|
* @Description Feign |
||||
|
* @ClassName GovOrgFeginFallBack |
||||
|
*/ |
||||
|
@Component |
||||
|
public class GovOrgFeignClientFallBack implements GovOrgFeignClient { |
||||
|
|
||||
|
|
||||
|
@Override |
||||
|
public Result<BelongGridNameResultDTO> getGridNameByGridId(BelongGridNameFormDTO formDTO) { |
||||
|
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridNameByGridId", formDTO); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,21 @@ |
|||||
|
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.TopicInfoDTO; |
||||
|
import com.epmet.dto.form.TopicInfoFormDTO; |
||||
|
import com.epmet.feign.ResiGroupFeignClient; |
||||
|
import org.springframework.stereotype.Component; |
||||
|
|
||||
|
/** |
||||
|
* @author zxc |
||||
|
*/ |
||||
|
@Component |
||||
|
public class ResiGroupFeignClientFallBack implements ResiGroupFeignClient { |
||||
|
|
||||
|
@Override |
||||
|
public Result<TopicInfoDTO> selectDetail(TopicInfoFormDTO formDTO) { |
||||
|
return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "selectDetail", formDTO); |
||||
|
} |
||||
|
} |
||||
@ -0,0 +1,23 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 查询议题发起人dto |
||||
|
* @CreateTime 2020/5/11 9:36 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueInitiatorFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 1L; |
||||
|
|
||||
|
/** |
||||
|
* 话题id |
||||
|
*/ |
||||
|
private String userId; |
||||
|
|
||||
|
|
||||
|
} |
||||
@ -0,0 +1,20 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* 返回议题发起人dto eg：山东路178号——刘女士 |
||||
|
* @CreateTime 2020/5/11 10:49 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueInitiatorResultDTO implements Serializable { |
||||
|
|
||||
|
/** |
||||
|
* 议题发起人（山东路168-尹女士） |
||||
|
*/ |
||||
|
private String issueInitiator; |
||||
|
|
||||
|
} |
||||
Loading…
Reference in new issue