Browse Source
# Conflicts: # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java # epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java # epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xmlmaster
liushaowen
5 years ago
62 changed files with 908 additions and 53 deletions
@ -0,0 +1,15 @@ |
|||||
|
package com.epmet.constant; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/11/10 5:18 下午 |
||||
|
*/ |
||||
|
public interface OrgInfoConstant { |
||||
|
|
||||
|
String AGENCY = "agency"; |
||||
|
|
||||
|
String GRID = "grid"; |
||||
|
|
||||
|
String DEPT = "dept"; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,27 @@ |
|||||
|
package com.epmet.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/11/10 2:13 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class OrgInfoFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 4480485864711053393L; |
||||
|
|
||||
|
/** |
||||
|
* org的类型 agency：机关，grid：网格，dept：部门 |
||||
|
*/ |
||||
|
private String orgType; |
||||
|
|
||||
|
/** |
||||
|
* orgId集合 |
||||
|
*/ |
||||
|
private List<String> orgIds; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,34 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/11/10 2:15 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class OrgInfoResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 7478605833438304330L; |
||||
|
|
||||
|
private String orgId; |
||||
|
|
||||
|
private String orgName; |
||||
|
|
||||
|
/** |
||||
|
* orgType 为空时，此字段为空 |
||||
|
*/ |
||||
|
private String agencyId; |
||||
|
|
||||
|
private String pid; |
||||
|
|
||||
|
private String pids; |
||||
|
|
||||
|
private String allParentName; |
||||
|
|
||||
|
private String organizationName; |
||||
|
|
||||
|
private String level; |
||||
|
} |
||||
@ -0,0 +1,53 @@ |
|||||
|
package com.epmet.dto.result; |
||||
|
|
||||
|
import com.fasterxml.jackson.annotation.JsonIgnore; |
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @Description 个人中心-我参与的项目列表-接口返参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class MyPartProjectsResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 2081387920547808112L; |
||||
|
|
||||
|
/** |
||||
|
* 项目id |
||||
|
*/ |
||||
|
private String projectId; |
||||
|
|
||||
|
/** |
||||
|
* 话题发表于哪个网格 |
||||
|
*/ |
||||
|
private String topicReleaseGridName; |
||||
|
|
||||
|
/** |
||||
|
* 项目标题 |
||||
|
*/ |
||||
|
private String projectTitle; |
||||
|
|
||||
|
/** |
||||
|
* 当前处理部门 |
||||
|
*/ |
||||
|
private List<String> departmentNameList; |
||||
|
|
||||
|
/** |
||||
|
* 转项目时间。时间戳 |
||||
|
*/ |
||||
|
private Long shiftProjectTime; |
||||
|
|
||||
|
/** |
||||
|
* 议题Id，用户数据整合使用(项目出自哪个网格"组织-网格") |
||||
|
*/ |
||||
|
@JsonIgnore |
||||
|
private String issueId; |
||||
|
/** |
||||
|
* 项目状态(待处理 pending，结案closed)用于查询当前处理部门信息 |
||||
|
*/ |
||||
|
@JsonIgnore |
||||
|
private String status; |
||||
|
} |
||||
@ -0,0 +1,14 @@ |
|||||
|
package com.epmet.resi.group.dto.topic; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
@Data |
||||
|
public class MyTopicsFormDTO { |
||||
|
|
||||
|
private String customerId; |
||||
|
|
||||
|
private Integer pageSize = 10; |
||||
|
|
||||
|
private Integer pageNo = 1; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,28 @@ |
|||||
|
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; |
||||
|
|
||||
|
|
||||
|
/** |
||||
|
* @Description 话题对应的议题及所属网格数据 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class IssueGridResultDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -3495808492616727671L; |
||||
|
|
||||
|
/** |
||||
|
* 网格Id |
||||
|
* */ |
||||
|
private String gridId; |
||||
|
|
||||
|
/** |
||||
|
* 议题Id |
||||
|
* */ |
||||
|
private String issueId; |
||||
|
|
||||
|
} |
||||
@ -0,0 +1,14 @@ |
|||||
|
package com.epmet.resi.group.dto.topic.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
@Data |
||||
|
public class MyTopicsResultDTO { |
||||
|
|
||||
|
private String topicId; |
||||
|
private Long releaseTime; |
||||
|
private String topicContent; |
||||
|
private String releaseGroupName; |
||||
|
private String releaseGridName; |
||||
|
|
||||
|
} |
||||
@ -1,10 +0,0 @@ |
|||||
package com.epmet.resi.mine.dto.from; |
|
||||
|
|
||||
/** |
|
||||
* @description: 我的建议列表DTO |
|
||||
* @author: liushaowen |
|
||||
* @date: 2020/11/5 10:38 |
|
||||
*/ |
|
||||
|
|
||||
public class MyAdviceListFormDTO { |
|
||||
} |
|
||||
@ -0,0 +1,37 @@ |
|||||
|
package com.epmet.resi.mine.dto.from; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.Min; |
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
import java.util.List; |
||||
|
|
||||
|
/** |
||||
|
* @Description 个人中心-我参与的项目列表-接口入参 |
||||
|
* @Auth sun |
||||
|
*/ |
||||
|
@Data |
||||
|
public class MyPartProjectsFormDTO implements Serializable { |
||||
|
private static final long serialVersionUID = -6534841370041338474L; |
||||
|
@NotBlank(message = "客户Id不能为空", groups = {MyPartProjectsFormDTO.MyProject.class}) |
||||
|
private String customerId; |
||||
|
/** |
||||
|
* 当前页 |
||||
|
* */ |
||||
|
@Min(value = 1) |
||||
|
private Integer pageNo; |
||||
|
/** |
||||
|
* 每页数量 |
||||
|
* */ |
||||
|
private Integer pageSize = 20; |
||||
|
/** |
||||
|
* token中用户Id |
||||
|
*/ |
||||
|
private String userId; |
||||
|
/** |
||||
|
* 议题Id集合 |
||||
|
*/ |
||||
|
private List<String> issueList; |
||||
|
public interface MyProject {} |
||||
|
} |
||||
@ -1,13 +0,0 @@ |
|||||
package com.epmet.resi.mine.dto.from; |
|
||||
|
|
||||
import lombok.Data; |
|
||||
|
|
||||
/** |
|
||||
* @description: 提交建议DTO |
|
||||
* @author: liushaowen |
|
||||
* @date: 2020/11/5 10:35 |
|
||||
*/ |
|
||||
|
|
||||
@Data |
|
||||
public class SubmitAdviceFormDTO { |
|
||||
} |
|
||||
@ -1,11 +1,12 @@ |
|||||
package com.epmet.modules.advice.service; |
package com.epmet.modules.advice.service; |
||||
|
|
||||
import com.epmet.commons.tools.utils.Result; |
import com.epmet.commons.tools.utils.Result; |
||||
import com.epmet.resi.mine.dto.from.MyAdviceListFormDTO; |
import com.epmet.dto.form.SubmitAdviceFormDTO; |
||||
import com.epmet.resi.mine.dto.from.SubmitAdviceFormDTO; |
|
||||
|
import java.util.Map; |
||||
|
|
||||
public interface AdviceService { |
public interface AdviceService { |
||||
Result submitAdvice(SubmitAdviceFormDTO dto); |
Result submitAdvice(SubmitAdviceFormDTO dto); |
||||
|
|
||||
Result getMyAdviceList(MyAdviceListFormDTO dto); |
Result getMyAdviceList(Map<String,Integer> map); |
||||
} |
} |
||||
|
|||||
Loading…
Reference in new issue