forked from luyan/epmet-cloud-lingshan
Browse Source
# Conflicts: # epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml # epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xmlmaster
jianjun
4 years ago
158 changed files with 5872 additions and 907 deletions
@ -0,0 +1,28 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 人大代表个人中心，是否显示@me |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 15:01 |
|||
*/ |
|||
@Data |
|||
public class UserEventLogoResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 3232361347890014097L; |
|||
/** |
|||
* true:人大代表；false：不是人大代表；此列用来判断是否显示@我 |
|||
*/ |
|||
private Boolean isNpc; |
|||
/** |
|||
* 展示红点：true；隐藏：false |
|||
*/ |
|||
private Boolean redDot; |
|||
public UserEventLogoResultDTO(){ |
|||
this.isNpc=false; |
|||
this.redDot=false; |
|||
} |
|||
} |
|||
@ -0,0 +1,85 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dto.project; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 居民报事表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Data |
|||
public class ResiEventDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件id |
|||
*/ |
|||
private String resiEventId; |
|||
|
|||
/** |
|||
* 报给？： |
|||
网格：grid； |
|||
社区：community； |
|||
乡（镇、街道）级:street； |
|||
区县级: district； |
|||
市级: city； |
|||
省级:province。 |
|||
*/ |
|||
private String orgType; |
|||
|
|||
/** |
|||
* 报给的组织或者网格id |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* org_id的上级组织id，org_id是跟组织，此列为0 |
|||
*/ |
|||
private String orgPid; |
|||
|
|||
/** |
|||
* org_id的所有上级组织id，org_id是跟组织，此列为0 |
|||
*/ |
|||
private String orgPids; |
|||
|
|||
/** |
|||
* 含义：已读read，未读：un_read；组织下的工作人员从待处理=>处理中，点击查看详情前更新为已读； |
|||
*/ |
|||
private String orgRead; |
|||
|
|||
/** |
|||
* (1)含义：1:展示红点；0：不展示；(2)注意：发布事件插入数据时为1，(3)何时更新？：人大代表回复or报事人回复or工作人员回复、立项、办结更新为1； |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
private String projectId; |
|||
|
|||
private String createdBy; |
|||
|
|||
} |
|||
@ -0,0 +1,3 @@ |
|||
ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` |
|||
MODIFY COLUMN `ORIGIN` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源 来源：议题issue 组织agency，事件resi_event' AFTER `PIDS`, |
|||
MODIFY COLUMN `ORIGIN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目来源ID:议题id ;or组织id，事件ID' AFTER `ORIGIN`; |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/5 5:23 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventTitleOrgResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -517506506008916648L; |
|||
|
|||
private String agencyId; |
|||
private String gridId; |
|||
private String gridName; |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/4 5:48 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class OrgNameByTypeResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -6544341694748437312L; |
|||
|
|||
private String orgId; |
|||
|
|||
private String orgType; |
|||
|
|||
private String orgName; |
|||
} |
|||
@ -0,0 +1,66 @@ |
|||
package com.epmet.enums; |
|||
|
|||
import lombok.extern.slf4j.Slf4j; |
|||
|
|||
import java.util.Optional; |
|||
|
|||
/** |
|||
* @Description 入职级别枚举 |
|||
* @author wxz |
|||
* @date 2021.08.03 14:29:01 |
|||
*/ |
|||
@Slf4j |
|||
public enum OrgLevelEnums { |
|||
|
|||
GRID("grid", "网格"), |
|||
COMMUNITY("community", "社区"), |
|||
STREET("street", "街道"), |
|||
DISTRICT("district", "区"), |
|||
CITY("city", "市"), |
|||
PROVINCE("province", "省"), |
|||
|
|||
DEPARTMENT("department", "部门"), |
|||
; |
|||
|
|||
private String level; |
|||
private String levelName; |
|||
|
|||
OrgLevelEnums(String level, String levelName) { |
|||
this.level = level; |
|||
this.levelName = levelName; |
|||
} |
|||
|
|||
/** |
|||
* @Description 级别枚举对象 |
|||
* @return |
|||
* @author wxz |
|||
* @date 2021.08.03 14:46 |
|||
*/ |
|||
public static OrgLevelEnums getLevelObject(String level) { |
|||
for (OrgLevelEnums l :OrgLevelEnums.values()) { |
|||
if (l.getLevel().equals(level)) { |
|||
return l; |
|||
} |
|||
} |
|||
return null; |
|||
} |
|||
|
|||
/** |
|||
* @Description 级别中文名称 |
|||
* @return |
|||
* @author wxz |
|||
* @date 2021.08.03 14:47 |
|||
*/ |
|||
public static String getLevelName(String level) { |
|||
OrgLevelEnums levelObject = getLevelObject(level); |
|||
return levelObject == null ? null : levelObject.getLevelName(); |
|||
} |
|||
|
|||
public String getLevel() { |
|||
return level; |
|||
} |
|||
|
|||
public String getLevelName() { |
|||
return levelName; |
|||
} |
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
package com.epmet.dto; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 1:38 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventProjectInfoDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5622220354099001615L; |
|||
|
|||
/** |
|||
* 项目ID |
|||
*/ |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 操作人【xxx社区-张三】 |
|||
*/ |
|||
private String operationName; |
|||
|
|||
/** |
|||
* 操作时间 |
|||
*/ |
|||
private String operationTime; |
|||
|
|||
@JsonIgnore |
|||
private String userId; |
|||
|
|||
/** |
|||
* 报事说明 |
|||
*/ |
|||
private String projectDeclare; |
|||
|
|||
public EventProjectInfoDTO() { |
|||
this.projectId = ""; |
|||
this.operationName = ""; |
|||
this.operationTime = ""; |
|||
this.projectDeclare = ""; |
|||
} |
|||
} |
|||
@ -0,0 +1,42 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.dto.result.ResiEventIdDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 选择已解决，未解决？？ |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 13:53 |
|||
*/ |
|||
@Data |
|||
public class ChooseResolveFormDTO extends ResiEventIdDTO implements Serializable { |
|||
private static final long serialVersionUID = 7888566055415227282L; |
|||
|
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
/** |
|||
* 是否解决：已解决 resolved，未解决 un_solved |
|||
*/ |
|||
@NotBlank(message = "resolveStatus不能为空",groups = AddUserInternalGroup.class) |
|||
private String resolveStatus; |
|||
|
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 报事-办结 入参DTO |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/5 10:44 |
|||
*/ |
|||
@Data |
|||
public class CloseResiEventFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -3621650590714057648L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
@NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class) |
|||
private String eventId; |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 1:27 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventDetailFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -297495947153154171L; |
|||
|
|||
public interface EventDetailForm{} |
|||
|
|||
@NotBlank(message = "报事ID不能为空",groups = EventDetailForm.class) |
|||
private String eventId; |
|||
|
|||
private String orgId; |
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 10:43 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 5882062169112022561L; |
|||
|
|||
public interface EventListForm{} |
|||
|
|||
/** |
|||
* 报事列表类型【处理中：processed 待处理：undisposed 已办结：transferred】 |
|||
*/ |
|||
@NotBlank(message = "报事列表类型不能为空",groups = EventListForm.class) |
|||
private String eventType; |
|||
|
|||
@NotBlank(message = "",groups = EventListForm.class) |
|||
private String orgId; |
|||
|
|||
private Integer pageNo; |
|||
private Integer pageSize; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 事件立项，入参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/5 16:15 |
|||
*/ |
|||
@Data |
|||
public class EventShiftProjectDTO implements Serializable { |
|||
private static final long serialVersionUID = 5519721673862754305L; |
|||
//转项目的人
|
|||
private String userId; |
|||
private String eventId; |
|||
private String projectId; |
|||
private Date shiftProjectTime; |
|||
private String userAgencyId; |
|||
} |
|||
@ -0,0 +1,97 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.Valid; |
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 事件-里项目 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/5 15:19 |
|||
*/ |
|||
@Data |
|||
public class EventToProjectFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 3392008990676159012L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
public interface ApprovalCategory extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
/** |
|||
* 事件id |
|||
*/ |
|||
@NotBlank(message = "事件id不能为空", groups = AddUserInternalGroup.class) |
|||
private String eventId; |
|||
|
|||
/** |
|||
* 项目方案 1000 |
|||
*/ |
|||
@Length(min = 1, max = 1000, message = "项目方案1000字", groups = {ApprovalCategory.class}) |
|||
private String publicReply; |
|||
/** |
|||
* 内部备注 1000 |
|||
* 21.08.09 直接立项的内部备注是必填的，然后议题转项目和我要直报转项目的都是非必填的 |
|||
*/ |
|||
//@Length(min = 1, max = 1000, message = "内部备注1000字", groups = {ApprovalCategory.class})
|
|||
private String internalRemark; |
|||
|
|||
/** |
|||
* 吹哨勾选的工作人员信息集合,不可为空 |
|||
*/ |
|||
@Valid |
|||
private List<TickStaffFormDTO> staffList; |
|||
/** |
|||
* 项目所选分类集合，不可为空 |
|||
*/ |
|||
@Valid |
|||
private List<CategoryOrTagFormDTO> categoryList; |
|||
/** |
|||
* 项目所选标签集合 |
|||
*/ |
|||
private List<CategoryOrTagFormDTO> tagList; |
|||
|
|||
@Length(min = 1, max = 20, message = "项目标题不能超过20位", groups = {ApprovalCategory.class}) |
|||
private String title; |
|||
|
|||
/** |
|||
* 公开答复对应文件集合 |
|||
*/ |
|||
private List<FileDTO> publicFile; |
|||
/** |
|||
* 内部备注对应文件集合 |
|||
*/ |
|||
private List<FileDTO> internalFile; |
|||
|
|||
//定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置]
|
|||
private String locateAddress; |
|||
//定位经度
|
|||
private String locateLongitude; |
|||
//定位纬度
|
|||
private String locateDimension; |
|||
|
|||
|
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
|
|||
private String app; |
|||
private String client; |
|||
} |
|||
@ -0,0 +1,41 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 被艾特的人 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 15:51 |
|||
*/ |
|||
@Data |
|||
public class MentionUserFormDTO implements Serializable { |
|||
|
|||
/** |
|||
* 人大代表用户id |
|||
*/ |
|||
private String userId; |
|||
|
|||
/** |
|||
* 人大代表注册网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 人大代表注册网格所属社区id |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 注册网格的所有上级 |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 人大代表姓名 |
|||
*/ |
|||
private String userShowName; |
|||
|
|||
} |
|||
@ -0,0 +1,42 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 我的报事列表查询 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 14:07 |
|||
*/ |
|||
@Data |
|||
public class MyReportedFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 8426911903236849796L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
/** |
|||
* 未处理:un_read；处理中：processing；已办结：closed_case |
|||
*/ |
|||
@NotBlank(message = "statusCondition不能为空",groups = AddUserInternalGroup.class) |
|||
private String statusCondition; |
|||
|
|||
private Integer pageNo; |
|||
private Integer pageSize; |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.dto.result.ResiEventIdDTO; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 撤回事件入参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 11:28 |
|||
*/ |
|||
@Data |
|||
public class ReCallEventFormDTO extends ResiEventIdDTO implements Serializable { |
|||
private static final long serialVersionUID = 2127663703852717437L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 回复通用入参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/4 14:16 |
|||
*/ |
|||
@Data |
|||
public class ReplyFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 1653042839040178697L; |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
@NotBlank(message = "事件id不能为空",groups = AddUserInternalGroup.class) |
|||
private String resiEventId; |
|||
@Length(min = 1, max = 200, message = "请填写回复内容,最多输入200字", groups = AddUserShowGroup.class) |
|||
private String content; |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
} |
|||
@ -0,0 +1,26 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 11:07 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class ReplyListFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 3875624725235229558L; |
|||
|
|||
public interface ReplyListForm{} |
|||
|
|||
@NotBlank(message = "报事ID不能为空",groups = ReplyListForm.class) |
|||
private String resiEventId; |
|||
|
|||
@NotBlank(message = "当前用户id不能为空",groups = ReplyListForm.class) |
|||
private String currentUserId; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 报给谁？ |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 15:51 |
|||
*/ |
|||
@Data |
|||
public class ReportOrgFormDTO implements Serializable { |
|||
/** |
|||
* 报给？： 网格：grid； 社区：community； 乡（镇、街道）级:street； 区县级: district； 市级: city； 省级:province。 |
|||
*/ |
|||
private String orgLevel; |
|||
|
|||
/** |
|||
* 报给的组织或者网格id |
|||
*/ |
|||
private String orgId; |
|||
|
|||
/** |
|||
* org_id的上级组织id，org_id是跟组织，此列为0 |
|||
*/ |
|||
private String orgPid; |
|||
|
|||
/** |
|||
* org_id的所有上级组织id，org_id是跟组织，此列为0 |
|||
*/ |
|||
private String orgPids; |
|||
} |
|||
@ -0,0 +1,85 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.dto.form.FileCommonDTO; |
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
import org.hibernate.validator.constraints.Length; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotEmpty; |
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 我要报事-提交（尹） |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 10:46 |
|||
*/ |
|||
@Data |
|||
public class ResiEventFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -778643059131036832L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
public interface AddUserShowGroup extends CustomerClientShowGroup { |
|||
} |
|||
|
|||
/** |
|||
* 用户所在网格id |
|||
*/ |
|||
@NotBlank(message = "不能为空",groups = AddUserInternalGroup.class) |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 事件内容，最多1000 |
|||
*/ |
|||
@Length(min = 1, max = 1000, message = "请填写内容,最多输入1000字", groups = AddUserShowGroup.class) |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 地址 |
|||
*/ |
|||
@NotBlank(message = "地址不能为空",groups = AddUserShowGroup.class) |
|||
private String address; |
|||
|
|||
/** |
|||
* 附件列表 |
|||
*/ |
|||
private List<FileCommonDTO> attachmentList; |
|||
/** |
|||
* @的人 |
|||
*/ |
|||
private List<MentionUserFormDTO> npcUserList; |
|||
|
|||
/** |
|||
* 报给谁？ |
|||
*/ |
|||
@NotEmpty(message = "不能为空",groups = AddUserInternalGroup.class) |
|||
private List<ReportOrgFormDTO> orgList; |
|||
|
|||
|
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空",groups =AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,43 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; |
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 10:55 上午 |
|||
* @DESC 报事-首次查看事件-两端通用 |
|||
*/ |
|||
@Data |
|||
public class UpdateViewTimeFormDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 7104400078458366322L; |
|||
public interface AddUserInternalGroup { |
|||
} |
|||
public interface GovInternalGroup { |
|||
} |
|||
|
|||
// 居民端：resi_user；工作端：staff
|
|||
@NotBlank(message = "viewType不能为空", groups = AddUserInternalGroup.class) |
|||
private String viewType; |
|||
@NotBlank(message = "eventId不能为空", groups = AddUserInternalGroup.class) |
|||
private String eventId; |
|||
@NotBlank(message = "orgId不能为空", groups = GovInternalGroup.class) |
|||
private String orgId; |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,44 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import javax.validation.constraints.NotNull; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 我要报事-人大代表未读/已读列表入参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/4 9:34 |
|||
*/ |
|||
@Data |
|||
public class UserMentionFormDTO implements Serializable { |
|||
private static final long serialVersionUID = 7548058964554418080L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
/** |
|||
* 未读：un_read;已读：read； |
|||
*/ |
|||
@NotBlank(message = "readFlag不能为空", groups = AddUserInternalGroup.class) |
|||
private String readFlag; |
|||
@NotNull(message = "pageNo不能为空", groups = AddUserInternalGroup.class) |
|||
private Integer pageNo; |
|||
@NotNull(message = "pageSize不能为空", groups = AddUserInternalGroup.class) |
|||
private Integer pageSize; |
|||
|
|||
//以下参数从token中获取
|
|||
/** |
|||
* 当前用户id |
|||
*/ |
|||
@NotBlank(message = "userId不能为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
|
|||
/** |
|||
* 当前客户id |
|||
*/ |
|||
@NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,108 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.dto.EventProjectInfoDTO; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 1:30 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventDetailResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 3905105043326445613L; |
|||
|
|||
/** |
|||
* 报事时间 |
|||
*/ |
|||
private String eventTime; |
|||
|
|||
/** |
|||
* 报事内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 报事地址 |
|||
*/ |
|||
private String eventAddress; |
|||
|
|||
/** |
|||
* 所属网格【xx社区-xx网格】 |
|||
*/ |
|||
private String gridName; |
|||
|
|||
@JsonIgnore |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 是否办结【是：true，否：false】 |
|||
*/ |
|||
private Boolean isClosed; |
|||
|
|||
/** |
|||
* 是否解决【是：true，否：false】 |
|||
*/ |
|||
private Boolean isResolve; |
|||
|
|||
/** |
|||
* 是否可以撤回【true：是，false：否】 |
|||
*/ |
|||
private Boolean isRollback; |
|||
|
|||
/** |
|||
* 报事图片 |
|||
*/ |
|||
private List<String> eventImgs; |
|||
|
|||
/** |
|||
* 报事提到的人 |
|||
*/ |
|||
private List<String> eventPerson; |
|||
|
|||
/** |
|||
* 被提到的组织 |
|||
*/ |
|||
private List<String> eventOrg; |
|||
|
|||
/** |
|||
* 报事人名字 |
|||
*/ |
|||
private String eventPeopleName; |
|||
|
|||
@JsonIgnore |
|||
private String eventUserId; |
|||
|
|||
/** |
|||
* 项目信息 |
|||
*/ |
|||
private EventProjectInfoDTO projectInfo; |
|||
|
|||
@JsonIgnore |
|||
private List<String> orgNameList; |
|||
|
|||
@JsonIgnore |
|||
private String projectId; |
|||
|
|||
@JsonIgnore |
|||
private Boolean isProject; |
|||
|
|||
public EventDetailResultDTO() { |
|||
this.eventTime = ""; |
|||
this.eventContent = ""; |
|||
this.eventAddress = ""; |
|||
this.gridName = ""; |
|||
this.isClosed = false; |
|||
this.isResolve = false; |
|||
this.isRollback = false; |
|||
this.eventImgs = new ArrayList<>(); |
|||
this.eventPerson = new ArrayList<>(); |
|||
this.projectInfo = new EventProjectInfoDTO(); |
|||
} |
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 10:41 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class EventListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -8550265282744924930L; |
|||
|
|||
/** |
|||
* 报事标题 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 报事时间 |
|||
*/ |
|||
private String eventTime; |
|||
|
|||
/** |
|||
* 报事ID |
|||
*/ |
|||
private String eventId; |
|||
|
|||
/** |
|||
* 是否立项【true：是，false：否】 |
|||
*/ |
|||
private Boolean isProject; |
|||
|
|||
/** |
|||
* 红点显示【true：显示，false：不显示】 |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
/** |
|||
* 报事图片 |
|||
*/ |
|||
private List<String> eventImgs; |
|||
|
|||
} |
|||
@ -0,0 +1,17 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 描述一下 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/5 15:36 |
|||
*/ |
|||
@Data |
|||
public class EventToProjectResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -7544325891712303124L; |
|||
private String projectId; |
|||
} |
|||
@ -0,0 +1,65 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 报事列表 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 14:11 |
|||
*/ |
|||
@Data |
|||
public class MyReportedResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -7372245830000262134L; |
|||
|
|||
/** |
|||
* 事件id |
|||
*/ |
|||
private String resiEventId; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 图片列表，可为空 |
|||
*/ |
|||
private List<String> imgList; |
|||
|
|||
/** |
|||
* true展示；false不展示 |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
/** |
|||
* 处理中：processing；已办结：closed_case |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* true:已转项目；false：未立项 |
|||
*/ |
|||
private Boolean shiftProject; |
|||
|
|||
/** |
|||
* 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|||
private Date showTime; |
|||
|
|||
/** |
|||
* true:显示回复；false：不显示回复按钮 |
|||
*/ |
|||
private String replyButtonFlag; |
|||
|
|||
/** |
|||
* 事件是否被阅读过;1已读；针对报事人待处理列表 |
|||
*/ |
|||
private Boolean readFlag; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/5 9:51 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class NewEventsResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 2151884734349908080L; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 事件时间 |
|||
*/ |
|||
private String eventTime; |
|||
|
|||
/** |
|||
* 事件图片 |
|||
*/ |
|||
private List<String> eventImgs; |
|||
|
|||
private String eventId; |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/4 5:48 下午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class OrgNameByTypeResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = -6544341694748437312L; |
|||
|
|||
private String orgId; |
|||
|
|||
private String orgType; |
|||
|
|||
private String orgName; |
|||
} |
|||
@ -0,0 +1,38 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import com.fasterxml.jackson.annotation.JsonIgnore; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 11:07 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class ReplyListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 4875335642497226847L; |
|||
|
|||
/** |
|||
* 回复人的昵称，比如：南宁路社区,人大代表-李四,山东路-尹女士 |
|||
* */ |
|||
private String replyName; |
|||
|
|||
/** |
|||
* 回复时间 |
|||
* */ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone="GMT+8") |
|||
private Date replyTime; |
|||
|
|||
/** |
|||
* 回复的内容 |
|||
* */ |
|||
private String replyContent; |
|||
|
|||
@JsonIgnore |
|||
private String replyUserId; |
|||
} |
|||
@ -0,0 +1,24 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 事件id |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 10:48 |
|||
*/ |
|||
@Data |
|||
public class ResiEventIdDTO implements Serializable { |
|||
private static final long serialVersionUID = 1553798655658549134L; |
|||
public interface ResiEventIdGroup { |
|||
} |
|||
/** |
|||
* 居民端报的事件id |
|||
*/ |
|||
@NotBlank(message = "事件id不能为空",groups = ResiEventIdGroup.class) |
|||
private String resiEventId; |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 描述一下 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/6 13:54 |
|||
*/ |
|||
@Data |
|||
public class ResiEventManageRedDotRes implements Serializable { |
|||
/** |
|||
* 待处理（未读）的事件数 |
|||
* */ |
|||
private Integer unReadCount; |
|||
|
|||
/** |
|||
* 已经度过，但是又有新的回复、立项、结案 |
|||
* */ |
|||
private Integer redDotCount; |
|||
|
|||
/** |
|||
* 总数 |
|||
* */ |
|||
private Integer totalCount; |
|||
|
|||
} |
|||
@ -0,0 +1,61 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.fasterxml.jackson.annotation.JsonFormat; |
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 我要报事-人大代表未读/已读列表返参 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/4 9:44 |
|||
*/ |
|||
@Data |
|||
public class UserMentionResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 8171079006237395425L; |
|||
/** |
|||
* 事件id |
|||
*/ |
|||
private String resiEventId; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 图片列表，可为空 |
|||
*/ |
|||
private List<String> imgList; |
|||
|
|||
/** |
|||
* true展示；false不展示 |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
/** |
|||
* 处理中：processing；已办结：closed_case |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* true:已转项目；false：未立项 |
|||
*/ |
|||
private Boolean shiftProject; |
|||
|
|||
/** |
|||
* 列表显示时间用此列：yyyy-MM-dd HH:mm:ss；处理中：上报事件时间，处理中：最新一次处理事件；已办结：办结时间 |
|||
*/ |
|||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") |
|||
private Date showTime; |
|||
|
|||
/** |
|||
* true:显示回复；false：不显示回复按钮 |
|||
*/ |
|||
private String replyButtonFlag; |
|||
|
|||
} |
|||
@ -0,0 +1,52 @@ |
|||
package com.epmet.constant; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 2:45 下午 |
|||
* @DESC |
|||
*/ |
|||
public interface EventConstant { |
|||
|
|||
/** |
|||
* 【处理中：processed 待处理：undisposed 已办结：transferred】 |
|||
*/ |
|||
String EVENT_PROCESSED = "processed"; |
|||
String EVENT_UN_DISPOSED = "undisposed"; |
|||
String EVENT_TRANSFERRED = "transferred"; |
|||
|
|||
|
|||
/** |
|||
* 事件状态resi_event.status:处理中：processing；已办结：closed_case |
|||
*/ |
|||
String EVENT_STATUS_PROCESSING="processing"; |
|||
String EVENT_STATUS_CLOSED_CASE="closed_case"; |
|||
|
|||
String READ="read"; |
|||
String UN_READ="un_read"; |
|||
|
|||
/** |
|||
* 事件@人员表，用户身份 |
|||
* resi_event_mention.user_type |
|||
*/ |
|||
String NPC_USER="npc_user"; |
|||
|
|||
/** |
|||
* 操作日志表用户来源：resi_event_operation_log.userIdentity |
|||
* 居民端用户:resi_user；工作人员:staff；报事人:report_user |
|||
*/ |
|||
String RESI_USER="resi_user"; |
|||
String STAFF="staff"; |
|||
String REPORT_USER="report_user"; |
|||
|
|||
/** |
|||
* 事件是否解决：已解决 resolved，未解决 un_solved |
|||
*/ |
|||
String RESOLVED="resolved"; |
|||
String UN_SOLVED="un_solved"; |
|||
|
|||
/** |
|||
* 小程序类型 |
|||
*/ |
|||
String TYPE_GOV = "gov"; |
|||
String TYPE_RESI = "resi"; |
|||
} |
|||
@ -0,0 +1,61 @@ |
|||
package com.epmet.constant; |
|||
|
|||
import com.epmet.commons.tools.constant.StrConstant; |
|||
|
|||
/** |
|||
* resi_event_operation_log事件操作日志枚举类 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/8/3 16:38 |
|||
*/ |
|||
public enum ResiEventAction { |
|||
// 1、发布事件：publish；
|
|||
// 2、撤回事件：recall；
|
|||
// 3、复：reply；
|
|||
// 4、立项：shift_project；
|
|||
// 5、办结：close_case;
|
|||
// 6、选择是否已解决：choose_resolve;
|
|||
// 7、查看阅读事件：read：人大代表未读=>已读；工作人员待处理=>处理中；
|
|||
PUBLISH ( "publish","发布事件"), |
|||
RECALL( "recall","撤回事件"), |
|||
REPLY ("reply","回复"), |
|||
SHIFIT_PROJECT ( "shift_project","立项"), |
|||
CLOSE_CASE ( "close_case","办结"), |
|||
CHOOSE_RESOLVE ( "choose_resolve","选择是否解决"), |
|||
READ_FIRST( "read_first","首次查看事件"); |
|||
|
|||
|
|||
private String code; |
|||
private String desc; |
|||
|
|||
ResiEventAction(String code, String desc) { |
|||
this.code = code; |
|||
this.desc = desc; |
|||
} |
|||
|
|||
public static String getDesc(String code) { |
|||
ResiEventAction[] businessModeEnums = values(); |
|||
for (ResiEventAction resiEventAction : businessModeEnums) { |
|||
if (resiEventAction.getCode()==code) { |
|||
return resiEventAction.getDesc(); |
|||
} |
|||
} |
|||
return StrConstant.EPMETY_STR; |
|||
} |
|||
|
|||
public String getCode(){ |
|||
return this.code; |
|||
} |
|||
|
|||
public void setCode(String code) { |
|||
this.code = code; |
|||
} |
|||
|
|||
public String getDesc(){ |
|||
return this.desc; |
|||
} |
|||
|
|||
public void setDesc(String desc) { |
|||
this.desc = desc; |
|||
} |
|||
} |
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.controller; |
|||
|
|||
import com.epmet.commons.tools.utils.Result; |
|||
import com.epmet.commons.tools.validator.ValidatorUtils; |
|||
import com.epmet.dto.form.EventListFormDTO; |
|||
import com.epmet.dto.form.UpdateViewTimeFormDTO; |
|||
import com.epmet.dto.result.EventListResultDTO; |
|||
import com.epmet.service.ResiEventService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 居民报事表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("event") |
|||
public class EventController { |
|||
|
|||
@Autowired |
|||
private ResiEventService resiEventService; |
|||
|
|||
|
|||
|
|||
} |
|||
@ -0,0 +1,216 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.controller; |
|||
|
|||
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.constant.EventConstant; |
|||
import com.epmet.dto.form.*; |
|||
import com.epmet.dto.result.*; |
|||
import com.epmet.service.ResiEventService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.*; |
|||
|
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 居民报事表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("resievent") |
|||
public class ResiEventController { |
|||
|
|||
@Autowired |
|||
private ResiEventService resiEventService; |
|||
|
|||
/** |
|||
* @Description 报事详情-两端通用 |
|||
* @Param formDTO |
|||
* @author zxc |
|||
* @date 2021/8/3 1:47 下午 |
|||
*/ |
|||
@PostMapping("eventdetail") |
|||
public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto, @RequestBody EventDetailFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO); |
|||
return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO, tokenDto)); |
|||
} |
|||
|
|||
/** |
|||
* 我要报事-提交（尹） |
|||
* |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/3 10:46 |
|||
*/ |
|||
@PostMapping("report") |
|||
public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, ResiEventFormDTO.AddUserShowGroup.class, ResiEventFormDTO.AddUserInternalGroup.class); |
|||
return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* 我要报事-撤回（尹） |
|||
* |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/3 10:54 |
|||
*/ |
|||
@PostMapping("recall") |
|||
public Result recall(@LoginUser TokenDto tokenDto, @RequestBody ReCallEventFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ReCallEventFormDTO.AddUserInternalGroup.class); |
|||
resiEventService.reCall(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 选择已解决，未解决 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/3 13:57 |
|||
*/ |
|||
@PostMapping("chooseresolve") |
|||
public Result chooseResolve(@LoginUser TokenDto tokenDto, @RequestBody ChooseResolveFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ChooseResolveFormDTO.AddUserInternalGroup.class); |
|||
resiEventService.chooseResolve(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 我的报事列表查询 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>> |
|||
* @author yinzuomei |
|||
* @date 2021/8/3 14:27 |
|||
*/ |
|||
@PostMapping("myreported") |
|||
public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, MyReportedFormDTO.AddUserInternalGroup.class); |
|||
return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* @Description 群众直报（待处理、处理中、已办结）列表 |
|||
* @Param formDTO |
|||
* @author zxc |
|||
* @date 2021/8/3 10:53 上午 |
|||
*/ |
|||
@PostMapping("eventlist") |
|||
public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO) { |
|||
ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); |
|||
return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* @Description 报事-首次查看事件-两端通用 |
|||
* @Param formDTO |
|||
* @author zxc |
|||
* @date 2021/8/3 11:01 上午 |
|||
*/ |
|||
@PostMapping("updateviewtime") |
|||
public Result updateViewTime(@LoginUser TokenDto tokenDto, @RequestBody UpdateViewTimeFormDTO formDTO) { |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.AddUserInternalGroup.class); |
|||
if (EventConstant.STAFF.equals(formDTO.getViewType())) { |
|||
ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.GovInternalGroup.class); |
|||
} |
|||
resiEventService.updateViewTime(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 我要报事-人大代表未读/已读列表 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>> |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 9:40 |
|||
*/ |
|||
@PostMapping("mentionlist") |
|||
public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO) { |
|||
formDTO.setCustomerId(tokenDto.getCustomerId()); |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, UserMentionFormDTO.AddUserInternalGroup.class); |
|||
return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* @Description 最新直报 |
|||
* @Param userId |
|||
* @author zxc |
|||
* @date 2021/8/5 9:55 上午 |
|||
*/ |
|||
@PostMapping("newevents") |
|||
public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto) { |
|||
return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId())); |
|||
} |
|||
|
|||
/** |
|||
* 报事办结 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/5 10:47 |
|||
*/ |
|||
@PostMapping("close") |
|||
public Result closeResiEvent(@LoginUser TokenDto tokenDto, @RequestBody CloseResiEventFormDTO formDTO) { |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, CloseResiEventFormDTO.AddUserInternalGroup.class); |
|||
resiEventService.closeResiEvent(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
|
|||
/** |
|||
* 工作台，最新直报是否显示红点？ |
|||
* |
|||
* @param agencyId |
|||
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiEventManageRedDotRes> |
|||
* @author yinzuomei |
|||
* @date 2021/8/6 13:57 |
|||
*/ |
|||
@PostMapping("queryResiEventManageRedDot/{agencyId}") |
|||
Result<ResiEventManageRedDotRes> queryResiEventManageRedDot(@PathVariable("agencyId") String agencyId) { |
|||
return new Result<ResiEventManageRedDotRes>().ok(resiEventService.queryResiEventManageRedDot(agencyId)); |
|||
} |
|||
} |
|||
@ -0,0 +1,113 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.controller; |
|||
|
|||
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.dto.form.ReplyFormDTO; |
|||
import com.epmet.dto.form.ReplyListFormDTO; |
|||
import com.epmet.dto.result.ReplyListResultDTO; |
|||
import com.epmet.service.ResiEventReplyService; |
|||
import org.springframework.beans.factory.annotation.Autowired; |
|||
import org.springframework.web.bind.annotation.PostMapping; |
|||
import org.springframework.web.bind.annotation.RequestBody; |
|||
import org.springframework.web.bind.annotation.RequestMapping; |
|||
import org.springframework.web.bind.annotation.RestController; |
|||
|
|||
import java.util.List; |
|||
|
|||
|
|||
/** |
|||
* 事件回复表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@RestController |
|||
@RequestMapping("resieventreply") |
|||
public class ResiEventReplyController { |
|||
|
|||
@Autowired |
|||
private ResiEventReplyService resiEventReplyService; |
|||
|
|||
/** |
|||
* @Description 报事详情-回复列表-两端通用 |
|||
* @Param formDTO |
|||
* @author zxc |
|||
* @date 2021/8/3 11:11 上午 |
|||
*/ |
|||
@PostMapping("list") |
|||
public Result<List<ReplyListResultDTO>> replyList(@LoginUser TokenDto tokenDto, @RequestBody ReplyListFormDTO formDTO){ |
|||
formDTO.setCurrentUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO, ReplyListFormDTO.ReplyListForm.class); |
|||
return new Result<List<ReplyListResultDTO>>().ok(resiEventReplyService.replyList(formDTO)); |
|||
} |
|||
|
|||
/** |
|||
* 报事-工作人员回复 |
|||
* |
|||
* @param tokenDto |
|||
* @param replyFormDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 14:19 |
|||
*/ |
|||
@PostMapping("govReply") |
|||
public Result govReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO replyFormDTO){ |
|||
replyFormDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(replyFormDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); |
|||
resiEventReplyService.govReply(replyFormDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 报事当事人回复 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 14:37 |
|||
*/ |
|||
@PostMapping("selfReply") |
|||
public Result selfReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){ |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); |
|||
resiEventReplyService.selfReply(formDTO); |
|||
return new Result(); |
|||
} |
|||
|
|||
/** |
|||
* 艾特的人回复 |
|||
* |
|||
* @param tokenDto |
|||
* @param formDTO |
|||
* @return com.epmet.commons.tools.utils.Result |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 15:06 |
|||
*/ |
|||
@PostMapping("atReply") |
|||
public Result atReply(@LoginUser TokenDto tokenDto,@RequestBody ReplyFormDTO formDTO){ |
|||
formDTO.setUserId(tokenDto.getUserId()); |
|||
ValidatorUtils.validateEntity(formDTO,ReplyFormDTO.AddUserShowGroup.class,ReplyFormDTO.AddUserInternalGroup.class); |
|||
resiEventReplyService.atReply(formDTO); |
|||
return new Result(); |
|||
} |
|||
} |
|||
@ -0,0 +1,91 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.EventDetailResultDTO; |
|||
import com.epmet.dto.result.EventListResultDTO; |
|||
import com.epmet.dto.result.MyReportedResultDTO; |
|||
import com.epmet.dto.result.NewEventsResultDTO; |
|||
import com.epmet.entity.ResiEventEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 居民报事表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ResiEventDao extends BaseDao<ResiEventEntity> { |
|||
|
|||
/** |
|||
* @Description 查询报事列表 |
|||
* @Param orgId |
|||
* @Param eventType |
|||
* @author zxc |
|||
* @date 2021/8/3 4:21 下午 |
|||
*/ |
|||
List<EventListResultDTO> eventUnDisposedList(@Param("orgId")String orgId,@Param("eventType")String eventType); |
|||
|
|||
/** |
|||
* 居民端我的报事列表查询 |
|||
* |
|||
* @param userId 报事人 |
|||
* @param statusCondition 未处理:un_read；处理中：processing；已办结：closed_case |
|||
* @return java.util.List<com.epmet.dto.result.MyReportedResultDTO> |
|||
* @author yinzuomei |
|||
* @date 2021/8/3 23:21 |
|||
*/ |
|||
List<MyReportedResultDTO> queryMyReported(@Param("userId") String userId, @Param("statusCondition")String statusCondition); |
|||
|
|||
/** |
|||
* @Description 查询报事详情 |
|||
* @Param eventId |
|||
* @author zxc |
|||
* @date 2021/8/4 2:16 下午 |
|||
*/ |
|||
EventDetailResultDTO selectEventDetail(@Param("eventId")String eventId); |
|||
|
|||
/** |
|||
* @Description 更新报事人红点状态 |
|||
* @Param userId |
|||
* @author zxc |
|||
* @date 2021/8/4 5:30 下午 |
|||
*/ |
|||
void updateResiEvent(@Param("userId") String userId,@Param("eventId")String eventId); |
|||
|
|||
/** |
|||
* @Description 更新人大代表红点状态 |
|||
* @Param userId |
|||
* @author zxc |
|||
* @date 2021/8/4 5:32 下午 |
|||
*/ |
|||
void updateEventMention(@Param("userId") String userId,@Param("eventId")String eventId); |
|||
|
|||
/** |
|||
* @Description 最新直报 |
|||
* @Param orgIds |
|||
* @author zxc |
|||
* @date 2021/8/5 10:42 上午 |
|||
*/ |
|||
List<NewEventsResultDTO> newEvents(@Param("orgIds")List<String> orgIds); |
|||
} |
|||
@ -0,0 +1,70 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.UserMentionResultDTO; |
|||
import com.epmet.entity.ResiEventMentionEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 事件被@人表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> { |
|||
|
|||
/** |
|||
* 人大代表未读、已读列表 |
|||
* |
|||
* @param userId |
|||
* @param readFlag |
|||
* @return java.util.List<com.epmet.dto.result.UserMentionResultDTO> |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 9:54 |
|||
*/ |
|||
List<UserMentionResultDTO> selectMentionList(@Param("userId")String userId, @Param("readFlag")String readFlag); |
|||
|
|||
/** |
|||
* 人大代表从未读-》已读，首次查看事件 |
|||
* |
|||
* @param eventId |
|||
* @param userId |
|||
* @return int |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 16:37 |
|||
*/ |
|||
int updateReadFlag(@Param("eventId") String eventId, @Param("userId")String userId); |
|||
|
|||
/** |
|||
* 展示红点 |
|||
* |
|||
* @param resiEventId |
|||
* @return int |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 17:41 |
|||
*/ |
|||
int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId); |
|||
|
|||
ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId); |
|||
} |
|||
@ -0,0 +1,47 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.entity.ResiEventOperationLogEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 事件操作日志表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ResiEventOperationLogDao extends BaseDao<ResiEventOperationLogEntity> { |
|||
|
|||
/** |
|||
* 查询事件操作日志 |
|||
* |
|||
* @param eventId |
|||
* @param userId |
|||
* @param actionCode |
|||
* @return com.epmet.entity.ResiEventOperationLogEntity |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 16:44 |
|||
*/ |
|||
List<ResiEventOperationLogEntity> selectByUserAction(@Param("eventId") String eventId, @Param("userId")String userId, @Param("actionCode")String actionCode); |
|||
} |
|||
@ -0,0 +1,45 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.dto.result.ReplyListResultDTO; |
|||
import com.epmet.entity.ResiEventReplyEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
|
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 事件回复表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ResiEventReplyDao extends BaseDao<ResiEventReplyEntity> { |
|||
|
|||
/** |
|||
* 查询事件的回复列表 |
|||
* |
|||
* @param resiEventId |
|||
* @return java.util.List<com.epmet.dto.result.ReplyListResultDTO> |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 13:22 |
|||
*/ |
|||
List<ReplyListResultDTO> selectReplyList(String resiEventId); |
|||
} |
|||
@ -0,0 +1,67 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dao; |
|||
|
|||
import com.epmet.commons.mybatis.dao.BaseDao; |
|||
import com.epmet.entity.ResiEventReportOrgEntity; |
|||
import org.apache.ibatis.annotations.Mapper; |
|||
import org.apache.ibatis.annotations.Param; |
|||
|
|||
/** |
|||
* 事件相关组织表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Mapper |
|||
public interface ResiEventReportOrgDao extends BaseDao<ResiEventReportOrgEntity> { |
|||
|
|||
/** |
|||
* 工作人员从待处理=》处理中 |
|||
* |
|||
* @param eventId |
|||
* @param orgId |
|||
* @return int |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 16:40 |
|||
*/ |
|||
int updateReadFlag(@Param("eventId") String eventId, @Param("orgId") String orgId,@Param("userId") String userId); |
|||
|
|||
/** |
|||
* @Description 更新组织的红点显示状态 |
|||
* @Param eventId |
|||
* @Param orgId |
|||
* @author zxc |
|||
* @date 2021/8/4 5:42 下午 |
|||
*/ |
|||
void updateEventOrg(@Param("eventId") String eventId, @Param("orgId") String orgId); |
|||
|
|||
/** |
|||
* 展示红点 |
|||
* |
|||
* @param resiEventId |
|||
* @return int |
|||
* @author yinzuomei |
|||
* @date 2021/8/4 17:41 |
|||
*/ |
|||
int updateRedDotShow(String resiEventId); |
|||
|
|||
Integer selectUnReadCount(String agencyId); |
|||
|
|||
Integer selectRedCount(String agencyId); |
|||
} |
|||
@ -0,0 +1,76 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
|
|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 事件附件表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("resi_event_attachment") |
|||
public class ResiEventAttachmentEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 事件Id，关联resi_event的id |
|||
*/ |
|||
private String resiEventId; |
|||
|
|||
/** |
|||
* 附件名 |
|||
*/ |
|||
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; |
|||
|
|||
} |
|||
@ -0,0 +1,146 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.entity; |
|||
|
|||
import com.baomidou.mybatisplus.annotation.TableName; |
|||
|
|||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|||
import lombok.Data; |
|||
import lombok.EqualsAndHashCode; |
|||
|
|||
import java.util.Date; |
|||
|
|||
/** |
|||
* 居民报事表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-08-03 |
|||
*/ |
|||
@Data |
|||
@EqualsAndHashCode(callSuper=false) |
|||
@TableName("resi_event") |
|||
public class ResiEventEntity extends BaseEpmetEntity { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 客户ID |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 居民端用户所在网格id |
|||
*/ |
|||
private String gridId; |
|||
|
|||
/** |
|||
* 居民端用户所在网格的所属组织 |
|||
*/ |
|||
private String agencyId; |
|||
|
|||
/** |
|||
* 居民端用户所在网格的所有上级组织，包含AGENCY_ID |
|||
*/ |
|||
private String pids; |
|||
|
|||
/** |
|||
* 报事的人 |
|||
*/ |
|||
private String reportUserId; |
|||
|
|||
/** |
|||
* 1：党员；0：不是党员；默认0 |
|||
*/ |
|||
private Boolean isParty; |
|||
|
|||
/** |
|||
* 事件内容 |
|||
*/ |
|||
private String eventContent; |
|||
|
|||
/** |
|||
* 纬度 |
|||
*/ |
|||
private String latitude; |
|||
|
|||
/** |
|||
* 经度 |
|||
*/ |
|||
private String longitude; |
|||
|
|||
/** |
|||
* 地址 |
|||
*/ |
|||
private String address; |
|||
|
|||
/** |
|||
* 处理中：processing；已办结：closed_case |
|||
*/ |
|||
private String status; |
|||
|
|||
/** |
|||
* 办结时间 |
|||
*/ |
|||
private Date closeCaseTime; |
|||
|
|||
/** |
|||
* 1：已转项目；0：未转项目；默认0 |
|||
*/ |
|||
private Boolean shiftProject; |
|||
|
|||
/** |
|||
* 项目id;shift_project=1时，此列有值 |
|||
*/ |
|||
private String projectId; |
|||
|
|||
/** |
|||
* 1:已撤回；0：未撤回正常展示；默认0 |
|||
*/ |
|||
private Boolean recallFlag; |
|||
|
|||
/** |
|||
* 撤回时间 |
|||
*/ |
|||
private Date recallTime; |
|||
|
|||
/** |
|||
* 事件是否被阅读过;1已读；针对报事人待处理列表 |
|||
*/ |
|||
private Boolean readFlag; |
|||
|
|||
/** |
|||
* 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/办结更新为1; |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
/** |
|||
* 最近一次操作时间（回复、立项、办结更新此列） |
|||
*/ |
|||
private Date latestOperatedTime; |
|||
|
|||
/** |
|||
* 是否解决：已解决 resolved，未解决 un_solved |
|||
*/ |
|||
private String resolveStatus; |
|||
|
|||
/** |
|||
* 结案说明可放这。 |
|||
*/ |
|||
private String closeRemark; |
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue