From 1fbdd1f48a5ec551a4c044d4babd95633e36d62e Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期四, 03 六月 2021 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java | 5
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java | 10 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java | 14 +
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java | 34 +++-
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java | 28 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java | 16 +-
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 48 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java | 36 +++++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml | 24 +++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 24 ++
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java | 12 +
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml | 59 ++++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java | 6
25 files changed, 336 insertions(+), 39 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
index 6da1191..17f3fd2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventAddDTO.java
@@ -85,9 +85,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
index 88e94ef..698a7b7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
@@ -36,9 +36,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
index 83c0904..e7a717e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java
@@ -89,9 +89,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java
new file mode 100644
index 0000000..65b9286
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridStatisticsDataDTO.java
@@ -0,0 +1,36 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.common.base.CaseFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import java.util.Date;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("查询网格统计信息请求参数")
+public class EventGridStatisticsDataDTO {
+
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "网格ID", hidden = true, example = "1", required = true)
+ @NotNull
+ private Long gridId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
new file mode 100644
index 0000000..44e186e
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java
@@ -0,0 +1,28 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 分页查询表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("查询用户待处理请求参数")
+public class EventGridTodoDataDTO {
+
+ @ApiModelProperty(value = "网格ID", hidden = false, example = "1", required = true)
+ @NotNull(message = "网格ID不能为空")
+ private Long gridId;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
index d2b2560..44b07d3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java
@@ -74,10 +74,16 @@
@URL
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
@URL
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java
index 556a314..875ee5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java
@@ -77,10 +77,16 @@
@URL
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
@URL
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
index c44259d..8edfc83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventAddDTO.java
@@ -84,9 +84,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
index 610d8a4..74e4610 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java
@@ -86,9 +86,15 @@
@ApiModelProperty(value = "音频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp3")
private String audio;
+ @ApiModelProperty(value = "音频时长(单位：秒)", hidden = false, example = "10")
+ private Integer audioTime;
+
@ApiModelProperty(value = "视频(限1个)", hidden = false, example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.mp4")
private String video;
+ @ApiModelProperty(value = "视频时长(单位：秒)", hidden = false, example = "10")
+ private Integer videoTime;
+
@ApiModelProperty(value = "图片,逗号隔开(限9张)", hidden = false,
example = "http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg,http://image.panzhihua.nhys.cdnhxx.com/idcard/8f77d43e8bce47d38b63e2a8ceb0a7c6.jpg")
private String pics;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
index 04b6ccd..b135f49 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java
@@ -21,6 +21,9 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
@ApiModelProperty(value = "服务单号")
private String orderSn;
@@ -36,6 +39,9 @@
@ApiModelProperty(value = "网格ID")
private Long gridId;
+ @ApiModelProperty(value = "网格名称")
+ private String gridName;
+
@ApiModelProperty(value = "网格员")
private Long gridMemberId;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
index b76f876..574df92 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventResourceVO.java
@@ -33,6 +33,9 @@
@ApiModelProperty(value = "资源大小")
private String resourceSize;
+ @ApiModelProperty(value = "资源时长")
+ private Integer resourceTime;
+
@ApiModelProperty(value = "事件上传的资源URL地址")
private String url;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
index 61f9fac..ef768d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventVO.java
@@ -21,6 +21,9 @@
@ApiModelProperty(value = "id")
private Long id;
+ @ApiModelProperty(value = "事件处理状态")
+ private Integer eventDealStatus;
+
@ApiModelProperty(value = "服务单号")
private String orderSn;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java
index af19d5b..938cc26 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/UserEventGridDataVO.java
@@ -19,6 +19,9 @@
@ApiModel("用户网格待处理数据统计信息")
public class UserEventGridDataVO {
- private Map<Integer, Integer> gridData;
+ @ApiModelProperty(value = "事件分类 1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报、7宣传教育")
+ private Integer eventType;
+ @ApiModelProperty(value = "待处理事件数")
+ private Integer todoNums;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
index 53bc686..a653755 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -505,11 +505,11 @@
/**
* 网格数据待处理统计信息
- * @param pageEventGridDataDTO
+ * @param eventGridStatisticsDataDTO
* @return
*/
- @PostMapping("/eventgriddata/getGridData")
- R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
/**
* 查询用户网格
@@ -659,4 +659,12 @@
*/
@GetMapping("/eventapplicationapprelease/edition")
R editionUpdate();
+
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
index 313105d..ac6af3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/EventGridDataApi.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventVO;
@@ -12,16 +13,15 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;
import javax.annotation.Resource;
+import javax.validation.Valid;
+import javax.ws.rs.PathParam;
+
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
/**
*
@@ -53,24 +53,34 @@
return gridService.userGrid(pageEventGridDataDTO);
}
-
- //-------------
+ /**
+ * 网格数据待处理统计信息
+ * @return 查找结果
+ */
+ @GetMapping("/myGridTodoData")
+ @ApiOperation(value = "网格待处理统计数据", response= UserEventGridDataVO.class)
+ R myTodoGridData(@Valid @ModelAttribute EventGridTodoDataDTO eventGridTodoDataDTO){
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ eventGridTodoDataDTO.setUserId(loginUserInfoVO.getUserId());
+ return gridService.getGridTodoData(eventGridTodoDataDTO);
+ }
/**
* 网格数据待处理统计信息
* @return 查找结果
*/
- @GetMapping("/myGridData")
+ @GetMapping("/statistics/{gridId}")
@ApiOperation(value = "网格统计数据", response= UserEventGridDataVO.class)
- R myGridData(){
+ R myGridData(@PathParam("gridId") Long gridId){
LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
- PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
- pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
- pageEventGridDataDTO.setType(3l);
- return gridService.getGridData(pageEventGridDataDTO);
+ EventGridStatisticsDataDTO eventGridStatisticsDataDTO = new EventGridStatisticsDataDTO();
+ eventGridStatisticsDataDTO.setUserId(loginUserInfoVO.getUserId());
+ eventGridStatisticsDataDTO.setGridId(gridId);
+ return gridService.getGridStatisticsdData(eventGridStatisticsDataDTO);
}
+ //===
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
index 405c756..d70b3ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -91,4 +88,23 @@
return eventGridDataService.eventGridDataDetails(id);
};
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO){
+ return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
+ }
+
+ /**
+ * 网格数据待处理统计信息
+ * @param eventGridStatisticsDataDTO
+ * @return
+ */
+ @PostMapping("/eventgriddata/getGridStatisticsdData")
+ R getGridStatisticsdData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO){
+ return R.ok();
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
index 230a816..7cbae12 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.java
@@ -4,12 +4,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.grid.EventGridTodoDataDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.grid.UserEventGridDataVO;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* DAO
@@ -38,4 +42,10 @@
*/
IPage<EventGridDataVO> selectUserGrid(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ /**
+ * 查询当前用户网格内待处理事件统计信息
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
index 3743bfb..0e63a5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventDO.java
@@ -80,7 +80,7 @@
/**
* 事件类型 列: event_clazz
*/
- private Integer eventClazz;
+ private String eventClazz;
/**
* 事件描述 列: event_des
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java
index 35088c7..056be83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventResourceDO.java
@@ -1,11 +1,9 @@
package com.panzhihua.service_grid.model.dos;
-import java.util.*;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.io.Serializable;
-import java.math.BigDecimal;
import java.util.Date;
@@ -50,6 +48,10 @@
*/
private String resourceSize;
/**
+ * 视频或音频时长 列: resource_time
+ */
+ private Integer resourceTime;
+ /**
* 事件上传的资源URL地址 列: url
*/
private String url;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
index 4ce743b..48584b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridDataVO;
@@ -70,4 +67,11 @@
* @return 网格详细信息
*/
R getMapGridDetail(Long gridId);
+
+ /**
+ * 获取网格后台待处理事件统计信息
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
index 1c9f3b9..85a11fa 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java
@@ -3,15 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.grid.EventGridDataAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridDataEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
+import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.grid.ComMapGridDetailVO;
-import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
-import com.panzhihua.common.model.vos.grid.EventGridDataDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventGridDataVO;
+import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridDataService;
@@ -142,4 +136,10 @@
return R.ok(gridDetailVO);
}
+ @Override
+ public R getGridTodoData(EventGridTodoDataDTO eventGridTodoDataDTO) {
+ List<UserEventGridDataVO> userEventGridDataVO = eventGridDataMapper.getGridTodoData(eventGridTodoDataDTO);
+ return R.ok(userEventGridDataVO);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index 6911fb2..1a69bc8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -49,6 +49,8 @@
private EventTransferRecordService eventTransferRecordService;
@Resource
private CommunityService communityService;
+ @Resource
+ private EventGridDataMapper eventGridDataMapper;
/**
@@ -134,6 +136,32 @@
if(eventDO!=null) {
EventDetailsVO eventDetailsVO = new EventDetailsVO();
BeanUtils.copyProperties(eventDO, eventDetailsVO);
+
+ Integer event_status = eventDO.getEventStatus();
+ Integer event_process_status = eventDO.getEventProcessStatus();
+ Integer process_type = eventDO.getProcessType();
+ Integer community_process = eventDO.getCommunityProcess();
+
+ Integer eventDealStatus = -1;
+ //1 待处理、2 待验证、3 已上报、4 已解决、5 草稿箱、6已撤销
+ if(event_status ==2 && event_process_status == 1 && process_type == 1) {
+ eventDealStatus = 1;//"待处理"
+ }else if( event_process_status == 3) {
+ eventDealStatus = 2;//"待验证"
+ }else if( event_status == 1 && community_process == 1 ) {
+ eventDealStatus=3;//"已上报"
+ }else if( event_process_status == 2 ) {
+ eventDealStatus=4;//"已解决"
+ }else if( event_status == 1 ) {
+ eventDealStatus = 5;//"草稿箱"
+ }else if( event_status == 4 ) {
+ eventDealStatus=6;//"已撤销"
+ }
+ eventDetailsVO.setEventDealStatus(eventDealStatus);
+
+ EventGridDataDO eventGridDataDO = eventGridDataMapper.selectById(eventDO.getGridId());
+ eventDetailsVO.setGridName(eventGridDataDO.getGridName());
+
//查询事件关联附件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -242,6 +270,7 @@
eventResourceDO.setUrl(commonEventAddDTO.getAudio());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
@@ -255,6 +284,7 @@
eventResourceDO.setUrl(commonEventAddDTO.getVideo());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
@@ -306,6 +336,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getAudio());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -319,6 +350,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getVideo());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -366,6 +398,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getAudio());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -379,6 +412,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(commonEventEditDTO.getVideo());
eventResourceDO.setCreateBy(commonEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -510,6 +544,7 @@
eventResourceDO.setUrl(commonEventDealDTO.getAudio());
eventResourceDO.setRefId(transferRecordDO.getId());
eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
@@ -523,6 +558,7 @@
eventResourceDO.setUrl(commonEventDealDTO.getVideo());
eventResourceDO.setRefId(transferRecordDO.getId());
eventResourceDO.setCreateBy(commonEventDealDTO.getUserId());
+ eventResourceDO.setResourceTime(commonEventDealDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
@@ -635,6 +671,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventEditDTO.getAudio());
eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -648,6 +685,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventEditDTO.getVideo());
eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -695,6 +733,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventEditDTO.getAudio());
eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -708,6 +747,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventEditDTO.getVideo());
eventResourceDO.setCreateBy(specialEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -761,6 +801,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventAddDTO.getAudio());
eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventAddDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -774,6 +815,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(specialEventAddDTO.getVideo());
eventResourceDO.setCreateBy(specialEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(specialEventAddDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -837,6 +879,7 @@
eventResourceDO.setUrl(publicityEventAddDTO.getAudio());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventAddDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(audioAdd!=1){
throw new ServiceException("添加音频失败");
@@ -850,6 +893,7 @@
eventResourceDO.setUrl(publicityEventAddDTO.getVideo());
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(publicityEventAddDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventAddDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if(videoAdd!=1){
throw new ServiceException("添加视频失败");
@@ -899,6 +943,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -912,6 +957,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -959,6 +1005,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(publicityEventEditDTO.getAudio());
eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getAudioTime());
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -972,6 +1019,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setUrl(publicityEventEditDTO.getVideo());
eventResourceDO.setCreateBy(publicityEventEditDTO.getUserId());
+ eventResourceDO.setResourceTime(publicityEventEditDTO.getVideoTime());
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
index 5f04b01..9f7d8f3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridDataMapper.xml
@@ -170,4 +170,63 @@
</if>
</select>
+ <select id="getGridTodoData" resultType="com.panzhihua.common.model.vos.grid.UserEventGridDataVO"
+ parameterType="com.panzhihua.common.model.dtos.grid.EventGridTodoDataDTO">
+ SELECT IFNULL(SUM(t.todoNums), 0), 1 event_type
+ FROM (
+ SELECT IFNULL(count(e.id), 0) as todoNums
+ FROM EVENT e
+ WHERE e.event_category = 1 AND event_status = 2
+ AND event_process_status = 1 AND process_type = 1
+ AND grid_id = #{eventGridTodoDataDTO.gridId}
+ AND e.event_type = 1
+ GROUP BY e.event_type
+ ) t
+ UNION ALL
+ SELECT IFNULL(SUM(t.todoNums), 0), 2 event_type
+ FROM (
+ SELECT IFNULL(count(e.id), 0) as todoNums
+ FROM EVENT e
+ WHERE e.event_category = 1 AND event_status = 2
+ AND event_process_status = 1 AND process_type = 1
+ AND grid_id = #{eventGridTodoDataDTO.gridId}
+ AND e.event_type =2
+ GROUP BY e.event_type
+ ) t
+ UNION ALL
+ SELECT IFNULL(SUM(t.todoNums), 0), 3 event_type
+ FROM (
+ SELECT IFNULL(count(e.id), 0) as todoNums
+ FROM EVENT e
+ WHERE e.event_category = 1 AND event_status = 2
+ AND event_process_status = 1 AND process_type = 1
+ AND grid_id = #{eventGridTodoDataDTO.gridId}
+ AND e.event_type =3
+ GROUP BY e.event_type
+ ) t
+ UNION ALL
+ SELECT IFNULL(SUM(t.todoNums), 0), 4 event_type
+ FROM (
+ SELECT IFNULL(count(e.id), 0) as todoNums
+ FROM EVENT e
+ WHERE e.event_category = 1 AND event_status = 2
+ AND event_process_status = 1 AND process_type = 1
+ AND grid_id = #{eventGridTodoDataDTO.gridId}
+ AND e.event_type =4
+ GROUP BY e.event_type
+ ) t
+ UNION ALL
+ SELECT IFNULL(SUM(t.todoNums), 0), 5 event_type
+ FROM (
+ SELECT IFNULL(count(e.id), 0) as todoNums
+ FROM EVENT e
+ WHERE e.event_category = 1 AND event_status = 2
+ AND event_process_status = 1 AND process_type = 1
+ AND grid_id = #{eventGridTodoDataDTO.gridId}
+ AND e.event_type =5
+ GROUP BY e.event_type
+ ) t
+
+ </select>
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
index 437d5ae..4086fef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -59,10 +59,19 @@
<select id="findByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
parameterType="com.panzhihua.common.model.dtos.grid.PageEventDTO">
- SELECT <include refid="columns" />
+ SELECT <include refid="columns" />,
+ CASE
+ WHEN event_status =2 AND event_process_status = 1 AND process_type = 1 THEN 1
+ WHEN event_process_status = 3 THEN 2
+ WHEN event_status = 1 AND community_process = 1 THEN 3
+ WHEN event_process_status = 2 THEN 4
+ WHEN event_status = 1 THEN 5
+ WHEN event_status = 4 THEN 6
+ ELSE -1
+ END eventDealStatus
FROM event
<where>
- event_status != 3
+ event_status != 3 AND event_category = 1
<if test="pageEventDTO.eventDealStatus!=null">
<choose>
<!-- 待处理、待验证、已上报、已解决、草稿箱、已撤销 -->
@@ -242,7 +251,16 @@
</select>
<select id="findPublicityByPage" resultType="com.panzhihua.common.model.vos.grid.EventVO"
parameterType="com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO">
- SELECT <include refid="columns" />
+ SELECT <include refid="columns" />,
+ CASE
+ WHEN event_status =2 AND event_process_status = 1 AND process_type = 1 THEN 1
+ WHEN event_process_status = 3 THEN 2
+ WHEN event_status = 1 AND community_process = 1 THEN 3
+ WHEN event_process_status = 2 THEN 4
+ WHEN event_status = 1 THEN 5
+ WHEN event_status = 4 THEN 6
+ ELSE -1
+ END eventDealStatus
FROM event
<where>
event_status != 3 AND event_category = 2
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml
index 5af9689..9e46767 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventResourceMapper.xml
@@ -11,6 +11,7 @@
<result property="type" column="type"/>
<result property="resourceName" column="resource_name"/>
<result property="resourceSize" column="resource_size"/>
+ <result property="resourceTime" column="resource_time"/>
<result property="url" column="url"/>
<result property="createBy" column="create_by"/>
<result property="createAt" column="create_at"/>
@@ -18,7 +19,7 @@
<sql id="columns">
<![CDATA[
- id,classification,ref_id,type,resource_name,resource_size,url,create_by,create_at
+ id,classification,ref_id,type,resource_name,resource_size,resource_time, url,create_by,create_at
]]>
</sql>
--
Gitblit v1.7.1