From abfa7fd3371f782501e808d0eb69f226316accbd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Apr 2023 11:17:20 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BC=96=E7=A0=81=E6=96=87=E6=9C=AC=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/yantai/yantai_dept_import_tem.xlsx | Bin 8756 -> 8799 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/yantai_dept_import_tem.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/yantai_dept_import_tem.xlsx index a3e51d0f545126d96d165eb6673b8c8248ea0079..4bc5ef807b0d4b0601a2ad3349bbca3f4e08a16e 100644 GIT binary patch delta 3478 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 E06EK#NB{r; delta 3464 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 From e76e075c9ce44e44721457cb3335245ff0efe775 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 27 Apr 2023 16:28:10 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=B8=82=E5=8C=97=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=89=E5=85=A8=E6=9C=8D=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcResiUserDao.java | 6 ++++++ .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index dba99aadfa..31f4614347 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -464,4 +464,10 @@ public interface IcResiUserDao extends BaseDao { List getImportUserList(@Param("customerId")String customerId,@Param("agencyId")String agencyId); + /** + * 根据ic_resi_user.id查询，不限制任何状态 + * @param icResiUserId + * @return + */ + IcResiUserEntity getById(String icResiUserId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 6e7840084a..9a3863b42d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -1716,7 +1716,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl + + From 2e1dfe9277598dd0fd9f4c7d34160c71653935d6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 28 Apr 2023 16:18:44 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 950f135680..b2b6b36861 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -255,7 +255,7 @@ ORDER BY - IC_RESI_USER.GRID_ID desc, + IC_RESI_USER.GRID_ID asc, IC_RESI_USER.VILLAGE_ID ASC, IC_RESI_USER.BUILD_ID ASC, IC_RESI_USER.UNIT_ID ASC, From a6db5f9810a28b79c14b54b8b233c6865eb70633 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 28 Apr 2023 17:39:01 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E3=80=90=E5=B0=8F=E7=BB=84=E3=80=91?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84-=E5=A2=9E=E5=8A=A0orgIdpat?= =?UTF-8?q?h,agencyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/entity/ResiGroupEntity.java | 3 +++ .../group/service/impl/ResiGroupServiceImpl.java | 11 +++++++---- .../V0.0.28__group_add_orgidpath_agencyid.sql | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java index cc35c91b5b..23279882cb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java @@ -98,4 +98,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审 * 小组等级 */ private Integer level; + private String agencyId; + + private String orgIdPath; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 8c2d43f75f..63065ee322 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -30,6 +30,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -37,10 +39,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.ReadFlagConstant; import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dto.form.*; @@ -609,6 +608,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Thu, 4 May 2023 13:43:57 +0800 Subject: [PATCH 05/13] =?UTF-8?q?/resi/partymember/icPartyOrg/editPrincipa?= =?UTF-8?q?l=E6=8E=A5=E5=8F=A3principalStaffId=E4=B8=8D=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/form/EditPrincipalFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java index c518b0ef7e..403c68016e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -31,6 +31,6 @@ public class EditPrincipalFormDTO implements Serializable { @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) private String principalMobile; - @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) + // @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) private String principalStaffId; } From 1b7c69afc22e9fdc6387afe8423522e3ed2b893d Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 4 May 2023 15:08:25 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E8=A7=A3=E6=9E=90=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=87=BA=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F[LocalDate=E7=B1=BB=E5=9E=8B]=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 37 +++++++++++++++++++ .../commons/tools/utils/IdCardRegexUtils.java | 7 +++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 8ddbea5066..f13ecd1297 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -22,6 +22,8 @@ import org.joda.time.format.DateTimeFormatter; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -1112,4 +1114,39 @@ public class DateUtils { cal.setTime(date); return str.contains(String.valueOf(cal.get(Calendar.DAY_OF_WEEK))); } + + /** + * @description: java.time.LocalDate转Date + * @param localDate: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:00 PM + */ + public static Date localDate2Date(java.time.LocalDate localDate) { + Instant instant = localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant(); + return Date.from(instant); + } + + /** + * @description: java.time.LocalDateTime转Date + * @param localDate: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:00 PM + */ + public static Date localDateTime2Date(java.time.LocalDateTime localDate) { + Instant instant = localDate.atZone(ZoneId.systemDefault()).toInstant(); + return Date.from(instant); + } + + /** + * @description: date转化为DateTime + * @param date: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:04 PM + */ + public static java.time.LocalDateTime date2LocalDateTime(Date date) { + return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index ff1f0b0549..78c061b395 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import java.time.DateTimeException; import java.time.LocalDate; import java.time.Period; +import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -56,6 +57,7 @@ public class IdCardRegexUtils { private String birthdayDay; private String sex; private Integer age; + private LocalDate birthday; } /** @@ -122,17 +124,18 @@ public class IdCardRegexUtils { String month = matcher.group("month"); String day = matcher.group("day"); String sex = matcher.group("sex"); + LocalDate birthday; // ------- 年龄Start---------- Integer age; try { - LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); age = Period.between(birthday, LocalDate.now()).getYears(); } catch (DateTimeException e) { throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e)); } // ------- 年龄End---------- - return new ParsedContent(year, month, day, sex, age); + return new ParsedContent(year, month, day, sex, age, birthday); } // 其他类型暂时不可解析 From 0b71ba8f79ca8ce7f0419b7a8351b48cc2b989fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 16:32:17 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/OrganizationMessageDTO.java | 100 ++++++++++++++++++ .../OrganizationMessagePublishRangeDTO.java | 89 ++++++++++++++++ .../form/OrganizationMessagePageFormDTO.java | 30 ++++++ .../result/OrganizationMessageResultDTO.java | 65 ++++++++++++ .../OrganizationMessageController.java | 49 +++++++++ .../com/epmet/dao/OrganizationMessageDao.java | 16 +++ .../OrganizationMessagePublishRangeDao.java | 16 +++ .../entity/OrganizationMessageEntity.java | 69 ++++++++++++ ...OrganizationMessagePublishRangeEntity.java | 56 ++++++++++ .../service/OrganizationMessageService.java | 27 +++++ .../impl/OrganizationMessageServiceImpl.java | 42 ++++++++ .../mapper/OrganizationMessageDao.xml | 26 +++++ .../OrganizationMessagePublishRangeDao.xml | 24 +++++ 13 files changed, 609 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java new file mode 100644 index 0000000000..547bcb6f8b --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java @@ -0,0 +1,100 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; + + /** + * 发布时间 + */ + private Date publishTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java new file mode 100644 index 0000000000..4350a479c9 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java @@ -0,0 +1,89 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessagePublishRangeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 消息id:organization_message.id + */ + private String messageId; + + /** + * 组织或者网格id + */ + private String orgId; + + /** + * 组织：agency；网格：grid + */ + private String orgType; + + /** + * org_id的父级 + */ + private String pid; + + /** + * org_id的全路径，包含org_id + */ + private String orgIdPath; + + /** + * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 + */ + private String orgName; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java new file mode 100644 index 0000000000..1e5b23d884 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description 烟台消息管理，列表查询入参 + * @Author yzm + * @Date 2023/5/4 16:05 + */ +@Data +public class OrganizationMessagePageFormDTO extends PageFormDTO { + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + /** + * 发布范围，组织id或者网格id + */ + private String orgId; + /** + * yyyy-MM-dd + */ + private String startDate; + /** + * yyyy-MM-dd + */ + private String endDate; +} + diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java new file mode 100644 index 0000000000..0d68bafe6d --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * @Description 烟台消息管理，列表查询 + * @Author yzm + * @Date 2023/5/4 16:06 + */ +@Data +public class OrganizationMessageResultDTO { + /** + * 消息id + */ + private String messageId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + /** + * 发布范围 + */ + private String publishRangeName; + + /** + * 发布时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date publishTime; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; +} + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java new file mode 100644 index 0000000000..d36e1c74af --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -0,0 +1,49 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.OrganizationMessagePageFormDTO; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.service.OrganizationMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@RestController +@RequestMapping("organization/message") +public class OrganizationMessageController { + + @Autowired + private OrganizationMessageService organizationMessageService; + + /** + * 列表查询 + * + * @param formDTO + * @return + */ + @PostMapping("list") + public Result> pageList(@RequestBody OrganizationMessagePageFormDTO formDTO) { + return new Result>().ok(organizationMessageService.pageList(formDTO.getPageNo(), formDTO.getPageSize(), + formDTO.getPublishDitch(), + formDTO.getOrgId(), + formDTO.getStartDate(), + formDTO.getEndDate())); + } + + + + + + + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java new file mode 100644 index 0000000000..3cec0ac2fc --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.OrganizationMessageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Mapper +public interface OrganizationMessageDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java new file mode 100644 index 0000000000..94a9a65100 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.OrganizationMessagePublishRangeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Mapper +public interface OrganizationMessagePublishRangeDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java new file mode 100644 index 0000000000..383720be2a --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -0,0 +1,69 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("organization_message") +public class OrganizationMessageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; + + /** + * 发布时间 + */ + private Date publishTime; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java new file mode 100644 index 0000000000..5080cfe16f --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java @@ -0,0 +1,56 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("organization_message_publish_range") +public class OrganizationMessagePublishRangeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 消息id:organization_message.id + */ + private String messageId; + + /** + * 组织或者网格id + */ + private String orgId; + + /** + * 组织：agency；网格：grid + */ + private String orgType; + + /** + * org_id的父级 + */ + private String pid; + + /** + * org_id的全路径，包含org_id + */ + private String orgIdPath; + + /** + * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 + */ + private String orgName; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java new file mode 100644 index 0000000000..794f2725b9 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -0,0 +1,27 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.entity.OrganizationMessageEntity; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +public interface OrganizationMessageService extends BaseService { + + /** + * 分页列表 + * @param pageNo + * @param pageSize + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + PageData pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate); +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java new file mode 100644 index 0000000000..0ddb025c07 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -0,0 +1,42 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dao.OrganizationMessageDao; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.entity.OrganizationMessageEntity; +import com.epmet.service.OrganizationMessageService; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Service; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Service +public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { + /** + * 分页列表 + * + * @param pageNo + * @param pageSize + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + @Override + public PageData pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + PageHelper.startPage(pageNo,pageSize); + //todo + // List list=baseDao.pageList(staffOrgIdPath,publishDitch,orgId,startDate,endDate); + return null; + } +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml new file mode 100644 index 0000000000..49ee7aa52e --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml new file mode 100644 index 0000000000..18e02ac73f --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 208d516403f04203e452061e1731754fc501bd5b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 16:49:25 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0pid,orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/CustomerStaffInfoCacheResult.java | 9 +++++++++ .../tools/redis/common/bean/CustomerStaffInfoCache.java | 9 ++++++++- .../dto/epmetuser/result/CustomerStaffResultDTO.java | 9 ++++++++- .../epmet/dataaggre/controller/EpmetUserController.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 8 ++++---- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java index 81c74a4c38..6e9944c316 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java @@ -22,6 +22,15 @@ public class CustomerStaffInfoCacheResult implements Serializable { */ private String agencyId; + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; + /** * 工作人员所属组织ID的pids */ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java index 87e53edcb0..012d38321a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java @@ -21,7 +21,14 @@ public class CustomerStaffInfoCache implements Serializable { * 工作人员所属组织ID */ private String agencyId; - + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; /** * 工作人员所属组织ID的pids */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java index 3269ebcb26..0bc9203d45 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java @@ -20,7 +20,14 @@ public class CustomerStaffResultDTO implements Serializable { * 工作人员所属组织ID */ private String agencyId; - + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; /** * 工作人员所属组织ID的pids */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 24d9c5a738..2498606f80 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -268,7 +268,7 @@ public class EpmetUserController { * remark: */ @PostMapping("getStaffInfo/{staffId}") - public Result getStaffInfo(@PathVariable(name = "staffId") String staffId){ + public Result getStaffInfo(@PathVariable(name = "staffId") String staffId){ return new Result().ok(epmetUserService.getStaffInfo(staffId)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 75f863dd58..ea9980e7af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -18,10 +18,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.IpUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.BadgeConstant; import com.epmet.constant.NeighborhoodConstant; import com.epmet.constant.OrgInfoConstant; @@ -650,6 +647,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { } result.setStaffId(staffEntity.getUserId()); result.setAgencyId(agencyDTO.getId()); + //新增pid,orgIdPath + result.setPid(agencyDTO.getPid()); + result.setOrgIdPath(PidUtils.convertPid2OrgIdPath(agencyDTO.getId(),agencyDTO.getPids())); result.setAgencyName(agencyDTO.getOrganizationName()); result.setAgencyPIds(agencyDTO.getPids()); result.setLevel(agencyDTO.getLevel()); From 09fc9988fb77217ab24fb94dfec882fd19792a3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 18:32:22 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=86=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E8=BF=98=E6=B2=A1=E5=8F=91=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/OrganizationMessageDTO.java | 100 ------------------ .../epmet/dto/OrganizationMessageFormDTO.java | 52 +++++++++ .../OrganizationMessagePublishRangeDTO.java | 36 +------ .../OrganizationMessageController.java | 40 +++++-- .../com/epmet/dao/OrganizationMessageDao.java | 22 +++- .../service/OrganizationMessageService.java | 15 +++ .../impl/OrganizationMessageServiceImpl.java | 88 ++++++++++++++- .../mapper/OrganizationMessageDao.xml | 37 ++++++- 8 files changed, 245 insertions(+), 145 deletions(-) delete mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java deleted file mode 100644 index 547bcb6f8b..0000000000 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 组织发布消息（烟台） - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2023-05-04 - */ -@Data -public class OrganizationMessageDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 客户Id - */ - private String customerId; - - /** - * 发布渠道：0：专属app - */ - private String publishDitch; - - /** - * 消息内容；最多输入500 - */ - private String content; - - /** - * 发布人staffId - */ - private String publishStaffId; - - /** - * 发布人姓名 - */ - private String publishStaffName; - - /** - * 发布人所属组织id - */ - private String publishOrgId; - - /** - * org_id_path - */ - private String publishOrgIdPath; - - /** - * 发布人所属组织名称 - */ - private String publishOrgName; - - /** - * 发布时间 - */ - private Date publishTime; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java new file mode 100644 index 0000000000..cc42aa46ba --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java @@ -0,0 +1,52 @@ +package com.epmet.dto; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface AddShowGroup extends CustomerClientShowGroup { + } + /** + * 发布渠道：0：专属app + */ + @NotBlank(message = "发布渠道不能为空", groups = {AddShowGroup.class}) + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + @NotBlank(message = "内容不能为空", groups = {AddShowGroup.class}) + @Length(max = 500, message = "内容输入500字", groups = {AddShowGroup.class}) + private String content; + + @Valid + @NotEmpty(message = "发布范围不能为空", groups = {AddShowGroup.class}) + private List rangeList; + + /** + * 客户Id + */ + private String customerId; + /** + * 发布人staffId + */ + private String publishStaffId; +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java index 4350a479c9..2b51910c48 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java @@ -1,9 +1,10 @@ package com.epmet.dto; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + /** * 消息发布范围（烟台） @@ -34,11 +35,13 @@ public class OrganizationMessagePublishRangeDTO implements Serializable { /** * 组织或者网格id */ + @NotBlank(message = "orgId不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) private String orgId; /** * 组织：agency；网格：grid */ + @NotBlank(message = "orgType不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) private String orgType; /** @@ -56,34 +59,5 @@ public class OrganizationMessagePublishRangeDTO implements Serializable { */ private String orgName; - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java index d36e1c74af..ea14265f47 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -1,15 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.form.OrganizationMessagePageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.service.OrganizationMessageService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** @@ -40,10 +42,32 @@ public class OrganizationMessageController { formDTO.getEndDate())); } + /** + * 查询消息详情 + * + * @param messageId + * @return + */ + @PostMapping("detail/{messageId}") + public Result getDetail(@PathVariable("messageId") String messageId) { + if (StringUtils.isBlank(messageId)) { + return new Result<>(); + } + return new Result().ok(organizationMessageService.getDetail(messageId)); + } - - - - + /** + * 发布消息 + * + * @param formDTO + * @return 返回消息id + */ + @PostMapping("publish") + public Result publish(@LoginUser TokenDto tokenDto, @RequestBody OrganizationMessageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class); + return new Result().ok(organizationMessageService.publish(formDTO)); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java index 3cec0ac2fc..f13e230f0c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java @@ -1,8 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 组织发布消息（烟台） @@ -12,5 +16,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface OrganizationMessageDao extends BaseDao { - + + /** + * + * @param staffOrgIdPath 工作人员所属组织的orgIdPath + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + List pageList(@Param("customerId")String customerId, + @Param("staffOrgIdPath") String staffOrgIdPath, + @Param("publishDitch")String publishDitch, + @Param("orgId")String orgId, + @Param("startDate")String startDate, + @Param("endDate")String endDate, + @Param("messageId")String messageId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java index 794f2725b9..18299bb1c5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; @@ -24,4 +25,18 @@ public interface OrganizationMessageService extends BaseService pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate); + + /** + * 查询详情 + * @param messageId + * @return + */ + OrganizationMessageResultDTO getDetail(String messageId); + + /** + * 发布消息 + * @param formDTO + * @return 返回消息id + */ + String publish(OrganizationMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 0ddb025c07..cfc8daef6a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -1,16 +1,34 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.PidUtils; import com.epmet.dao.OrganizationMessageDao; +import com.epmet.dao.OrganizationMessagePublishRangeDao; +import com.epmet.dto.OrganizationMessageFormDTO; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; +import com.epmet.entity.OrganizationMessagePublishRangeEntity; import com.epmet.service.OrganizationMessageService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; /** * 组织发布消息（烟台） @@ -20,6 +38,9 @@ import org.springframework.stereotype.Service; */ @Service public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { + @Autowired + private OrganizationMessagePublishRangeDao organizationMessagePublishRangeDao; + /** * 分页列表 * @@ -33,10 +54,69 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { - CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); - PageHelper.startPage(pageNo,pageSize); - //todo - // List list=baseDao.pageList(staffOrgIdPath,publishDitch,orgId,startDate,endDate); + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + String staffOrgIdPath = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 查询详情 + * + * @param messageId + * @return + */ + @Override + public OrganizationMessageResultDTO getDetail(String messageId) { + List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(NumConstant.ZERO); + } return null; } + + /** + * 发布消息 + * + * @param formDTO + * @return 返回消息id + */ + @Transactional(rollbackFor = Exception.class) + @Override + public String publish(OrganizationMessageFormDTO formDTO) { + OrganizationMessageEntity messageEntity = ConvertUtils.sourceToTarget(formDTO, OrganizationMessageEntity.class); + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getPublishStaffId()); + messageEntity.setPublishStaffName(staffInfoCacheResult.getRealName()); + messageEntity.setPublishOrgId(staffInfoCacheResult.getAgencyId()); + messageEntity.setPublishOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds())); + messageEntity.setPublishOrgName(staffInfoCacheResult.getAgencyName()); + messageEntity.setPublishTime(new Date()); + baseDao.insert(messageEntity); + for (OrganizationMessagePublishRangeDTO dto : formDTO.getRangeList()) { + OrganizationMessagePublishRangeEntity rangeEntity = new OrganizationMessagePublishRangeEntity(); + rangeEntity.setCustomerId(messageEntity.getCustomerId()); + rangeEntity.setMessageId(messageEntity.getId()); + rangeEntity.setOrgId(dto.getOrgId()); + rangeEntity.setOrgType(dto.getOrgType()); + if (OrgTypeEnum.GRID.getCode().equals(dto.getOrgType())) { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getOrgId()); + rangeEntity.setPid(gridInfoCache.getPid()); + rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), gridInfoCache.getPids())); + rangeEntity.setOrgName(gridInfoCache.getGridNamePath()); + } else if (OrgTypeEnum.AGENCY.getCode().equals(dto.getOrgType())) { + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(dto.getOrgId()); + rangeEntity.setPid(agencyInfoCache.getPid()); + rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), agencyInfoCache.getPids())); + rangeEntity.setOrgName(agencyInfoCache.getOrganizationName()); + } + organizationMessagePublishRangeDao.insert(rangeEntity); + } + String messageId = messageEntity.getId(); + // todo 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息 + return messageId; + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 49ee7aa52e..742421c739 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -22,5 +22,40 @@ - + \ No newline at end of file From f8c5ae7324170d45e0946e49642206c2c322d1a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 10:48:17 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/OrganizationMessageResultDTO.java | 9 ++ .../epmet-message-server/pom.xml | 5 - .../entity/OrganizationMessageEntity.java | 10 +- .../impl/OrganizationMessageServiceImpl.java | 93 ++++++++++++++++++- .../mapper/OrganizationMessageDao.xml | 2 + .../dto/form/RegisterRelationPageFormDTO.java | 33 +++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 8 ++ .../EpmetUserOpenFeignClientFallback.java | 11 +++ .../RegisterRelationController.java | 18 ++++ .../com/epmet/dao/RegisterRelationDao.java | 5 + .../service/RegisterRelationService.java | 12 +++ .../impl/RegisterRelationServiceImpl.java | 20 ++++ .../resources/mapper/RegisterRelationDao.xml | 17 +++- 13 files changed, 234 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 0d68bafe6d..08b6d88924 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -61,5 +61,14 @@ public class OrganizationMessageResultDTO { * 发布人所属组织名称 */ private String publishOrgName; + + /** + * 发送结果 + */ + private String sendMsgRes; + /** + * 共发送出多少条消息 + */ + private Integer totalReceiver; } diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index fef8b6bded..daa811ed8e 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -101,11 +101,6 @@ flyway-core - - com.epmet - epmet-user-client - 2.0.0 - com.epmet epmet-third-client diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java index 383720be2a..416f66793b 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -65,5 +65,13 @@ public class OrganizationMessageEntity extends BaseEpmetEntity { * 发布时间 */ private Date publishTime; - + /** + * 发送结果 + * sending发送中；failed失败；success成功 + */ + private String sendMsgRes; + /** + * 共发送出多少条消息 + */ + private Integer totalReceiver; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index cfc8daef6a..616228fc59 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -1,9 +1,15 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -12,18 +18,26 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.OrganizationMessageDao; import com.epmet.dao.OrganizationMessagePublishRangeDao; +import com.epmet.dao.UserMessageDao; import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.OrganizationMessagePublishRangeDTO; +import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.form.RegisterRelationPageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; import com.epmet.entity.OrganizationMessagePublishRangeEntity; +import com.epmet.entity.UserMessageEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.OrganizationMessageService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,10 +50,16 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-05-04 */ +@Slf4j @Service public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { @Autowired private OrganizationMessagePublishRangeDao organizationMessagePublishRangeDao; + @Autowired + private UserMessageDao userMessageDao; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + /** * 分页列表 @@ -93,6 +113,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl rangeList, String customerId) { + String result = "success"; + int totalMsg = NumConstant.ZERO; + try { + for (OrganizationMessagePublishRangeDTO rangeDto : rangeList) { + RegisterRelationPageFormDTO pageFormDTO=new RegisterRelationPageFormDTO(); + pageFormDTO.setCustomerId(customerId); + pageFormDTO.setFirstRegister(NumConstant.ONE_STR); + pageFormDTO.setPageNo(NumConstant.ONE); + pageFormDTO.setPageSize(NumConstant.TWO); + // pageFormDTO.setPageSize(NumConstant.ONE_THOUSAND); + if (OrgTypeEnum.GRID.getCode().equals(rangeDto.getOrgType())) { + // 查询该网格下的注册居民 + pageFormDTO.setGridId(rangeDto.getOrgId()); + } else { + // 查询该组织下的注册居民 + pageFormDTO.setAgencyIdPath(rangeDto.getOrgIdPath()); + } + List list=null; + do { + Result> regRes = epmetUserOpenFeignClient.pageQueryRegisterUser(pageFormDTO); + list = regRes.getData().getList(); + for (RegisterRelationDTO regUser : list) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper(); + queryWrapper.eq(UserMessageEntity::getCustomerId,customerId) + .eq(UserMessageEntity::getTargetId,messageId) + .eq(UserMessageEntity::getUserId,regUser.getUserId()); + UserMessageEntity origin=userMessageDao.selectOne(queryWrapper); + if(null==origin){ + UserMessageEntity userMessageEntity = new UserMessageEntity(); + userMessageEntity.setCustomerId(customerId); + userMessageEntity.setGridId(regUser.getGridId()); + userMessageEntity.setUserId(regUser.getUserId()); + userMessageEntity.setApp(AppClientConstant.APP_RESI); + userMessageEntity.setTitle("您有一条社区消息！"); + userMessageEntity.setMessageContent(content); + userMessageEntity.setReadFlag(Constant.UNREAD); + userMessageEntity.setReferer(StrConstant.EPMETY_STR); + userMessageEntity.setMessageType("organization_message"); + userMessageEntity.setTargetId(messageId); + userMessageEntity.setCreatedBy(publishStaffId); + userMessageEntity.setUpdatedBy(publishStaffId); + userMessageDao.insert(userMessageEntity); + totalMsg += 1; + } + } + pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE); + } while (CollectionUtils.isNotEmpty(list) && list.size() == pageFormDTO.getPageSize()); + } + } catch (Exception e) { + log.error(String.format("messageId:%s,发送消息异常:%s", messageId, ExceptionUtils.getErrorStackTrace(e))); + result = "failed"; + } finally { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(OrganizationMessageEntity::getId, messageId) + .set(OrganizationMessageEntity::getSendMsgRes, result) + .set(OrganizationMessageEntity::getTotalReceiver, totalMsg) + .set(OrganizationMessageEntity::getUpdatedTime,new Date()); + baseDao.update(null, updateWrapper); + } + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 742421c739..8e8bd51ad6 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -32,6 +32,8 @@ om.PUBLISH_ORG_ID as publishStaffName, om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, OM.PUBLISH_ORG_NAME as publishOrgName, + om.SEND_MSG_RES as sendMsgRes, + om.TOTAL_RECEIVER as totalReceiver, GROUP_CONCAT(r.ORG_NAME) as publishRangeName from organization_message om left join organization_message_publish_range r diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java new file mode 100644 index 0000000000..bd1e28d424 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/5 9:47 + */ +@Data +public class RegisterRelationPageFormDTO extends PageFormDTO { + /** + * 客户Id (customer.id) + */ + private String customerId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 网格Id (customer_grid.id) + */ + private String gridId; + + /** + * 首次注册用户 0表示不参与计数 1表示参与计数 + */ + private String firstRegister; +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index c80eab326e..ddc7a635e7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1033,4 +1033,12 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icNat/clearNatRecords") Result clearNatRecords(@RequestBody Map map); + + /** + * 分页查询注册居民 + * @param pageFormDTO + * @return + */ + @PostMapping("/epmetuser/registerrelation/pageQueryRegisterUser") + Result> pageQueryRegisterUser(@RequestBody RegisterRelationPageFormDTO pageFormDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 4d3d56b76c..3bba7ced02 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -756,4 +756,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result clearNatRecords(Map map) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "clearNatRecords", map); } + + /** + * 分页查询注册居民 + * + * @param pageFormDTO + * @return + */ + @Override + public Result> pageQueryRegisterUser(RegisterRelationPageFormDTO pageFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "pageQueryRegisterUser", pageFormDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java index d801a5e6e9..77dd78bf9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.form.AllResiByGridFormDTO; import com.epmet.dto.form.EnterGridFormDTO; +import com.epmet.dto.form.RegisterRelationPageFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.excel.RegisterRelationExcel; import com.epmet.service.RegisterRelationService; @@ -120,4 +121,21 @@ public class RegisterRelationController { ValidatorUtils.validateEntity(formDTO, AllResiByGridFormDTO.AllResiByGridForm.class); return new Result().ok(registerRelationService.getAllResiByGrid(formDTO)); } + + /** + * 分页查询注册居民信息 + * @param pageFormDTO + * @return + */ + @PostMapping("pageQueryRegisterUser") + public Result> pageQueryRegisterUser(@RequestBody RegisterRelationPageFormDTO pageFormDTO){ + return new Result>().ok(registerRelationService.pageQueryRegisterUser(pageFormDTO.getPageNo(), + pageFormDTO.getPageSize(), + pageFormDTO.getCustomerId(), + pageFormDTO.getGridId(), + pageFormDTO.getAgencyIdPath(), + pageFormDTO.getFirstRegister())); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java index f5f4cdfd35..83ac08f940 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java @@ -71,4 +71,9 @@ public interface RegisterRelationDao extends BaseDao { * @date 2022/10/8 10:48 */ Integer getAllResiByGrid(@Param("gridId")String gridId); + + List pageQueryRegisterUser(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("agencyIdPath") String agencyIdPath, + @Param("firstRegister") String firstRegister); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java index 7179b78530..ed39bd6441 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java @@ -123,4 +123,16 @@ public interface RegisterRelationService extends BaseService pageQueryRegisterUser(Integer pageNo, Integer pageSize, String customerId, String gridId, String agencyIdPath, String firstRegister); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 11cca8346e..6091ab7cdb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -48,6 +48,8 @@ import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.GridVisitedService; import com.epmet.service.RegisterRelationService; import com.epmet.util.ModuleConstant; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -389,4 +391,22 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl pageQueryRegisterUser(Integer pageNo, Integer pageSize, String customerId, String gridId, String agencyIdPath, String firstRegister) { + PageHelper.startPage(pageNo,pageSize); + List resList=baseDao.pageQueryRegisterUser(customerId,gridId,agencyIdPath,firstRegister); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml index c43cea28cc..f2e0506de3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml @@ -97,5 +97,20 @@ AND grid_id = #{gridId} - + From 30c353f013d243b83309381bbca992294447d1da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 12:27:15 +0800 Subject: [PATCH 11/13] bugfix --- .../result/OrganizationMessageResultDTO.java | 4 ++++ .../OrganizationMessageController.java | 5 ++++- .../service/OrganizationMessageService.java | 5 +++++ .../impl/OrganizationMessageServiceImpl.java | 18 ++++++++++-------- .../mapper/OrganizationMessageDao.xml | 2 ++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 08b6d88924..86ec079f87 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -1,9 +1,11 @@ package com.epmet.dto.result; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Description 烟台消息管理，列表查询 @@ -70,5 +72,7 @@ public class OrganizationMessageResultDTO { * 共发送出多少条消息 */ private Integer totalReceiver; + + private List rangeList; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java index ea14265f47..fac7d6d6d2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -67,7 +67,10 @@ public class OrganizationMessageController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class); - return new Result().ok(organizationMessageService.publish(formDTO)); + String messageId=organizationMessageService.publish(formDTO); + // 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息 + organizationMessageService.sendUserMsg(messageId,formDTO.getContent(),formDTO.getPublishStaffId(),formDTO.getRangeList(),formDTO.getCustomerId()); + return new Result().ok(messageId); } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java index 18299bb1c5..8932b557b4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -3,9 +3,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.OrganizationMessageFormDTO; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; +import java.util.List; + /** * 组织发布消息（烟台） * @@ -39,4 +42,6 @@ public interface OrganizationMessageService extends BaseService rangeList, String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 616228fc59..51b1924af7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -15,10 +15,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.PidUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.dao.OrganizationMessageDao; import com.epmet.dao.OrganizationMessagePublishRangeDao; import com.epmet.dao.UserMessageDao; @@ -79,7 +76,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } /** @@ -92,7 +89,13 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId); if(CollectionUtils.isNotEmpty(list)){ - return list.get(NumConstant.ZERO); + OrganizationMessageResultDTO resultDTO=list.get(NumConstant.ZERO); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(OrganizationMessagePublishRangeEntity::getMessageId,messageId) + .orderByAsc(OrganizationMessagePublishRangeEntity::getCreatedTime); + List rangeList=organizationMessagePublishRangeDao.selectList(queryWrapper); + resultDTO.setRangeList(ConvertUtils.sourceToTarget(rangeList,OrganizationMessagePublishRangeDTO.class)); + return resultDTO; } return null; } @@ -138,13 +141,12 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl rangeList, String customerId) { String result = "success"; int totalMsg = NumConstant.ZERO; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 8e8bd51ad6..a1e5dcb6c8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -30,6 +30,7 @@ om.PUBLISH_TIME as publishTime, om.PUBLISH_STAFF_ID as publishStaffId, om.PUBLISH_ORG_ID as publishStaffName, + om.PUBLISH_ORG_ID as publishOrgId, om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, OM.PUBLISH_ORG_NAME as publishOrgName, om.SEND_MSG_RES as sendMsgRes, @@ -58,6 +59,7 @@ and om.id =#{messageId} + group by om.id order by om.PUBLISH_TIME desc \ No newline at end of file From 330e2bfc8211ac5decac0892d4101f572a78c222 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 14:10:59 +0800 Subject: [PATCH 12/13] /message/organization/message/list;NullPointerException --- .../epmet/service/impl/OrganizationMessageServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 51b1924af7..29c9a9bf48 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -72,6 +74,9 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + if (null == staffInfoCacheResult) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customerId:" + EpmetRequestHolder.getLoginUserCustomerId() + "staffId:" + EpmetRequestHolder.getLoginUserId(), "获取工作人员信息异常"); + } String staffOrgIdPath = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); From b511b7a6671ef1d09d9495ef53bd8f24c4cdbdf4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 14:27:50 +0800 Subject: [PATCH 13/13] FINISH_SEND_TIME --- .../com/epmet/dto/result/OrganizationMessageResultDTO.java | 6 ++++++ .../java/com/epmet/entity/OrganizationMessageEntity.java | 5 +++++ .../epmet/service/impl/OrganizationMessageServiceImpl.java | 1 + .../src/main/resources/mapper/OrganizationMessageDao.xml | 1 + 4 files changed, 13 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 86ec079f87..94b89ded76 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -73,6 +73,12 @@ public class OrganizationMessageResultDTO { */ private Integer totalReceiver; + /** + * 发送完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date finishSendTime; + private List rangeList; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java index 416f66793b..15c07c0851 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -74,4 +74,9 @@ public class OrganizationMessageEntity extends BaseEpmetEntity { * 共发送出多少条消息 */ private Integer totalReceiver; + + /** + * 发送完成时间 + */ + private Date finishSendTime; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 29c9a9bf48..65580da84c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -209,6 +209,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl