wxz
4 years ago
33 changed files with 1079 additions and 30 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,43 @@ |
|||
package com.epmet.dto; |
|||
|
|||
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; |
|||
|
|||
/** |
|||
* 报事说明 |
|||
*/ |
|||
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,22 @@ |
|||
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; |
|||
} |
|||
@ -0,0 +1,29 @@ |
|||
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; |
|||
} |
|||
@ -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,23 @@ |
|||
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; |
|||
} |
|||
@ -0,0 +1,34 @@ |
|||
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 10:46 |
|||
*/ |
|||
@Data |
|||
public class ResiEventFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -778643059131036832L; |
|||
|
|||
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,29 @@ |
|||
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 UpdateViewTimeForm{} |
|||
|
|||
/** |
|||
* 居民端用户:resi_user；工作人员:staff |
|||
*/ |
|||
@NotBlank(message = "viewType不能为空",groups = UpdateViewTimeForm.class) |
|||
private String viewType; |
|||
|
|||
@NotBlank(message = "事件ID不能为空",groups = UpdateViewTimeForm.class) |
|||
private String eventId; |
|||
} |
|||
@ -0,0 +1,82 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import com.epmet.dto.EventProjectInfoDTO; |
|||
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; |
|||
|
|||
/** |
|||
* 是否办结【是：true，否：false】 |
|||
*/ |
|||
private Boolean isClosed; |
|||
|
|||
/** |
|||
* 是否解决【是：true，否：false】 |
|||
*/ |
|||
private Boolean isResolve; |
|||
|
|||
/** |
|||
* 是否可以撤回【true：是，false：否】 |
|||
*/ |
|||
private Boolean isRollback; |
|||
|
|||
/** |
|||
* 报事图片 |
|||
*/ |
|||
private List<String> eventImgs; |
|||
|
|||
/** |
|||
* 报事提到的人 |
|||
*/ |
|||
private List<String> eventPerson; |
|||
|
|||
/** |
|||
* 项目信息 |
|||
*/ |
|||
private EventProjectInfoDTO projectInfo; |
|||
|
|||
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 eventTitle; |
|||
|
|||
/** |
|||
* 报事时间 |
|||
*/ |
|||
private String eventTime; |
|||
|
|||
/** |
|||
* 报事ID |
|||
*/ |
|||
private String eventId; |
|||
|
|||
/** |
|||
* 是否立项【true：是，false：否】 |
|||
*/ |
|||
private Boolean isProject; |
|||
|
|||
/** |
|||
* 红点显示【true：显示，false：不显示】 |
|||
*/ |
|||
private Boolean redDot; |
|||
|
|||
/** |
|||
* 报事图片 |
|||
*/ |
|||
private List<String> eventImgs; |
|||
|
|||
} |
|||
@ -0,0 +1,55 @@ |
|||
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; |
|||
} |
|||
@ -0,0 +1,18 @@ |
|||
package com.epmet.dto.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Author zxc |
|||
* @DateTime 2021/8/3 11:07 上午 |
|||
* @DESC |
|||
*/ |
|||
@Data |
|||
public class ReplyListResultDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 4875335642497226847L; |
|||
|
|||
|
|||
} |
|||
@ -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,17 @@ |
|||
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"; |
|||
|
|||
} |
|||
@ -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; |
|||
|
|||
|
|||
|
|||
} |
|||
Loading…
Reference in new issue