From 165f5d0ce0ee16bdce2b8af55ce4aa6383af6382 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 03 六月 2021 17:34:08 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into test
---
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 | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventDetailsVO.java | 3
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java | 12
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 | 35 -
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/EventGridDataAddDTO.java | 5
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java | 92 ++++-
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 79 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridTodoDataDTO.java | 28 +
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java | 20 -
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 | 71 ++-
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/EventGridMemberAddDTO.java | 75 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java | 16
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 9
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java | 14
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 8
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/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java | 29 -
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridDataApi.java | 15
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java | 26 +
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/model/dos/EventGridMemberRelationDO.java | 12
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
/dev/null | 100 ------
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/SpecialEventEditDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 12
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 | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventEditDTO.java | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java | 72 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java | 3
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 7
43 files changed, 657 insertions(+), 288 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index 2586260..d0af736 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -90,7 +90,7 @@
/**
* 令牌有效期（分钟）
*/
- public final static long TOKEN_EXPIRE = 720;
+ public final static long _EXPIRE = 720;
/**
* 参数管理 cache key
@@ -137,4 +137,9 @@
* 首页商城是否展示（1.是 2.否）
*/
public static final Integer IS_SHOP_OPEN = 2;
+
+ /**
+ * 网格综治-默认角色权限默认字符串
+ */
+ public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";
}
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 43a8d8a..91ecf53 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
@@ -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/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 b2dd736..6b8121b 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
@@ -93,9 +93,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/EventAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventAddDTO.java
deleted file mode 100644
index eccd59c..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventAddDTO.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.panzhihua.common.model.dtos.grid;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import org.hibernate.validator.constraints.Length;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-
-
-/**
- * 创建表单
- *
- * @author cedoo email:cedoo(a)qq.com
- * @version 1.0
- * @since 1.0
- * @date 2021-05-26
- * */
-@Data
-@ApiModel("创建事件请求参数")
-public class EventAddDTO {
-
- @Length(max=20)
- @ApiModelProperty(value = "服务单号", hidden = false, example = "")
- private String orderSn;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
- private Long eventCategory;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
- private Long gridMemberStreet;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
- private Long gridMemberCommunity;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
- private Long gridId;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员", hidden = false, example = "1")
- private Long gridMemberId;
-
- @Length(max=100)
- @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
- private String gridMemberName;
-
- @Length(max=20)
- @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
- private String gridMemberTelephone;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件标题", hidden = false, example = "")
- private String eventTitle;
-
- @Length(max=255)
- @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
- private String propagandaType;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date propagandaTime;
-
- @Max(127)
- @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报", hidden = false, example = "1")
- private Integer eventType;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件类型,逗号隔开", hidden = false, example = "邻里纠纷,土地承包租赁", required = true)
- @NotNull
- private String eventClazz;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件描述", hidden = false, example = "")
- private String eventDes;
-
- @Length(max=50)
- @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
- private String propagandaObject;
-
- @Length(max=10)
- @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
- private String propagandaNum;
-
- @Max(127)
- @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
- private Integer communityProcess;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date happenTime;
-
- @Length(max=255)
- @ApiModelProperty(value = "发生地点", hidden = false, example = "")
- private String happentAddress;
-
- @Length(max=255)
- @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
- private String happentLatLng;
-
- @Max(127)
- @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
- private Integer eventStatus;
-
- @Max(127)
- @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
- private Integer eventProcessStatus;
-
- @Max(127)
- @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
- private Integer processType;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
- private Long processUserId;
-
- @Length(max=100)
- @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
- private String processUserName;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date processDate;
-
- @Length(max=255)
- @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
- private String processDesc;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件来源", hidden = false, example = "")
- private String eventResource;
-
- @Max(127)
- @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
- private Integer dangerLevel;
-
-
- @ApiModelProperty(value = "红牌", hidden = false, example = "true")
- private Boolean redCard;
-
-
- @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
- private Boolean yellowCard;
-
-
- @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
- private Boolean invalid;
-
-
- @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
- private Boolean major;
-
- @Max(9999999999L)
- @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
- private Integer deathsNumber;
-
- @Max(9999999999L)
- @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
- private Integer injuriesNumber;
-
-
- @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
- private Boolean difficult;
-
-
- @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
- private Boolean urgent;
-
-
- @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
- private Boolean urgentDell;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date submitDate;
-
-
- @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/EventEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventEditDTO.java
deleted file mode 100644
index 58c3976..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventEditDTO.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.panzhihua.common.model.dtos.grid;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-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 EventEditDTO {
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "id", hidden = false, example = "1")
- private Long id;
-
- @Length(max=20)
- @ApiModelProperty(value = "服务单号", hidden = false, example = "")
- private String orderSn;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "1、办件事件2是宣传事件3是阅读事件", hidden = false, example = "1")
- private Long eventCategory;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员所处的街道", hidden = false, example = "1")
- private Long gridMemberStreet;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员所处社区", hidden = false, example = "1")
- private Long gridMemberCommunity;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
- private Long gridId;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员", hidden = false, example = "1")
- private Long gridMemberId;
-
- @Length(max=100)
- @ApiModelProperty(value = "网格员名字", hidden = false, example = "")
- private String gridMemberName;
-
- @Length(max=20)
- @ApiModelProperty(value = "网格员联系方式", hidden = false, example = "")
- private String gridMemberTelephone;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件标题", hidden = false, example = "")
- private String eventTitle;
-
- @Length(max=255)
- @ApiModelProperty(value = "宣传类型", hidden = false, example = "1")
- private String propagandaType;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "宣传时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date propagandaTime;
-
- @Max(127)
- @ApiModelProperty(value = "当event_type_category是1填写事件类型1治安隐患、2公共服务、3矛盾纠纷、4不稳定因素、5突发事件、6特殊人群信息上报", hidden = false, example = "1")
- private Integer eventType;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件描述", hidden = false, example = "")
- private String eventDes;
-
- @Length(max=50)
- @ApiModelProperty(value = "宣传对象", hidden = false, example = "")
- private String propagandaObject;
-
- @Length(max=10)
- @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
- private String propagandaNum;
-
- @Max(127)
- @ApiModelProperty(value = "社区处理(0是无需社区1是社区处理)", hidden = false, example = "1")
- private Integer communityProcess;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "发生时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date happenTime;
-
- @Length(max=255)
- @ApiModelProperty(value = "发生地点", hidden = false, example = "")
- private String happentAddress;
-
- @Length(max=255)
- @ApiModelProperty(value = "发生的精度纬度信息（逗号隔开）", hidden = false, example = "")
- private String happentLatLng;
-
- @Max(127)
- @ApiModelProperty(value = "事件状态（1草稿箱2发布3逻辑删除4、撤销）", hidden = false, example = "1")
- private Integer eventStatus;
-
- @Max(127)
- @ApiModelProperty(value = "1待处理2已解决3待验证", hidden = false, example = "1")
- private Integer eventProcessStatus;
-
- @Max(127)
- @ApiModelProperty(value = "当前处理对象类型（1、网格员2、社区3、是街道）", hidden = false, example = "1")
- private Integer processType;
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "处理人ID", hidden = false, example = "1")
- private Long processUserId;
-
- @Length(max=100)
- @ApiModelProperty(value = "处理人名称", hidden = false, example = "")
- private String processUserName;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "处理时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date processDate;
-
- @Length(max=255)
- @ApiModelProperty(value = "解决人针对解决事件的处理描述", hidden = false, example = "")
- private String processDesc;
-
- @Length(max=255)
- @ApiModelProperty(value = "事件来源", hidden = false, example = "")
- private String eventResource;
-
- @Max(127)
- @ApiModelProperty(value = "危险级别", hidden = false, example = "1")
- private Integer dangerLevel;
-
-
- @ApiModelProperty(value = "红牌", hidden = false, example = "true")
- private Boolean redCard;
-
-
- @ApiModelProperty(value = "黄牌", hidden = false, example = "true")
- private Boolean yellowCard;
-
-
- @ApiModelProperty(value = "是否有效", hidden = false, example = "true")
- private Boolean invalid;
-
-
- @ApiModelProperty(value = "是否重大", hidden = false, example = "true")
- private Boolean major;
-
- @Max(9999999999L)
- @ApiModelProperty(value = "死亡人数", hidden = false, example = "1")
- private Integer deathsNumber;
-
- @Max(9999999999L)
- @ApiModelProperty(value = "受伤人数", hidden = false, example = "1")
- private Integer injuriesNumber;
-
-
- @ApiModelProperty(value = "是否疑难事件", hidden = false, example = "true")
- private Boolean difficult;
-
-
- @ApiModelProperty(value = "是否紧急", hidden = false, example = "true")
- private Boolean urgent;
-
-
- @ApiModelProperty(value = "是否催办", hidden = false, example = "true")
- private Boolean urgentDell;
-
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @ApiModelProperty(value = "上报提交时间", hidden = false, example = "2021-05-01 18:05:50")
- private Date submitDate;
-
-
- @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/EventGridDataAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java
index d1375f3..483e0d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataAddDTO.java
@@ -8,6 +8,8 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
+import java.util.List;
+
import org.hibernate.validator.constraints.Length;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -73,6 +75,9 @@
@ApiModelProperty(value = "围栏数据", hidden = false, example = "")
private String data;
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
+ private List<Long> gridMemebers;
+
@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/EventGridDataEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
index 84cc6e2..34d8013 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridDataEditDTO.java
@@ -11,6 +11,7 @@
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;
import java.util.Date;
+import java.util.List;
/**
* 编辑表单
@@ -76,6 +77,8 @@
@ApiModelProperty(value = "围栏数据", hidden = false, example = "")
private String data;
+ @ApiModelProperty(value = "网格员ID", hidden = false, example = "[12,45]")
+ private List<Long> gridMemebers;
@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/EventGridMemberAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
new file mode 100644
index 0000000..5d324b9
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberAddDTO.java
@@ -0,0 +1,75 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import org.hibernate.validator.constraints.Length;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+
+
+/**
+ * 创建表单
+ *
+ * @author cedoo email:cedoo(a)qq.com
+ * @version 1.0
+ * @since 1.0
+ * @date 2021-05-26
+ * */
+@Data
+@ApiModel("创建网格和网格员的关联关系请求参数")
+public class EventGridMemberAddDTO {
+
+ @NotBlank(message = "账号昵称不能为空")
+ @Length(max=50)
+ @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
+ private String nickName;
+
+ @NotBlank(message = "登录账号不能为空")
+ @Length(max=50)
+ @ApiModelProperty(value = "登录账号", hidden = false, example = "")
+ private String account;
+
+ @NotBlank(message = "登录密码不能为空")
+ @Length(min = 8, max=100)
+ @ApiModelProperty(value = "登录密码", hidden = false, example = "")
+ private String passwd;
+
+ @NotBlank(message = "联系电话不能为空")
+ @Length(max=11)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String phone;
+
+ @NotNull(message = "工作开始时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
+ private Integer workStartAt;
+
+ @NotNull(message = "工作结束时间不能为空")
+ @Max(24)
+ @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
+ private String workEndAt;
+
+ @Length(max=255)
+ @ApiModelProperty(value = "头像", hidden = false, example = "")
+ private String imageUrl;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "账号状态", hidden = false, example = "")
+ private String status;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+ @ApiModelProperty(value = "社区ID", hidden = true, example = "1")
+ private Long communityId;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java
new file mode 100644
index 0000000..ab58149
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberEditDTO.java
@@ -0,0 +1,72 @@
+package com.panzhihua.common.model.dtos.grid;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import org.hibernate.validator.constraints.Length;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+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 EventGridMemberEditDTO {
+
+ @Max(9223372036854775807L)
+ @ApiModelProperty(value = "id,如果是新增则不填", hidden = false, example = "1")
+ private Long id;
+
+ @NotBlank()
+ @Length(max=50)
+ @ApiModelProperty(value = "账号昵称", hidden = false, example = "")
+ private String nickName;
+
+ @NotBlank() @Length(max=50)
+ @ApiModelProperty(value = "登录账号", hidden = false, example = "")
+ private String account;
+
+ @NotBlank() @Length(min = 8, max=100)
+ @ApiModelProperty(value = "登录密码", hidden = false, example = "")
+ private String paswd;
+
+ @NotBlank() @Length(max=11)
+ @ApiModelProperty(value = "联系电话", hidden = false, example = "")
+ private String phone;
+
+ @NotNull()
+ @Max(24)
+ @ApiModelProperty(value = "工作开始时间", hidden = false, example = "")
+ private Integer workStart;
+
+ @NotNull()
+ @Max(24)
+ @ApiModelProperty(value = "工作结束时间", hidden = false, example = "")
+ private String workEnd;
+
+ @Length(max=255)
+ @ApiModelProperty(value = "头像", hidden = false, example = "")
+ private String imageUrl;
+
+ @NotBlank() @Length(max=100)
+ @ApiModelProperty(value = "账号状态", hidden = false, example = "")
+ private String status;
+
+ @ApiModelProperty(value = "(当前操作)用户ID", hidden = true, example = "1")
+ private Long userId;
+
+ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三")
+ private String userName;
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationAddDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationAddDTO.java
deleted file mode 100644
index 3948224..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationAddDTO.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.panzhihua.common.model.dtos.grid;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
-import org.hibernate.validator.constraints.Length;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-
-
-/**
- * 创建表单
- *
- * @author cedoo email:cedoo(a)qq.com
- * @version 1.0
- * @since 1.0
- * @date 2021-05-26
- * */
-@Data
-@ApiModel("创建网格和网格员的关联关系请求参数")
-public class EventGridMemberRelationAddDTO {
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
- private Long gridStreetId;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
- private Long gridCommunityId;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
- private Long gridId;
-
- @NotBlank() @Length(max=100)
- @ApiModelProperty(value = "网格名称", hidden = false, example = "")
- private String gridName;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
- private Long gridMemberId;
-
-
- @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/EventGridMemberRelationEditDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationEditDTO.java
deleted file mode 100644
index 11ce387..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/EventGridMemberRelationEditDTO.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.panzhihua.common.model.dtos.grid;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import org.hibernate.validator.constraints.Length;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-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 EventGridMemberRelationEditDTO {
-
- @Max(9223372036854775807L)
- @ApiModelProperty(value = "主键ID", hidden = false, example = "1")
- private Long id;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属街道", hidden = false, example = "1")
- private Long gridStreetId;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格所属社区ID", hidden = false, example = "1")
- private Long gridCommunityId;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格ID", hidden = false, example = "1")
- private Long gridId;
-
- @NotBlank() @Length(max=100)
- @ApiModelProperty(value = "网格名称", hidden = false, example = "")
- private String gridName;
-
- @NotNull() @Max(9223372036854775807L)
- @ApiModelProperty(value = "网格员ID", hidden = false, example = "1")
- private Long gridMemberId;
-
-
- @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/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..dad012e 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;
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 33e6276..96d671a 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
@@ -17,21 +17,6 @@
@FeignClient(name = "grid")
public interface GridService {
- /**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
- */
- @PostMapping("/event/add")
- R add(@RequestBody EventAddDTO eventAddDTO);
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- @PostMapping("/event/edit")
- R edit(@RequestBody EventEditDTO eventEditDTO);
/**
* 分页查找事件
@@ -59,19 +44,19 @@
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
@PostMapping("/eventgridmemberrelation/add")
- R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
+ R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
@PostMapping("/eventgridmemberrelation/edit")
- R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
+ R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO);
/**
* 分页查找网格和网格员的关联关系
@@ -520,11 +505,11 @@
/**
* 网格数据待处理统计信息
- * @param pageEventGridDataDTO
+ * @param eventGridStatisticsDataDTO
* @return
*/
@PostMapping("/eventgriddata/getGridData")
- R getGridData(@RequestBody PageEventGridDataDTO pageEventGridDataDTO);
+ R getGridData(@RequestBody EventGridStatisticsDataDTO eventGridStatisticsDataDTO);
/**
* 查询用户网格
@@ -674,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/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 6e4d83e..7362300 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -708,4 +709,12 @@
*/
@PutMapping("updateUserPassByApp")
R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
}
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..9fa15d7 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,14 @@
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.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 +52,35 @@
return gridService.userGrid(pageEventGridDataDTO);
}
-
- //-------------
+ /**
+ * 网格数据待处理统计信息
+ * @return 查找结果
+ */
+ @GetMapping("/myGridTodoData")
+ @ApiOperation(value = "网格待处理统计数据", response= UserEventGridDataVO.class)
+ R myTodoGridData(){
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ EventGridTodoDataDTO eventGridTodoDataDTO = new EventGridTodoDataDTO();
+ 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.getGridData(eventGridStatisticsDataDTO);
}
+ //===
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java
deleted file mode 100644
index 90bb9b5..0000000
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventApi.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.panzhihua.grid_backstage.api;
-
-
-import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.utlis.ClazzUtils;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import com.panzhihua.common.model.dtos.grid.EventEditDTO;
-//import com.panzhihua.common.model.vos.IPageVO;
-import com.panzhihua.common.service.grid.GridService;
-
-import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.grid.EventDetailsVO;
-import com.panzhihua.common.model.vos.grid.EventVO;
-import com.panzhihua.common.model.dtos.grid.EventAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventDTO;
-
-/**
- *
- * @author cedoo email:cedoo(a)qq.com
- * @version 1.0
- * @since 1.0
- * @date 2021-05-26
- * */
-@Slf4j
-@RestController
-@RequestMapping("/event")
-@Api(tags = {"事件"})
-public class EventApi extends BaseController {
-
- @Resource
- private GridService gridService;
-
- /**
- * 新增事件
- * @param {classNameFirstLower}AddDTO 添加事件传递对象
- * @return 新增结果
- */
- @PostMapping()
- @ApiOperation(value = "新增事件", response = R.class)
- R add(@Validated @RequestBody EventAddDTO eventAddDTO){
- ClazzUtils.setIfStringIsEmpty(eventAddDTO);
- eventAddDTO.setUserId(getUserId());
- return gridService.add(eventAddDTO);
- }
-
- /**
- * 修改
- * @param eventEditDTO 修改事件传递对象
- * @return 修改结果
- */
- @PutMapping()
- @ApiOperation(value = "编辑事件", response = R.class)
- R edit(@Validated @RequestBody EventEditDTO eventEditDTO){
- ClazzUtils.setIfStringIsEmpty(eventEditDTO);
- eventEditDTO.setUserId(getUserId());
- return gridService.edit(eventEditDTO);
- }
-
- /**
- * 分页查找
- * @param pageEventDTO 查找事件传递对象
- * @return 查找结果
- */
- @GetMapping()
- @ApiOperation(value = "查询事件", response= EventVO.class)
- R query(@Validated @ModelAttribute PageEventDTO pageEventDTO){
- ClazzUtils.setIfStringIsEmpty(pageEventDTO);
- return gridService.query(pageEventDTO);
- }
-
- /**
- * 删除
- * @param eventDeleteDTO 删除事件传递对象
- * @return 删除结果
- */
- @DeleteMapping()
- @ApiOperation(value = "删除事件", response = R.class)
- R delete(@Validated @RequestBody EventDeleteDTO eventDeleteDTO){
- ClazzUtils.setIfStringIsEmpty(eventDeleteDTO);
- return gridService.delete(eventDeleteDTO);
- }
-
- /**
- * 查询事件详细信息
- * @param id 事件 id
- * @return 查找结果
- */
- @GetMapping("/{id}")
- @ApiOperation(value = "查询事件详细信息")
- R<EventDetailsVO> details(@PathVariable("id") Long id){
- return gridService.eventDetails(id);
- }
-
-}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
index 17b1b18..a886375 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridDataApi.java
@@ -32,26 +32,11 @@
@Slf4j
@RestController
@RequestMapping("/eventgriddata")
-@Api(tags = {"区县/街道/社区/网格员网格数据管理 @陈东"})
+@Api(tags = {"网格数据管理 @chendong"})
public class EventGridDataApi extends BaseController {
@Resource
private GridService gridService;
-
- /**
- * 我的网格
- * @return 查找结果
- */
- @GetMapping("/myGrid")
- @ApiOperation(value = "我的网格", response= EventGridDataVO.class)
- R myGrid(){
- LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
- PageEventGridDataDTO pageEventGridDataDTO = new PageEventGridDataDTO();
- pageEventGridDataDTO.setUserId(loginUserInfoVO.getUserId());
- pageEventGridDataDTO.setType(3l);
- return gridService.userGrid(pageEventGridDataDTO);
- }
-
/**
* 新增区县/街道/社区/网格员网格数据管理
@@ -59,7 +44,7 @@
* @return 新增结果
*/
@PostMapping()
- @ApiOperation(value = "新增区县/街道/社区/网格员网格数据管理", response = R.class)
+ @ApiOperation(value = "新增网格数据管理", response = R.class)
R add(@Validated @RequestBody EventGridDataAddDTO eventGridDataAddDTO){
ClazzUtils.setIfStringIsEmpty(eventGridDataAddDTO);
eventGridDataAddDTO.setUserId(getUserId());
@@ -72,7 +57,7 @@
* @return 修改结果
*/
@PutMapping()
- @ApiOperation(value = "编辑区县/街道/社区/网格员网格数据管理", response = R.class)
+ @ApiOperation(value = "编辑网格数据管理", response = R.class)
R edit(@Validated @RequestBody EventGridDataEditDTO eventGridDataEditDTO){
ClazzUtils.setIfStringIsEmpty(eventGridDataEditDTO);
eventGridDataEditDTO.setUserId(getUserId());
@@ -85,7 +70,7 @@
* @return 查找结果
*/
@GetMapping()
- @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理", response= EventGridDataVO.class)
+ @ApiOperation(value = "查询网格数据管理", response= EventGridDataVO.class)
R query(@Validated @ModelAttribute PageEventGridDataDTO pageEventGridDataDTO){
ClazzUtils.setIfStringIsEmpty(pageEventGridDataDTO);
return gridService.query(pageEventGridDataDTO);
@@ -97,7 +82,7 @@
* @return 删除结果
*/
@DeleteMapping()
- @ApiOperation(value = "删除区县/街道/社区/网格员网格数据管理", response = R.class)
+ @ApiOperation(value = "删除网格数据管理", response = R.class)
R delete(@Validated @RequestBody EventGridDataDeleteDTO eventGridDataDeleteDTO){
ClazzUtils.setIfStringIsEmpty(eventGridDataDeleteDTO);
return gridService.delete(eventGridDataDeleteDTO);
@@ -105,11 +90,11 @@
/**
* 查询区县/街道/社区/网格员网格数据管理详细信息
- * @param id 区县/街道/社区/网格员网格数据管理 id
+ * @param id 网格数据管理 id
* @return 查找结果
*/
@GetMapping("/{id}")
- @ApiOperation(value = "查询区县/街道/社区/网格员网格数据管理详细信息")
+ @ApiOperation(value = "查询网格数据管理详细信息")
R<EventGridDataDetailsVO> details(@PathVariable("id") Long id){
return gridService.eventGridDataDetails(id);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
index cc30f11..a4ef536 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EventGridMemberRelationApi.java
@@ -2,6 +2,11 @@
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
+import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.utlis.ClazzUtils;
import io.swagger.annotations.Api;
@@ -9,16 +14,11 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
-//import com.panzhihua.common.model.vos.IPageVO;
import com.panzhihua.common.service.grid.GridService;
import javax.annotation.Resource;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
/**
*
@@ -29,8 +29,8 @@
* */
@Slf4j
@RestController
-@RequestMapping("/eventgridmemberrelation")
-@Api(tags = {"网格和网格员的关联关系"})
+@RequestMapping("/eventgridmember")
+@Api(tags = {"网格员管理"})
public class EventGridMemberRelationApi extends BaseController {
@Resource
@@ -38,28 +38,32 @@
/**
* 新增网格和网格员的关联关系
- * @param {classNameFirstLower}AddDTO 添加网格和网格员的关联关系传递对象
+ * @param eventGridMemberAddDTO 添加网格和网格员的关联关系传递对象
* @return 新增结果
*/
@PostMapping()
- @ApiOperation(value = "新增网格和网格员的关联关系", response = R.class)
- R add(@Validated @RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
- ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationAddDTO);
- eventGridMemberRelationAddDTO.setUserId(getUserId());
- return gridService.add(eventGridMemberRelationAddDTO);
+ @ApiOperation(value = "新增网格员", response = R.class)
+ R add(@Validated @RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
+ ClazzUtils.setIfStringIsEmpty(eventGridMemberAddDTO);
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ eventGridMemberAddDTO.setUserId(loginUserInfoVO.getUserId());
+ eventGridMemberAddDTO.setUserName(loginUserInfoVO.getName());
+ return gridService.add(eventGridMemberAddDTO);
}
/**
* 修改
- * @param eventGridMemberRelationEditDTO 修改网格和网格员的关联关系传递对象
+ * @param eventGridMemberEditDTO 修改网格和网格员的关联关系传递对象
* @return 修改结果
*/
@PutMapping()
- @ApiOperation(value = "编辑网格和网格员的关联关系", response = R.class)
- R edit(@Validated @RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
- ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationEditDTO);
- eventGridMemberRelationEditDTO.setUserId(getUserId());
- return gridService.edit(eventGridMemberRelationEditDTO);
+ @ApiOperation(value = "编辑网格员", response = R.class)
+ R edit(@Validated @RequestBody EventGridMemberEditDTO eventGridMemberEditDTO){
+ ClazzUtils.setIfStringIsEmpty(eventGridMemberEditDTO);
+ LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo();
+ eventGridMemberEditDTO.setUserId(loginUserInfoVO.getUserId());
+ eventGridMemberEditDTO.setUserName(loginUserInfoVO.getName());
+ return gridService.edit(eventGridMemberEditDTO);
}
/**
@@ -68,7 +72,7 @@
* @return 查找结果
*/
@GetMapping()
- @ApiOperation(value = "查询网格和网格员的关联关系", response= EventGridMemberRelationVO.class)
+ @ApiOperation(value = "查询网格员", response= EventGridMemberRelationVO.class)
R query(@Validated @ModelAttribute PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO){
ClazzUtils.setIfStringIsEmpty(pageEventGridMemberRelationDTO);
return gridService.query(pageEventGridMemberRelationDTO);
@@ -81,7 +85,7 @@
*/
@DeleteMapping()
@ApiOperation(value = "删除网格和网格员的关联关系", response = R.class)
- R delete(@Validated @RequestBody EventGridMemberRelationDeleteDTO eventGridMemberRelationDeleteDTO){
+ R delete(@Validated @RequestBody EventGridMemberRelationDeleteDTO eventGridMemberRelationDeleteDTO){
ClazzUtils.setIfStringIsEmpty(eventGridMemberRelationDeleteDTO);
return gridService.delete(eventGridMemberRelationDeleteDTO);
}
@@ -97,4 +101,50 @@
return gridService.eventGridMemberRelationDetails(id);
}
+
+ /**
+ * 查询网格员工作轨迹
+ * @param userId 网格id
+ * @return 查找结果
+ */
+ @GetMapping("/locus/{userId}")
+ @ApiOperation(value = "查询网格员工作轨迹")
+ R locus(@PathVariable("userId") Long userId){
+ return gridService.eventGridMemberRelationDetails(userId);
+ }
+
+ /**
+ * 启用
+ * @param userId 网格id
+ * @return 查找结果
+ */
+ @PutMapping("/on/{userId}")
+ @ApiOperation(value = "启用网格员")
+ R toggleOn(@PathVariable("userId") Long userId){
+ return gridService.eventGridMemberRelationDetails(userId);
+ }
+
+ /**
+ * 禁用
+ * @param userId 网格id
+ * @return 查找结果
+ */
+ @PutMapping("/off/{userId}")
+ @ApiOperation(value = "禁用网格员")
+ R toggleOff(@PathVariable("userId") Long userId){
+ return gridService.eventGridMemberRelationDetails(userId);
+ }
+
+
+ /**
+ * 工作预警记录
+ * @param userId 网格id
+ * @return 查找结果
+ */
+ @GetMapping("/gpslog/{userId}")
+ @ApiOperation(value = "工作预警记录")
+ R gpslog(@PathVariable("userId") Long userId){
+ return gridService.eventGridMemberRelationDetails(userId);
+ }
+
}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
index 778cc82..d2b8abc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventApi.java
@@ -29,26 +29,6 @@
private EventService eventService;
/**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
- */
- @PostMapping("/add")
- R add(@RequestBody EventAddDTO eventAddDTO){
- return eventService.add(eventAddDTO);
- };
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- @PostMapping("/edit")
- R edit(@RequestBody EventEditDTO eventEditDTO){
- return eventService.edit(eventEditDTO);
- };
-
- /**
* 分页查找事件
* @param pageEventDTO
* @return 维护结果
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..b8ce128 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,14 @@
return eventGridDataService.eventGridDataDetails(id);
};
+ /**
+ * 首页待处理
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ @PostMapping("/getGridTodoData")
+ R getGridTodoData(@RequestBody EventGridTodoDataDTO eventGridTodoDataDTO){
+ return eventGridDataService.getGridTodoData(eventGridTodoDataDTO);
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
index 5f27136..71a6428 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventGridMemberRelationApi.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -32,22 +32,22 @@
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
@PostMapping("/add")
- R add(@RequestBody EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
- return eventGridMemberRelationService.add(eventGridMemberRelationAddDTO);
+ R add(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
+ return eventGridMemberRelationService.add(eventGridMemberAddDTO);
};
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
@PostMapping("/edit")
- R edit(@RequestBody EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
- return eventGridMemberRelationService.edit(eventGridMemberRelationEditDTO);
+ R edit(@RequestBody EventGridMemberEditDTO eventGridMemberEditDTO){
+ return eventGridMemberRelationService.edit(eventGridMemberEditDTO);
};
/**
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..b6d27e0 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,8 +4,10 @@
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;
@@ -38,4 +40,10 @@
*/
IPage<EventGridDataVO> selectUserGrid(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
+ /**
+ * 查询当前用户网格内待处理事件统计信息
+ * @param eventGridTodoDataDTO
+ * @return
+ */
+ 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 4c5b90b..1e959d2 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/EventGridMemberRelationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java
index 4eabe46..57db65c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventGridMemberRelationDO.java
@@ -50,6 +50,18 @@
*/
private Long gridMemberId;
/**
+ * 网格员工作状态 列: work_status
+ */
+ private Integer workStatus;
+ /**
+ * 工作开始时间 列: work_start_at
+ */
+ private Integer workStartAt;
+ /**
+ * 工作结束时间 列: work_end_at
+ */
+ private Integer workEndAt;
+ /**
* 创建人 列: create_by
*/
private Long createBy;
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/EventGridMemberRelationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
index 33e4346..b69a4e6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberRelationService.java
@@ -2,9 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
@@ -23,17 +23,17 @@
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
- R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO);
+ R add(EventGridMemberAddDTO eventGridMemberAddDTO);
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
- R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO);
+ R edit(EventGridMemberEditDTO eventGridMemberEditDTO);
/**
* 分页查找网格和网格员的关联关系
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
index 2c873bb..70f8633 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -20,20 +20,6 @@
public interface EventService extends IService<EventDO> {
/**
- * 新增事件
- * @param eventAddDTO
- * @return 新增结果
- */
- R add(EventAddDTO eventAddDTO);
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- R edit(EventEditDTO eventEditDTO);
-
- /**
* 分页查找事件
* @param pageEventDTO
* @return 维护结果
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..5154392 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) {
+ 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/EventGridMemberRelationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
index c078b84..f76ea13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberRelationServiceImpl.java
@@ -3,13 +3,14 @@
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.EventGridMemberRelationAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberEditDTO;
import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberRelationEditDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationDetailsVO;
import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.service_grid.dao.*;
import com.panzhihua.service_grid.model.dos.*;
import com.panzhihua.service_grid.service.EventGridMemberRelationService;
@@ -31,15 +32,22 @@
@Resource
private EventGridMemberRelationMapper eventGridMemberRelationMapper;
+ @Resource
+ private UserService userService;
+
/**
* 新增网格和网格员的关联关系
- * @param eventGridMemberRelationAddDTO
+ * @param eventGridMemberAddDTO
* @return 新增结果
*/
- public R add(EventGridMemberRelationAddDTO eventGridMemberRelationAddDTO){
+ public R add(EventGridMemberAddDTO eventGridMemberAddDTO){
+
+ userService.addGridUser(eventGridMemberAddDTO);
+
+
+
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationAddDTO, eventGridMemberRelationDO);
- eventGridMemberRelationDO.setCreateAt(new Date());
+ eventGridMemberRelationDO.setCreateBy(eventGridMemberAddDTO.getUserId());
if(eventGridMemberRelationMapper.insert(eventGridMemberRelationDO)>0){
return R.ok();
}
@@ -48,12 +56,12 @@
/**
* 修改网格和网格员的关联关系
- * @param eventGridMemberRelationEditDTO
+ * @param eventGridMemberEditDTO
* @return 维护结果
*/
- public R edit(EventGridMemberRelationEditDTO eventGridMemberRelationEditDTO){
+ public R edit(EventGridMemberEditDTO eventGridMemberEditDTO){
EventGridMemberRelationDO eventGridMemberRelationDO = new EventGridMemberRelationDO();
- BeanUtils.copyProperties(eventGridMemberRelationEditDTO, eventGridMemberRelationDO);
+ BeanUtils.copyProperties(eventGridMemberEditDTO, eventGridMemberRelationDO);
//eventGridMemberRelationDO.setUpdateAt(new Date());
if(eventGridMemberRelationMapper.updateById(eventGridMemberRelationDO)>0){
return R.ok();
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 8f1a41f..dc38f93 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
@@ -50,35 +50,6 @@
@Resource
private CommunityService communityService;
- /**
- * 新增事件
- * @param eventAddDTO 事件新增DTO
- * @return 新增结果
- */
- public R add(EventAddDTO eventAddDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventAddDTO, eventDO);
- eventDO.setCreateAt(new Date());
- if(eventMapper.insert(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
-
- /**
- * 修改事件
- * @param eventEditDTO
- * @return 维护结果
- */
- public R edit(EventEditDTO eventEditDTO){
- EventDO eventDO = new EventDO();
- BeanUtils.copyProperties(eventEditDTO, eventDO);
- //eventDO.setUpdateAt(new Date());
- if(eventMapper.updateById(eventDO)>0){
- return R.ok();
- }
- return R.fail();
- }
/**
* 分页查找事件
@@ -163,6 +134,28 @@
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);
//查询事件关联附件
List<EventResourceDO> eventResourceDOList =
eventResourceService.getBaseMapper().selectList(new LambdaQueryWrapper<EventResourceDO>()
@@ -271,6 +264,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("添加音频失败");
@@ -284,6 +278,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("添加视频失败");
@@ -335,6 +330,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("添加音频失败");
@@ -348,6 +344,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("添加视频失败");
@@ -395,6 +392,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("添加音频失败");
@@ -408,6 +406,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("添加视频失败");
@@ -539,6 +538,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("添加音频失败");
@@ -552,6 +552,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("添加视频失败");
@@ -664,6 +665,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("添加音频失败");
@@ -677,6 +679,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("添加视频失败");
@@ -724,6 +727,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("添加音频失败");
@@ -737,6 +741,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("添加视频失败");
@@ -790,6 +795,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("添加音频失败");
@@ -803,6 +809,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("添加视频失败");
@@ -866,6 +873,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("添加音频失败");
@@ -879,6 +887,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("添加视频失败");
@@ -928,6 +937,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("添加音频失败");
@@ -941,6 +951,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("添加视频失败");
@@ -988,6 +999,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("添加音频失败");
@@ -1001,6 +1013,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..f90bf38 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,12 @@
</if>
</select>
+ <select id="getGridTodoData" resultType="com.panzhihua.common.model.vos.grid.UserEventGridDataVO"
+ parameterType="com.panzhihua.common.model.dtos.grid.EventGridTodoDataDTO">
+ SELECT e.event_category , COUNT(*) 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}
+ GROUP BY e.event_category
+ </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>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 305cf09..e5da780 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.EditUserInfoPassAppDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
@@ -903,4 +904,15 @@
public R updateUserPassByApp(@RequestBody EditUserInfoPassAppDTO userInfoAppDTO){
return userService.updateUserPassByApp(userInfoAppDTO);
}
+
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ @PostMapping("addGridUser")
+ R addGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO){
+ return userService.addGridUser(eventGridMemberAddDTO);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index a3ca2b3..6a5ec01 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -3,6 +3,7 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -422,4 +423,11 @@
* @return 修改结果
*/
R updateUserPassByApp(EditUserInfoPassAppDTO userInfoAppDTO);
+
+ /**
+ * 添加网格员
+ * @param eventGridMemberAddDTO 请求参数
+ * @return 结果
+ */
+ R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 6095980..b7e92b8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -11,13 +11,16 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
+import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
import com.panzhihua.common.model.dtos.user.*;
import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
+import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.partybuilding.ActivityManagerVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.*;
+import com.panzhihua.common.service.grid.GridService;
import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.utlis.IdCard;
import com.panzhihua.common.utlis.RealNameUtil;
@@ -78,7 +81,8 @@
private SysMenuDAO sysMenuDAO;
@Resource
private SysUserInputDAO sysUserInputDAO;
-
+ @Resource
+ private GridService gridService;
/**
* 小程序微信用户信息更新
@@ -864,6 +868,29 @@
throw new ServiceException("账户已经存在");
}
+ }
+
+ if(insert>0 && sysUserDO.getType()==3){//添加的用户是社区账号时
+ //添加网格综合治理管理后台用户
+ SysUserDO sysUserDOWangGe = new SysUserDO();
+ BeanUtils.copyProperties(sysUserDO, sysUserDOWangGe);
+ sysUserDOWangGe.setUserId(null);
+ sysUserDOWangGe.setType(7);//网格综治后台
+ try {
+ int addWange = userDao.insert(sysUserDOWangGe);
+ if(addWange!=1){
+ throw new ServiceException("新增网格综合治理管理后台用户失败");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("网格综合治理管理后台用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ throw new ServiceException("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ throw new ServiceException("账户已经存在");
+ }
+
+ }
}
if (insert > 0) {
SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, administratorsUserVO.getType()).eq(SysUserDO::getAccount, administratorsUserVO.getAccount()));
@@ -1832,4 +1859,54 @@
return R.fail();
}
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R addGridUser(EventGridMemberAddDTO eventGridMemberAddDTO) {
+
+ SysRoleDO gridMemberDefaultRole = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getRoleKey, Constants.GRID_DEFAULT_ROLE_KEY));
+ if(gridMemberDefaultRole==null) {
+ //添加默认网格员角色
+ SysRoleDO sysRoleDO = new SysRoleDO();
+ sysRoleDO.setCommunityId(0L);
+ sysRoleDO.setRoleName("网格员默认角色");
+ sysRoleDO.setRoleKey(Constants.GRID_DEFAULT_ROLE_KEY);
+ sysRoleDO.setRoleSort(0);
+ sysRoleDO.setCreateBy(eventGridMemberAddDTO.getUserId());
+ int insert = roleDAO.insert(sysRoleDO);
+ if (insert!=1) {
+ throw new ServiceException("网格员默认角色添加失败");
+ }
+ }
+ Long roleId = gridMemberDefaultRole.getRoleId();
+ //新角色设置所有权限
+ MenuRoleVO menuRoleVO = new MenuRoleVO();
+ menuRoleVO.setIsAll(1);
+ menuRoleVO.setCommunityId(eventGridMemberAddDTO.getCommunityId());
+ menuRoleVO.setRoleId(roleId);
+ this.putMenuRole(menuRoleVO);
+
+ SysUserDO sysUserDO = new SysUserDO();
+ String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPasswd());
+ eventGridMemberAddDTO.setPasswd(encode);
+ BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO);
+ int insert = 0;
+ try {
+ insert = userDao.insert(sysUserDO);
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("新增后台用户报错【{}】", e.getMessage());
+ if (e.getMessage().contains("union_phone_type")) {
+ throw new ServiceException("手机号已经存在");
+ } else if (e.getMessage().contains("union_account_type")) {
+ throw new ServiceException("账户已经存在");
+ }
+
+ }
+ //TODO 添加关联关系
+ //gridService.addEventGridMember();
+
+
+ return R.fail();
+ }
}
--
Gitblit v1.7.1