zxc
5 years ago
236 changed files with 12283 additions and 124 deletions
@ -0,0 +1,35 @@ |
|||
package com.epmet.constant; |
|||
|
|||
/** |
|||
* 议题相关常亮，其它服务可用 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/11 14:10 |
|||
*/ |
|||
public interface IssueOpenConstant { |
|||
/** |
|||
* 议题状态-表决中 |
|||
*/ |
|||
String ISSUE_VOTING = "voting"; |
|||
/** |
|||
* 议题状态-已转项目 |
|||
*/ |
|||
String ISSUE_SHIFT_PROJECT = "shift_project"; |
|||
/** |
|||
* 议题状态-已关闭 |
|||
*/ |
|||
String ISSUE_CLOSED = "closed"; |
|||
/** |
|||
* 议题解决类型-已解决 |
|||
*/ |
|||
String ISSUE_RESOLVED = "resolved"; |
|||
/** |
|||
* 议题解决类型-未解决 |
|||
*/ |
|||
String ISSUE_UNRESOLVED = "unresolved"; |
|||
|
|||
/** |
|||
* 议题来源类型 eg:resi_topic |
|||
*/ |
|||
String SOURCE_TYPE_RT="resi_topic"; |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/10 10:04 上午 |
|||
*/ |
|||
@Data |
|||
public class MyPartIssuesFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 265005061427415836L; |
|||
|
|||
public interface MyPartIssues{} |
|||
|
|||
/** |
|||
* 用户ID |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = MyPartIssues.class) |
|||
private String userId; |
|||
|
|||
} |
|||
@ -0,0 +1,35 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/11 9:06 上午 |
|||
*/ |
|||
@Data |
|||
public class MyPubIssuesAuditingFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8417818340366917358L; |
|||
|
|||
public interface MyPubIssuesAuditing{} |
|||
|
|||
@NotNull(message = "页码不能为空",groups = MyPubIssuesAuditing.class) |
|||
private Integer pageNo; |
|||
|
|||
@NotNull(message = "每页数量不能为空",groups = MyPubIssuesAuditing.class) |
|||
private Integer pageSize; |
|||
|
|||
/** |
|||
* 拓展参数：前端不传值，内部传输用 |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 拓展参数：前端不传值，内部传输用 |
|||
*/ |
|||
private String issueStatus; |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/13 3:30 下午 |
|||
*/ |
|||
@Data |
|||
public class MyShiftIssueTopicsFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -3943178729586797400L; |
|||
|
|||
public interface MyShiftIssueTopics{} |
|||
|
|||
/** |
|||
* 页码 |
|||
*/ |
|||
@NotNull(message = "页码不能为空",groups = {MyShiftIssueTopics.class}) |
|||
private Integer pageNo; |
|||
|
|||
/** |
|||
* 每页数量 |
|||
*/ |
|||
@NotNull(message = "每页数量不能为空",groups = {MyShiftIssueTopics.class}) |
|||
private Integer pageSize; |
|||
|
|||
|
|||
@NotBlank(message = "客户ID不能为空",groups = {MyShiftIssueTopics.class}) |
|||
private String customerId; |
|||
|
|||
private String userId; |
|||
|
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/10 9:50 上午 |
|||
*/ |
|||
@Data |
|||
public class MyPartIssuesResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2081387920547808112L; |
|||
|
|||
private String issueId; |
|||
|
|||
/** |
|||
* 建议 |
|||
*/ |
|||
private String suggestion; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 转议题时间 |
|||
*/ |
|||
private Long shiftIssueTime; |
|||
|
|||
/** |
|||
* 发表网格名称 |
|||
*/ |
|||
private String topicReleaseGridName; |
|||
|
|||
@JsonIgnore |
|||
private String gridId; |
|||
} |
|||
@ -0,0 +1,53 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/11 9:17 上午 |
|||
*/ |
|||
@Data |
|||
public class MyPubIssuesAuditingResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -659855213089511649L; |
|||
|
|||
/** |
|||
* 议题id |
|||
*/ |
|||
private String issueId; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 议题建议 |
|||
*/ |
|||
private String suggestion; |
|||
|
|||
/** |
|||
* 转议题时间 |
|||
*/ |
|||
private Long shiftIssueTime; |
|||
|
|||
/** |
|||
* 议题来源的小组名 |
|||
*/ |
|||
private String topicReleaseGroupName; |
|||
|
|||
/** |
|||
* 议题来源的网格名 |
|||
*/ |
|||
private String topicReleaseGridName; |
|||
|
|||
@JsonIgnore |
|||
private String gridId; |
|||
|
|||
@JsonIgnore |
|||
private String topicId; |
|||
|
|||
} |
|||
@ -0,0 +1,50 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/13 3:31 下午 |
|||
*/ |
|||
@Data |
|||
public class MyShiftIssueTopicsResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -703102629653169023L; |
|||
|
|||
/** |
|||
* 话题ID |
|||
*/ |
|||
private String topicId; |
|||
|
|||
/** |
|||
* 转议题时间 |
|||
*/ |
|||
private Long shiftIssueTime; |
|||
|
|||
/** |
|||
* 建议 |
|||
*/ |
|||
private String suggestion; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 话题发表网格名称 |
|||
*/ |
|||
private String releaseGridName; |
|||
|
|||
/** |
|||
* 议题ID |
|||
*/ |
|||
private String issueId; |
|||
|
|||
@JsonIgnore |
|||
private String gridId; |
|||
|
|||
} |
|||
@ -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,31 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/10 2:13 下午 |
|||
*/ |
|||
@Data |
|||
@AllArgsConstructor |
|||
public class OrgInfoFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 4480485864711053393L; |
|||
|
|||
/** |
|||
* org的类型 agency：机关，grid：网格，dept：部门 |
|||
*/ |
|||
private String orgType; |
|||
|
|||
/** |
|||
* orgId集合 |
|||
*/ |
|||
private List<String> orgIds; |
|||
|
|||
public OrgInfoFormDTO() { |
|||
} |
|||
} |
|||
@ -0,0 +1,33 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonInclude; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
import java.util.Set; |
|||
|
|||
/** |
|||
* @description: |
|||
* @author: liushaowen |
|||
* @date: 2020/11/6 13:54 |
|||
*/ |
|||
@Data |
|||
public class AgencyElementTreeResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
private Set<String> defaultKeys; |
|||
|
|||
private List<Agency> list; |
|||
|
|||
@Data |
|||
public static class Agency{ |
|||
private String id; |
|||
|
|||
private String label; |
|||
|
|||
@JsonInclude(JsonInclude.Include.NON_EMPTY) |
|||
private List<AgencyElementTreeResultDTO.Agency> children; |
|||
} |
|||
|
|||
} |
|||
@ -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,20 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
@Data |
|||
public class ProjectByCreateTopicUserFormDTO { |
|||
|
|||
public interface ListByUserGroup {} |
|||
|
|||
@NotBlank(message = "客户ID不能为空", groups = { ListByUserGroup.class }) |
|||
private String customerId; |
|||
|
|||
@NotBlank(message = "用户ID不能为空", groups = { ListByUserGroup.class }) |
|||
private String userId; |
|||
private Integer pageNo = 1; |
|||
private Integer pageSize = 10; |
|||
|
|||
} |
|||
@ -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,46 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 个人中心-我发起的议题列表-已关闭返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/11 13:39 |
|||
*/ |
|||
@Data |
|||
public class MyPubIssuesClosedResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -265465326846671555L; |
|||
/** |
|||
* 议题id |
|||
*/ |
|||
private String issueId; |
|||
|
|||
/** |
|||
* 议题标题 |
|||
*/ |
|||
private String issueTitle; |
|||
|
|||
/** |
|||
* 建议 |
|||
*/ |
|||
private String suggestion; |
|||
|
|||
/** |
|||
* 议题关闭时间。时间戳 |
|||
*/ |
|||
private Long closedTime; |
|||
|
|||
/** |
|||
* 话题发表于哪个组 |
|||
*/ |
|||
private String topicReleaseGroupName; |
|||
|
|||
/** |
|||
* 话题发表于哪个网格 |
|||
*/ |
|||
private String topicReleaseGridName; |
|||
|
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 个人中心-我发起的议题列表-已转项目 返参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2020/11/11 12:18 |
|||
*/ |
|||
@Data |
|||
public class MyPubIssuesShiftProjectResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -7183751225506622772L; |
|||
/** |
|||
* 项目id |
|||
*/ |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 话题发表网格id |
|||
*/ |
|||
private String topicReleaseGridName; |
|||
|
|||
/** |
|||
* 当前处理部门名称列表 |
|||
*/ |
|||
private List<String> departmentNameList; |
|||
|
|||
/** |
|||
* 项目标题 |
|||
*/ |
|||
private String projectTitle; |
|||
|
|||
/** |
|||
* 转项目时间。时间戳 |
|||
*/ |
|||
private Long shiftProjectTime; |
|||
|
|||
/** |
|||
* 话题发表于哪个组 |
|||
*/ |
|||
private String topicReleaseGroupName; |
|||
|
|||
private String issueId; |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.util.List; |
|||
|
|||
@Data |
|||
public class ProjectOfCreateTopicUserResultDTO { |
|||
|
|||
private String topicId; |
|||
private String projectId; |
|||
private String issueId; |
|||
private String gridId; |
|||
private Long shiftProjectTime; |
|||
private List<String> departmentNameList; |
|||
private String projectTitle; |
|||
private String releaseGridId; |
|||
|
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
ALTER TABLE `project_related_personnel` ADD COLUMN `SOURCE_TYPE` VARCHAR (32) CHARACTER |
|||
SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源类型(话题:topic 议题:issue)' AFTER `GRID_ID`, |
|||
ADD COLUMN `SOURCE_ID` VARCHAR (64) CHARACTER |
|||
SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源Id(话题或议题Id)' AFTER `SOURCE_TYPE`; |
|||
|
|||
-- 更改项目库的字符集 |
|||
alter table customer_project_parameter convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_org_relation convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_process convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_related_personnel convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_satisfaction_detail convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_satisfaction_statistics convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
alter table project_staff convert to character set utf8mb4 collate utf8mb4_general_ci; |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.resi.group.dto.group.form; |
|||
|
|||
import lombok.AllArgsConstructor; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/11 1:30 下午 |
|||
*/ |
|||
@Data |
|||
@AllArgsConstructor |
|||
public class GroupInfoFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -7940077760343241658L; |
|||
|
|||
private List<String> topicIds; |
|||
|
|||
public GroupInfoFormDTO() { |
|||
} |
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.resi.group.dto.group.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/11 1:31 下午 |
|||
*/ |
|||
@Data |
|||
public class GroupInfoResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5508197256307317314L; |
|||
|
|||
private String topicId; |
|||
|
|||
private String topicGroupName; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.resi.group.dto.topic; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
|
|||
@Data |
|||
public class MyCreateTopicsFormDTO { |
|||
|
|||
@NotBlank(message = "客户id不能为空") |
|||
private String customerId; |
|||
|
|||
@NotBlank(message = "用户id不能为空") |
|||
private String userId; |
|||
|
|||
private Integer pageSize = 10; |
|||
|
|||
private Integer pageNo = 1; |
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.resi.group.dto.topic.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.Min; |
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 客户Id 用户Id 分页 |
|||
* @ClassName CustomerPageFormDTO |
|||
* @Auth wangc |
|||
* @Date 2020-11-11 23:15 |
|||
*/ |
|||
@Data |
|||
public class CustomerPageFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 8678047078015445193L; |
|||
|
|||
@NotBlank(message = "客户Id不能为空") |
|||
private String customerId; |
|||
|
|||
@NotBlank(message = "用户Id不能为空") |
|||
private String userId; |
|||
|
|||
@Min(1) |
|||
private Integer pageNo; |
|||
|
|||
@Min(1) |
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,14 @@ |
|||
package com.epmet.resi.group.dto.topic.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2020/11/13 4:27 下午 |
|||
*/ |
|||
@Data |
|||
public class TopicIdListFormDTO{ |
|||
|
|||
private String userId; |
|||
|
|||
} |
|||
@ -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,16 @@ |
|||
package com.epmet.resi.group.dto.topic.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
@Data |
|||
public class MyCreateTopicsResultDTO { |
|||
|
|||
private String topicId; |
|||
private String groupId; |
|||
private Long releaseTime; |
|||
private String topicContent; |
|||
private String releaseGroupName; |
|||
private String releaseGridId; |
|||
private String releaseGridName; |
|||
|
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.resi.group.dto.topic.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 个人中心 参与过的话题返参DTO |
|||
* @ClassName ParticipatedTopicUnitResultDTO |
|||
* @Auth wangc |
|||
* @Date 2020-11-11 23:00 |
|||
*/ |
|||
@Data |
|||
public class ParticipatedTopicUnitResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1392205563783715932L; |
|||
|
|||
private String topicId; |
|||
|
|||
private String groupId; |
|||
|
|||
private String topicReleaseGridName; |
|||
|
|||
private String topicContent; |
|||
|
|||
private Long releaseTime; |
|||
|
|||
private String topicReleaseGroupName; |
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue