From 4ad1146e2df968dbd6b66e2b3fea9589b64a6e09 Mon Sep 17 00:00:00 2001 From: wangchao Date: Fri, 17 Apr 2020 15:49:09 +0800 Subject: [PATCH] =?UTF-8?q?resi=5Fgroup=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E7=9A=84=E5=B0=8F=E7=BB=84DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 9 ++++ .../impl/ResiWarmheartedServiceImpl.java | 2 + .../dto/group/form/ApplyingGroupsFormDTO.java | 38 ++++++++++++++ .../group/result/ApplyingGroupsResultDTO.java | 52 +++++++++++++++++++ .../src/main/resources/db/migration/db.sql | 7 +++ 5 files changed, 108 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyingGroupsFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupsResultDTO.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index dec03ba191..5c3d846e92 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -167,6 +167,15 @@ spring: filters: - StripPrefix=1 - CpAuth=true + #政府端网格管理 + - id: gov-grid-server + uri: @gateway.routes.gov-grid-server.uri@ + order: 18 + predicates: + - Path=${server.servlet.context-path}/gov/grid/** + filters: + - StripPrefix=1 + - CpAuth=true nacos: discovery: server-addr: @nacos.server-addr@ diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java index 9fe0ecc8c9..1ae0f99261 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java +++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiWarmheartedServiceImpl.java @@ -6,6 +6,7 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditedFro import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedAuditedResultDTO; import com.epmet.service.ResiWarmheartedService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; @@ -15,6 +16,7 @@ import java.util.List; * @Author wangc * @date 2020.04.16 15:41 */ +@Service public class ResiWarmheartedServiceImpl implements ResiWarmheartedService { @Autowired private ResiPartymemberFeignClient resiPartymemberFeignClient; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyingGroupsFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyingGroupsFormDTO.java new file mode 100644 index 0000000000..4bc9bd10e8 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyingGroupsFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.resi.group.dto.group.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import java.io.Serializable; + +/** + * @Description 政府端查询待审核的小组 + * @ClassName ApplyingGroupsFormDTO + * @Author wangc + * @date 2020.04.17 14:59 + */ +@Data +public class ApplyingGroupsFormDTO implements Serializable{ + private static final long serialVersionUID = 1L; + + /** + * 客户Id + * */ + private String customerId; + + /** + * 网格Id + * */ + private String gridId; + + /** + * 请求页码 最小是1 + * */ + @Min(value = 1) + private Integer pageNo; + + /** + * 每页数据 默认20 + * */ + private Integer pageSize = 20; +} diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupsResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupsResultDTO.java new file mode 100644 index 0000000000..049c13c1b8 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupsResultDTO.java @@ -0,0 +1,52 @@ +package com.epmet.resi.group.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 政府端查询待审核的小组 + * @ClassName ApplyingGroupsResultDTO + * @Author wangc + * @date 2020.04.17 15:20 + */ +@Data +public class ApplyingGroupsResultDTO implements Serializable{ + private static final long serialVersionUID = 1L; + + /** + * 组Id + * */ + private String groupId; + + /** + * 组名称 + * */ + private String groupName; + + /** + * 组头像 + * */ + private String groupHeadPhoto; + + /** + * 组介绍 + * */ + private String groupIntroduction; + + /** + * 申请时间 + * */ + private Date createdTime; + + /** + * 审核人员已读未读标识(未读:unread ; 已读:read ) + * */ + private String readFlag; + + /** + * 消息通知内容 + * */ + private String messageText; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql new file mode 100644 index 0000000000..85f4fea057 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/db.sql @@ -0,0 +1,7 @@ +-- @Date 2020-04-17 15:37 +-- @Author wangc +-- @Description 数据库epmet_resi_group中的resi_group_operation(小组操作记录)表新增两个字段，db语句： +ALTER TABLE resi_group_operation ADD ( + READ_FLAG VARCHAR (8) DEFAULT NULL COMMENT '审核人员已读未读标识(未读:unread 界面显示红点; 已读:read 不显示红点)', + MESSAGE_TEXT VARCHAR (500) DEFAULT NULL COMMENT '消息通知内容' +); \ No newline at end of file