Browse Source
# Conflicts: # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java # epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java # epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java # epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.javamaster
jianjun
3 years ago
202 changed files with 9358 additions and 130 deletions
@ -0,0 +1,6 @@ |
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526493468551626753', 'self_org_category', '社区自组织类别', '社区自组织类别：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他', 1, 0, 0, '1', '2022-05-17 17:22:58', '1', '2022-05-17 17:22:58'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495882432299010', 1526493468551626753, '楼委会', 'lwh', '0', '楼委会', 2, 0, 0, '1', '2022-05-17 17:32:34', '1', '2022-05-17 17:32:34'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495969778679810', 1526493468551626753, '老友俱乐部', 'lyjlb', '0', '老友俱乐部', 3, 0, 0, '1', '2022-05-17 17:32:55', '1', '2022-05-17 17:32:55'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496168622243842', 1526493468551626753, '其他', 'other', '0', '其他', 5, 0, 0, '1', '2022-05-17 17:33:42', '1', '2022-05-17 17:33:51'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526495766724034562', 1526493468551626753, '文化队伍', 'whdw', '0', '文化队伍', 1, 0, 0, '1', '2022-05-17 17:32:06', '1', '2022-05-17 17:32:40'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1526496054369402882', 1526493468551626753, '治安巡逻队', 'zaxld', '0', '治安巡逻队', 4, 0, 0, '1', '2022-05-17 17:33:15', '1', '2022-05-17 17:33:24'); |
|||
@ -0,0 +1,9 @@ |
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1000000000000000013', 'ic_event', '事件管理', '', '13', '0', '0', '', '2022-05-17 18:23:27', '', '2022-05-17 18:23:27'); |
|||
|
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3000000000000000004', '1000000000000000013', '网格员手持终端', '4', '0', '', '4', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3000000000000000003', '1000000000000000013', '12345', '3', '0', '', '3', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3000000000000000002', '1000000000000000013', '社区电话', '2', '0', '', '2', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3000000000000000001', '1000000000000000013', '多媒体反映', '1', '0', '', '1', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3000000000000000000', '1000000000000000013', '随手拍/随时讲', '0', '0', '', '0', '0', '0', '', '2022-05-17 18:39:18', '', '2022-05-17 18:39:18'); |
|||
|
|||
@ -0,0 +1 @@ |
|||
UPDATE `epmet_admin`.`sys_dict_type` SET `id`='1000000000000000013', `dict_type`='ic_event_source_type', `dict_name`='事件管理', `remark`='', `sort`='13', `DEL_FLAG`='0', `REVISION`='0', `CREATED_BY`='', `CREATED_TIME`='2022-05-17 18:23:27', `UPDATED_BY`='', `UPDATED_TIME`='2022-05-17 18:23:27' WHERE (`id`='1000000000000000013'); |
|||
@ -0,0 +1,64 @@ |
|||
package com.epmet.commons.tools.enums; |
|||
|
|||
/** |
|||
* 社区自组织增加分类：文化队伍、楼委会、老友俱乐部、治安巡逻队、其他 |
|||
*/ |
|||
public enum SelfOrgCategoryEnum { |
|||
// 文化队伍: #e70014
|
|||
// 楼委会: #f59701
|
|||
// 老友俱乐部: #8fc41e
|
|||
// 治安巡逻队: #00a1be
|
|||
// 其他: #0067b6
|
|||
|
|||
/** |
|||
* 环境变量枚举 |
|||
*/ |
|||
|
|||
WHDW("whdw", "文化队伍", "#e70014", 1), |
|||
LWH("lwh", "楼委会", "#f59701", 2), |
|||
LYJLB("lyjlb", "老友俱乐部", "#8fc41e", 3), |
|||
ZAXLD("zaxld", "治安巡逻队", "#00a1be", 4), |
|||
OTHER("other", "其他", "#0067b6", 5), |
|||
; |
|||
|
|||
private final String code; |
|||
private final String name; |
|||
private final String color; |
|||
private final Integer sort; |
|||
|
|||
|
|||
SelfOrgCategoryEnum(String code, String name, String color, Integer sort) { |
|||
this.code = code; |
|||
this.name = name; |
|||
this.color = color; |
|||
this.sort = sort; |
|||
} |
|||
|
|||
public static SelfOrgCategoryEnum getEnum(String code) { |
|||
SelfOrgCategoryEnum[] values = SelfOrgCategoryEnum.values(); |
|||
for (SelfOrgCategoryEnum value : values) { |
|||
if (value.getCode().equals(code)) { |
|||
return value; |
|||
} |
|||
} |
|||
return SelfOrgCategoryEnum.OTHER; |
|||
|
|||
} |
|||
|
|||
public String getCode() { |
|||
return code; |
|||
} |
|||
|
|||
public String getName() { |
|||
return name; |
|||
} |
|||
|
|||
public String getColor() { |
|||
return color; |
|||
} |
|||
|
|||
public Integer getSort() { |
|||
return sort; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,11 @@ |
|||
|
|||
ALTER TABLE `fact_agency_govern_daily` |
|||
ADD COLUMN `IC_EVENT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '19、当前组织内：来源于事件管理的项目：结案已解决数' AFTER `WORK_EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `IC_EVENT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT 0 COMMENT '20、当前组织内：来源于事件管理的项目：结案无需解决数' AFTER `IC_EVENT_RESOLVED_COUNT`; |
|||
|
|||
|
|||
ALTER TABLE `epmet_data_statistical`.`fact_grid_govern_daily` |
|||
ADD COLUMN `IC_EVENT_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '19、当前组织内：来源于事件管理的项目：结案已解决数' AFTER `WORK_EVENT_UN_RESOLVED_COUNT`, |
|||
ADD COLUMN `IC_EVENT_UN_RESOLVED_COUNT` int(11) NULL DEFAULT 0 COMMENT '20、当前组织内：来源于事件管理的项目：结案无需解决数' AFTER `IC_EVENT_RESOLVED_COUNT`; |
|||
|
|||
|
|||
@ -0,0 +1,33 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
|
|||
@Data |
|||
public class CategorySelfOrgFormDTO extends PageFormDTO implements Serializable { |
|||
/** |
|||
* 默认展示全部，此列可空 |
|||
*/ |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* token中获取 |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String customerId; |
|||
/** |
|||
* token中获取 |
|||
*/ |
|||
@NotBlank(message = "staffId不能为空",groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String staffId; |
|||
|
|||
/** |
|||
* 当前登录用户所属组织id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
} |
|||
@ -0,0 +1,27 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783668L; |
|||
|
|||
/** |
|||
* 联建单位IDs |
|||
*/ |
|||
private List<String> partyUnitIds; |
|||
|
|||
/** |
|||
* 社区自组织IDs |
|||
*/ |
|||
private List<String> communitySelfIds; |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
@Data |
|||
public class IcEventCommentToDemandFromDTO implements Serializable { |
|||
private static final long serialVersionUID = 591380873862126679L; |
|||
|
|||
//客户Id
|
|||
private String customerId; |
|||
//需求Id
|
|||
private String demandRecId; |
|||
//评价满意度【 不满意:bad、基本满意:good、非常满意:perfect 】
|
|||
private String satisfaction; |
|||
//当前操作工作人员Id
|
|||
private String staffId; |
|||
|
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.form.demand; |
|||
|
|||
import com.epmet.commons.tools.dto.form.PageFormDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
@Data |
|||
public class ServiceListFormDTO extends PageFormDTO implements Serializable { |
|||
@NotBlank(message = "type不能为空:志愿者：volunteer；社区自组织：community_org", groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String type; |
|||
|
|||
/** |
|||
* 服务方id , |
|||
* 可能是来源于多元主题分析里的社区自组织，也可能是来源于志愿者 |
|||
*/ |
|||
@NotBlank(message = "serverId不能为空", groups = PageFormDTO.AddUserInternalGroup.class) |
|||
private String serverId; |
|||
|
|||
private String customerId; |
|||
/** |
|||
* volunteer时传入此参数 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
private List<String> serverIds; |
|||
} |
|||
|
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/17 18:45 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class PartyUnitListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8059924463686783008L; |
|||
|
|||
/** |
|||
* 协办单位ID |
|||
*/ |
|||
private String assistanceUnitId; |
|||
|
|||
/** |
|||
* 协办单位名字 |
|||
*/ |
|||
private String assistanceUnitName; |
|||
|
|||
/** |
|||
* 协办单位类型，1社区自组织，2联建单位 |
|||
*/ |
|||
private String assistanceUnitType; |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 多元主体分析-社区自组织饼图 |
|||
*/ |
|||
@Data |
|||
public class SelfOrgCategoryTotalResDTO implements Serializable { |
|||
|
|||
private String categoryCode; |
|||
private String categoryName; |
|||
/** |
|||
* 当前分类下的社区自组织数量 |
|||
*/ |
|||
private Integer total; |
|||
private String color; |
|||
} |
|||
@ -0,0 +1,8 @@ |
|||
alter table ic_community_self_organization |
|||
add COLUMN CATEGORY_CODE VARCHAR(32) DEFAULT NULL COMMENT '分类，来源于字典表dictType=self_org_category;'; |
|||
|
|||
|
|||
|
|||
ALTER TABLE `ic_user_demand_rec` |
|||
ADD COLUMN `ORIGIN` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'demand' COMMENT '来源[需求录入:demand 事件管理:ic_event]' AFTER `DEMAND_USER_HOUSE_ID`, |
|||
ADD COLUMN `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '来源Id[目前只有来源事件管理的有值]' AFTER `ORIGIN`; |
|||
@ -0,0 +1,4 @@ |
|||
update ic_community_self_organization set CATEGORY_CODE='other' |
|||
where DEL_FLAG='0' |
|||
and CATEGORY_CODE is not null |
|||
and CATEGORY_CODE !=''; |
|||
Binary file not shown.
@ -0,0 +1,31 @@ |
|||
package com.epmet.task; |
|||
|
|||
import com.alibaba.fastjson.JSON; |
|||
import com.epmet.dto.form.AutoEvaluationFormDTO; |
|||
import com.epmet.feign.GovProjectOpenFeignClient; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.apache.commons.lang3.StringUtils; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/18 17:53 |
|||
* @DESC |
|||
*/ |
|||
@Slf4j |
|||
@Component("autoEvaluationTask") |
|||
public class AutoEvaluationTask implements ITask{ |
|||
|
|||
@Autowired |
|||
private GovProjectOpenFeignClient projectOpenFeignClient; |
|||
|
|||
@Override |
|||
public void run(String params) { |
|||
AutoEvaluationFormDTO formDTO = new AutoEvaluationFormDTO(); |
|||
if (StringUtils.isNotBlank(params)) { |
|||
formDTO = JSON.parseObject(params, AutoEvaluationFormDTO.class); |
|||
} |
|||
projectOpenFeignClient.autoEvaluation(formDTO); |
|||
} |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 当前组织的直属下级（下级组织+直属网格） |
|||
*/ |
|||
@Data |
|||
public class SubOrgResDTO implements Serializable { |
|||
private String orgId; |
|||
/** |
|||
* agency |
|||
* grid |
|||
*/ |
|||
private String orgType; |
|||
private String orgName; |
|||
private String pid; |
|||
private String pids; |
|||
} |
|||
@ -0,0 +1,110 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 事件附件表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventAttachmentDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件Id |
|||
*/ |
|||
private String icEventId; |
|||
|
|||
/** |
|||
* 附件名 |
|||
*/ |
|||
private String attachmentName; |
|||
|
|||
/** |
|||
* 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） |
|||
*/ |
|||
private String attachmentFormat; |
|||
|
|||
/** |
|||
* 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） |
|||
*/ |
|||
private String attachmentType; |
|||
|
|||
/** |
|||
* 附件地址 |
|||
*/ |
|||
private String attachmentUrl; |
|||
|
|||
/** |
|||
* 排序字段 |
|||
*/ |
|||
private Integer sort; |
|||
|
|||
/** |
|||
* 附件状态（审核中：auditing； |
|||
auto_passed: 自动通过； |
|||
review：结果不确定，需要人工审核； |
|||
block: 结果违规； |
|||
rejected：人工审核驳回; |
|||
approved：人工审核通过） |
|||
现在图片是同步审核的，所以图片只有auto_passed一种状态 |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 失败原因 |
|||
*/ |
|||
private String reason; |
|||
|
|||
/** |
|||
* 语音或视频时长,秒 |
|||
*/ |
|||
private Integer duration; |
|||
|
|||
/** |
|||
* 删除标记 0：未删除，1：已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,79 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 事件所属分类表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventCategoryDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件Id |
|||
*/ |
|||
private String icEventId; |
|||
|
|||
/** |
|||
* 分类id |
|||
*/ |
|||
private String categoryId; |
|||
|
|||
/** |
|||
* 分类对应的所有上级,英文逗号隔开 |
|||
*/ |
|||
private String categoryPids; |
|||
|
|||
/** |
|||
* 分类编码，分类编码+customer_id唯一 |
|||
*/ |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 删除标识 0未删除、1已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,199 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 事件管理表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键，事件id |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件所属的网格Id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 网格的所属组织 |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格的所有组织Id |
|||
*/ |
|||
private String gridPids; |
|||
|
|||
/** |
|||
* 报事的人【居民端/pc端居民Id】可为空 |
|||
*/ |
|||
private String reportUserId; |
|||
|
|||
/** |
|||
* 报事人姓名 |
|||
*/ |
|||
private String name; |
|||
|
|||
/** |
|||
* 手机号 |
|||
*/ |
|||
private String mobile; |
|||
|
|||
/** |
|||
* 身份证号 |
|||
*/ |
|||
private String idCard; |
|||
|
|||
/** |
|||
* 反映渠道【字典表】 |
|||
*/ |
|||
private String sourceType; |
|||
|
|||
/** |
|||
* 发生时间 |
|||
*/ |
|||
private Date happenTime; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 处理中：processing；已办结：closed_case |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 办结时间 |
|||
*/ |
|||
private Date closeCaseTime; |
|||
|
|||
/** |
|||
* 0:已回复 1:已转项目 1:已转需求 |
|||
*/ |
|||
private String operationType; |
|||
|
|||
/** |
|||
* 项目、需求ID |
|||
*/ |
|||
private String operationId; |
|||
|
|||
/** |
|||
* 事件是否被阅读过;1已读；针对报事人待处理列表 |
|||
*/ |
|||
private Integer readFlag; |
|||
|
|||
/** |
|||
* 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; |
|||
*/ |
|||
private Integer redDot; |
|||
|
|||
/** |
|||
* 最近一次操作时间（回复、立项、转需求、办结更新此列） |
|||
*/ |
|||
private Date latestOperatedTime; |
|||
|
|||
/** |
|||
* 是否解决：已解决 resolved，未解决 un_solved |
|||
*/ |
|||
private String resolveStatus; |
|||
|
|||
/** |
|||
* 结案说明 |
|||
*/ |
|||
private String closeRemark; |
|||
|
|||
/** |
|||
* 评论人 |
|||
*/ |
|||
private String commentUserId; |
|||
|
|||
/** |
|||
* 评论内容 |
|||
*/ |
|||
private String satisfaction; |
|||
|
|||
/** |
|||
* 评论时间 |
|||
*/ |
|||
private Date commentTime; |
|||
|
|||
/** |
|||
* 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； |
|||
auto_passed: 自动通过； |
|||
review：结果不确定，需要人工审核； |
|||
block: 结果违规； |
|||
rejected：人工审核驳回; |
|||
approved：人工审核通过） |
|||
*/ |
|||
private String auditStatus; |
|||
|
|||
/** |
|||
* 审核理由 |
|||
*/ |
|||
private String auditReason; |
|||
|
|||
/** |
|||
* 删除标识:0.未删除 1.已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 展示红点：visible；隐藏：invisible；人大回复、工作人员回复/立项更新为visible; 插入数据默认不展示 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,111 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 事件操作日志表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventOperationLogDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件id |
|||
*/ |
|||
private String icEventId; |
|||
|
|||
/** |
|||
* 操作用户Id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 操作用户类型【居民端用户:resi_user；工作人员:staff；】 |
|||
*/ |
|||
private String userIdentity; |
|||
|
|||
/** |
|||
* 1、发布事件：add |
|||
* 2、复：reply； |
|||
* 3、立项：shift_project； |
|||
* 4、转需求：shift_demand |
|||
* 5、办结：close_case; |
|||
* 6、需求办结：close_demand |
|||
*/ |
|||
private String actionCode; |
|||
|
|||
/** |
|||
* 1、发布事件：publish； |
|||
* 2、撤回事件：recall； |
|||
* 3、复：reply； |
|||
* 4、立项：shift_project； |
|||
* 5、转需求: shift_demand； |
|||
* 6、办结：close_case; |
|||
* 7、需求办结：close_demand; |
|||
* 8、选择是否已解决：choose_resolve; |
|||
* 9、首次查看阅读事件：read_first：人大代表未读=>已读；工作人员待处理=>处理中； |
|||
*/ |
|||
private String actionDesc; |
|||
|
|||
/** |
|||
* 操作时间 |
|||
*/ |
|||
private Date operateTime; |
|||
|
|||
/** |
|||
* 服务方【事件被转需求，需求在办结时的服务方名称】 |
|||
*/ |
|||
private String serviceParty; |
|||
/** |
|||
* 实际服务时间【事件被转需求，需求在办结时填写的实际服务时间 xx至xx】 |
|||
*/ |
|||
private String actualServiceTime; |
|||
|
|||
/** |
|||
* 删除标识 1删除；0未删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 事件回复表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventReplyDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件Id |
|||
*/ |
|||
private String icEventId; |
|||
|
|||
/** |
|||
* 回复人用户Id[工作人员ID] |
|||
*/ |
|||
private String fromUserId; |
|||
|
|||
/** |
|||
* 内容 |
|||
*/ |
|||
private String content; |
|||
|
|||
/** |
|||
* 报事人：组织-人名 |
|||
*/ |
|||
private String userShowName; |
|||
|
|||
/** |
|||
* 删除标记 0：未删除，1：已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,87 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import lombok.Data; |
|||
|
|||
|
|||
/** |
|||
* 事件附件安全校验任务表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2022-05-17 |
|||
*/ |
|||
@Data |
|||
public class IcEventScanTaskDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 唯一标识 |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件Id |
|||
*/ |
|||
private String icEventId; |
|||
|
|||
/** |
|||
* 事件附件表主键，对应dataId |
|||
*/ |
|||
private String icEventAttachmentId; |
|||
|
|||
/** |
|||
* 阿里云审核任务Id |
|||
*/ |
|||
private String taskId; |
|||
|
|||
/** |
|||
* 审核状态【auditing: 审核中； |
|||
auto_passed: 自动通过； |
|||
review：结果不确定，需要人工审核； |
|||
block: 结果违规；】 |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 附件类型（视频 - video、 语音 - voice 文件 - doc） |
|||
*/ |
|||
private String attachmentType; |
|||
|
|||
/** |
|||
* 删除标识：0.未删除 1.已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 操作人，API审核结果，存储为SCAN_USER或者APP_USER |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.FileCommonDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/19 11:14 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class AddEventFromResiFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -2238068041964629750L; |
|||
|
|||
public interface AddEventFromResiForm{} |
|||
|
|||
private String content; |
|||
private String address; |
|||
|
|||
@NotBlank(message = "gridId不能为空",groups = AddEventFromResiForm.class) |
|||
private String gridId; |
|||
|
|||
|
|||
/** |
|||
* 图片附件列表 |
|||
*/ |
|||
private List<FileCommonDTO> attachmentList; |
|||
|
|||
|
|||
/** |
|||
* 语音附件列表 |
|||
*/ |
|||
private List<FileCommonDTO> voiceList; |
|||
|
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
private String customerId; |
|||
|
|||
private String userId; |
|||
|
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2022/5/18 16:33 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class AutoEvaluationFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -8871508029242477452L; |
|||
|
|||
private String customerId; |
|||
private String dateId; |
|||
private String startDate; |
|||
private String endDate; |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
|
|||
/** |
|||
* 需求完成/项目结案时 修改事件数据 |
|||
*/ |
|||
@Data |
|||
public class ColseProjectOrDemandFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -590440160577071133L; |
|||
//事件管理Id
|
|||
private String icEventId; |
|||
//类型 需求：demand 项目:project
|
|||
private String type; |
|||
//服务方【事件被转需求，需求在办结时的服务方名称】
|
|||
private String serviceParty; |
|||
//实际服务时间【事件被转需求，需求在办结时填写的实际服务时间 xx至xx】
|
|||
private String actualServiceTime; |
|||
|
|||
private String customerId; |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,67 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 事件处理分析通用 |
|||
*/ |
|||
@Data |
|||
public class EventProcessAnalysisCommonFormDTO { |
|||
|
|||
/** |
|||
* 处理状态比例查询 |
|||
*/ |
|||
public interface ProcessStatusRatioQuery {} |
|||
|
|||
/** |
|||
* 月度新增 |
|||
*/ |
|||
public interface MonthlyIncrementAnalysis {} |
|||
|
|||
/** |
|||
* 同类事件列表 |
|||
*/ |
|||
public interface SameCategoryEvents {} |
|||
|
|||
/** |
|||
* 要查询的组织ID |
|||
*/ |
|||
@NotBlank(message = "组织ID为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class, SameCategoryEvents.class }) |
|||
private String orgId; |
|||
|
|||
/** |
|||
* 组织类型。grid,agency |
|||
*/ |
|||
@NotBlank(message = "组织类型为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class, SameCategoryEvents.class }) |
|||
private String orgType; |
|||
|
|||
/** |
|||
* 查询起始时间 yyyy-MM-dd |
|||
*/ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@NotNull(message = "查询时间为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class }) |
|||
private Date queryStartTime; |
|||
|
|||
/** |
|||
* 查询截止时间 yyyy-MM-dd |
|||
*/ |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
@NotNull(message = "查询时间为必填项", groups = { ProcessStatusRatioQuery.class, MonthlyIncrementAnalysis.class }) |
|||
private Date queryEndTime; |
|||
|
|||
@NotBlank(message = "分类Id不能为空", groups = { SameCategoryEvents.class }) |
|||
private String categoryPids; |
|||
|
|||
private Integer pageNo = 1; |
|||
|
|||
private Integer pageSize = 20; |
|||
|
|||
} |
|||
@ -0,0 +1,174 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
import org.springframework.format.annotation.DateTimeFormat; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 居民端-上报需求，或者修改需求 |
|||
*/ |
|||
@Data |
|||
public class IcDemandFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1589287946950749226L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
public interface UpdateInternalGroup { |
|||
} |
|||
|
|||
@NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class) |
|||
private String icEventId; |
|||
|
|||
@NotBlank(message = "需求id不能为空",groups = UpdateInternalGroup.class) |
|||
private String demandRecId; |
|||
|
|||
private String customerId; |
|||
private String currentUserId; |
|||
|
|||
|
|||
/** |
|||
* 网格id |
|||
*/ |
|||
@NotBlank(message = "所属网格不能为空",groups = AddUserShowGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 组织id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 网格的所有上级id |
|||
*/ |
|||
private String gridPids; |
|||
|
|||
|
|||
|
|||
|
|||
/** |
|||
* 二级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "需求类别不能为空",groups = AddUserShowGroup.class) |
|||
private String categoryCode; |
|||
|
|||
/** |
|||
* 父级需求分类编码 |
|||
*/ |
|||
@NotBlank(message = "需求类别不能为空",groups = AddUserShowGroup.class) |
|||
private String parentCode; |
|||
|
|||
/** |
|||
* 需求内容1000字 |
|||
*/ |
|||
@NotBlank(message = "需求内容不能为空",groups = AddUserShowGroup.class) |
|||
@Length(max = 1000,message = "需求内容至多输入1000字",groups = AddUserShowGroup.class) |
|||
private String content; |
|||
|
|||
/** |
|||
* 社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help |
|||
*/ |
|||
@NotBlank(message = "上报类型不能为空",groups = AddUserShowGroup.class) |
|||
private String reportType; |
|||
|
|||
/** |
|||
* 上报人姓名 |
|||
*/ |
|||
@NotBlank(message = "上报人不能为空",groups = AddUserShowGroup.class) |
|||
private String reportUserName; |
|||
|
|||
/** |
|||
* 上报人联系方式。自身上报时存储注册居民的手机号 |
|||
*/ |
|||
@NotBlank(message = "上报人联系方式不能为空",groups = AddUserShowGroup.class) |
|||
private String reportUserMobile; |
|||
|
|||
/** |
|||
* 上报时间 |
|||
*/ |
|||
@NotNull(message = "上报时间不能为空",groups = AddUserShowGroup.class) |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private Date reportTime; |
|||
|
|||
/** |
|||
* 需求人：user.id或者ic_resi_user.id |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserId; |
|||
|
|||
/** |
|||
* 需求人姓名 |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserName; |
|||
|
|||
/** |
|||
* 需求人联系电话 |
|||
*/ |
|||
@NotNull(message = "需求人不能为空",groups = AddUserShowGroup.class) |
|||
private String demandUserMobile; |
|||
|
|||
/** |
|||
* 希望服务时间 |
|||
*/ |
|||
@NotNull(message = "服务时间不能为空",groups = AddUserShowGroup.class) |
|||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") |
|||
private Date wantServiceTime; |
|||
|
|||
/** |
|||
* 服务地点，工作端指派默认居民居住房屋地址，居民端地图选择 |
|||
*/ |
|||
private String serviceLocation; |
|||
|
|||
/** |
|||
* 门牌号详细地址 |
|||
*/ |
|||
private String locationDetail; |
|||
|
|||
/** |
|||
* 经度,需求人是ic的居民时，取所住楼栋的中心点位 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 纬度,需求人是ic的居民时，取所住楼栋的中心点位 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 来源[需求录入:demand 事件管理:ic_event] |
|||
*/ |
|||
private String origin; |
|||
/** |
|||
* 来源Id[目前只有来源事件管理的有值] |
|||
*/ |
|||
private String originId; |
|||
/** |
|||
* 服务方类型：志愿者：volunteer；社会组织：social_org；社区自组织：community_org；区域党建单位：party_unit； |
|||
*/ |
|||
private String serviceType; |
|||
/** |
|||
* 志愿者：居民端爱心互助的志愿者userId； |
|||
*/ |
|||
private String serverId; |
|||
/** |
|||
* 服务方名称 |
|||
*/ |
|||
private String serverName; |
|||
/** |
|||
* 二级分类Id |
|||
*/ |
|||
@NotBlank(message = "分类id不能为空",groups = AddUserInternalGroup.class) |
|||
private String categoryId; |
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue